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.287 by root, Mon Jun 25 05:43:45 2007 UTC vs.
Revision 1.384 by root, Fri Oct 12 18:17:16 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 4.1 ();
16	use Coro::State;	16	use Coro::State;
17	use Coro::Handle;	17	use Coro::Handle;
18	use Coro::Event;	18	use Coro::Event;
19	use Coro::Timer;	19	use Coro::Timer;
20	use Coro::Signal;	20	use Coro::Signal;
21	use Coro::Semaphore;	21	use Coro::Semaphore;
22	use Coro::AIO;	22	use Coro::AIO;
23	use Coro::Storable;	23	use Coro::Storable;
		24	use Coro::Util ();
24		25
		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.51 ();
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
…		…
77	our $NEXT_TICK;	80	our $NEXT_TICK;
78	our $NOW;	81	our $NOW;
79	our $USE_FSYNC = 1; # use fsync to write maps - default off	82	our $USE_FSYNC = 1; # use fsync to write maps - default off
80		83
81	our $BDB_POLL_WATCHER;	84	our $BDB_POLL_WATCHER;
		85	our $BDB_DEADLOCK_WATCHER;
		86	our $BDB_CHECKPOINT_WATCHER;
		87	our $BDB_TRICKLE_WATCHER;
82	our $DB_ENV;	88	our $DB_ENV;
83		89
84	our %CFG;	90	our %CFG;
85		91
86	our $UPTIME; $UPTIME ||= time;	92	our $UPTIME; $UPTIME ||= time;
87	our $RUNTIME;	93	our $RUNTIME;
88		94
89	our %PLAYER; # all users	95	our (%PLAYER, %PLAYER_LOADING); # all users
90	our %MAP; # all maps	96	our (%MAP, %MAP_LOADING ); # all maps
91	our $LINK_MAP; # the special {link} map, which is always available	97	our $LINK_MAP; # the special {link} map, which is always available
92		98
93	# 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 ∕
94	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	100	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
95		101
…		…
165		171
166	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
167	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
168	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.
169		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
170	=back	182	=back
171		183
172	=cut	184	=cut
173		185
174	BEGIN {	186	BEGIN {
…		…
178	$msg .= "\n"	190	$msg .= "\n"
179	unless $msg =~ /\n$/;	191	unless $msg =~ /\n$/;
180		192
181	$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;
182		194
183	utf8::encode $msg;
184	LOG llevError, $msg;	195	LOG llevError, $msg;
185	};	196	};
186	}	197	}
187		198
188	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	199	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
237	$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;
238	$d	249	$d
239	} || "[unable to dump $_[0]: '$@']";	250	} || "[unable to dump $_[0]: '$@']";
240	}	251	}
241		252
242	use JSON::XS ();
243
244	=item $ref = cf::from_json $json	253	=item $ref = cf::from_json $json
245		254
246	Converts a JSON string into the corresponding perl data structure.	255	Converts a JSON string into the corresponding perl data structure.
247		256
248	=item $json = cf::to_json $ref	257	=item $json = cf::to_json $ref
249		258
250	Converts a perl data structure into its JSON representation.	259	Converts a perl data structure into its JSON representation.
251		260
252	=cut	261	=cut
253		262
254	our $json_coder = JSON::XS->new->convert_blessed->utf8;	263	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255		264
256	sub to_json ($) { $json_coder->encode ($_[0]) }	265	sub to_json ($) { $json_coder->encode ($_[0]) }
257	sub from_json ($) { $json_coder->decode ($_[0]) }	266	sub from_json ($) { $json_coder->decode ($_[0]) }
258		267
259	=item cf::lock_wait $string	268	=item cf::lock_wait $string
…		…
265	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
266	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,
267	for example when the coroutine gets canceled), the lock is automatically	276	for example when the coroutine gets canceled), the lock is automatically
268	returned.	277	returned.
269		278
		279	Locks are *not* recursive, locking from the same coro twice results in a
		280	deadlocked coro.
		281
270	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
271	uses map_find and cf::map::load uses map_load).	283	uses map_find and cf::map::load uses map_load).
272		284
273	=item $locked = cf::lock_active $string	285	=item $locked = cf::lock_active $string
274		286
275	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.
276		288
277	=cut	289	=cut
278		290
279	our %LOCK;	291	our %LOCK;
		292	our %LOCKER;#d#
280		293
281	sub lock_wait($) {	294	sub lock_wait($) {
282	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#
283		301
284	# wait for lock, if any	302	# wait for lock, if any
285	while ($LOCK{$key}) {	303	while ($LOCK{$key}) {
286	push @{ $LOCK{$key} }, $Coro::current;	304	push @{ $LOCK{$key} }, $Coro::current;
287	Coro::schedule;	305	Coro::schedule;
…		…
293		311
294	# wait, to be sure we are not locked	312	# wait, to be sure we are not locked
295	lock_wait $key;	313	lock_wait $key;
296		314
297	$LOCK{$key} = [];	315	$LOCK{$key} = [];
		316	$LOCKER{$key} = $Coro::current;#d#
298		317
299	Coro::guard {	318	Coro::guard {
		319	delete $LOCKER{$key};#d#
300	# wake up all waiters, to be on the safe side	320	# wake up all waiters, to be on the safe side
301	$_->ready for @{ delete $LOCK{$key} };	321	$_->ready for @{ delete $LOCK{$key} };
302	}	322	}
303	}	323	}
304		324
…		…
316	};	336	};
317	$TICK_WATCHER->stop;	337	$TICK_WATCHER->stop;
318	$guard	338	$guard
319	}	339	}
320		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
321	=item cf::async { BLOCK }	399	=item cf::async { BLOCK }
322		400
323	Currently the same as Coro::async_pool, meaning you cannot use	401	Currently the same as Coro::async_pool, meaning you cannot use
324	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
325	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.
…		…
349	my $time = Event::time;	427	my $time = Event::time;
350		428
351	# this is the main coro, too bad, we have to block	429	# this is the main coro, too bad, we have to block
352	# till the operation succeeds, freezing the server :/	430	# till the operation succeeds, freezing the server :/
353		431
		432	LOG llevError | logBacktrace, Carp::longmess "sync job";#d#
		433
354	# TODO: use suspend/resume instead	434	# TODO: use suspend/resume instead
355	# (but this is cancel-safe)	435	# (but this is cancel-safe)
356	my $freeze_guard = freeze_mainloop;	436	my $freeze_guard = freeze_mainloop;
357		437
358	my $busy = 1;	438	my $busy = 1;
359	my @res;	439	my @res;
360		440
361	(async {	441	(async {
		442	$Coro::current->desc ("sync job coro");
362	@res = eval { $job->() };	443	@res = eval { $job->() };
363	warn $@ if $@;	444	warn $@ if $@;
364	undef $busy;	445	undef $busy;
365	})->prio (Coro::PRIO_MAX);	446	})->prio (Coro::PRIO_MAX);
366		447
…		…
413	=cut	494	=cut
414		495
415	sub fork_call(&@) {	496	sub fork_call(&@) {
416	my ($cb, @args) = @_;	497	my ($cb, @args) = @_;
417		498
418	# 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,
419	# or die "socketpair: $!";	500	# otherwise perl prematurely frees the stuff :/
420	pipe my $fh1, my $fh2	501	# TODO: investigate and fix (likely this will be rather laborious)
421	or die "pipe: $!";
422		502
423	if (my $pid = fork) {	503	my @res = Coro::Util::fork_eval {
424	close $fh2;
425
426	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
427	$res = Coro::Storable::thaw $res;
428
429	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431	die $$res unless "ARRAY" eq ref $res;
432
433	return wantarray ? @$res : $res->[-1];
434	} else {
435	reset_signals;	504	reset_signals;
436	local $SIG{__WARN__};	505	&$cb
437	local $SIG{__DIE__};	506	}, @args;
438	eval {
439	close $fh1;
440		507
441	my @res = eval { $cb->(@args) };	508	wantarray ? @res : $res[-1]
442	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
443	};
444
445	warn $@ if $@;
446	_exit 0;
447	}
448	}	509	}
449		510
450	=item $value = cf::db_get $family => $key	511	=item $value = cf::db_get $family => $key
451		512
452	Returns a single value from the environment database.	513	Returns a single value from the environment database.
…		…
454	=item cf::db_put $family => $key => $value	515	=item cf::db_put $family => $key => $value
455		516
456	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
457	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).
458		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
459	=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	}
460		543
461	our $DB;	544	our $DB;
462		545
463	sub db_init {	546	sub db_init {
464	unless ($DB) {
465	$DB = BDB::db_create $DB_ENV;
466
467	cf::sync_job {	547	cf::sync_job {
468	eval {	548	$DB ||= db_table "db";
469	$DB->set_flags (BDB::CHKSUM);
470
471	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
472	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
473	cf::cleanup "db_open(db): $!" if $!;
474	};
475	cf::cleanup "db_open(db): $@" if $@;
476	};
477	}	549	};
478	}	550	}
479		551
480	sub db_get($$) {	552	sub db_get($$) {
481	my $key = "$_[0]/$_[1]";	553	my $key = "$_[0]/$_[1]";
482		554
…		…
532	if (1) {	604	if (1) {
533	$md5 =	605	$md5 =
534	join "\x00",	606	join "\x00",
535	$processversion,	607	$processversion,
536	map {	608	map {
537	Coro::cede;	609	cf::cede_to_tick;
538	($src->[$_], Digest::MD5::md5_hex $data[$_])	610	($src->[$_], Digest::MD5::md5_hex $data[$_])
539	} 0.. $#$src;	611	} 0.. $#$src;
540		612
541		613
542	my $dbmd5 = db_get cache => "$id/md5";	614	my $dbmd5 = db_get cache => "$id/md5";
…		…
848	";	920	";
849	die if $@;	921	die if $@;
850	}	922	}
851		923
852	our $override;	924	our $override;
853	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?
854		926
855	sub override {	927	sub override {
856	$override = 1;	928	$override = 1;
857	@invoke_results = ();	929	@INVOKE_RESULTS = (@_);
858	}	930	}
859		931
860	sub do_invoke {	932	sub do_invoke {
861	my $event = shift;	933	my $event = shift;
862	my $callbacks = shift;	934	my $callbacks = shift;
863		935
864	@invoke_results = ();	936	@INVOKE_RESULTS = ();
865		937
866	local $override;	938	local $override;
867		939
868	for (@$callbacks) {	940	for (@$callbacks) {
869	eval { &{$_->[1]} };	941	eval { &{$_->[1]} };
…		…
886		958
887	Generate an object-specific event with the given arguments.	959	Generate an object-specific event with the given arguments.
888		960
889	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
890	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
891	results (if you must, access C<@cf::invoke_results> directly).	963	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
892		964
893	=back	965	=back
894		966
895	=cut	967	=cut
896		968
897	#############################################################################	969	#############################################################################
898	# 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	}
899		982
900	sub reattach {	983	sub reattach {
901	# basically do the same as instantiate, without calling instantiate	984	# basically do the same as instantiate, without calling instantiate
902	my ($obj) = @_;	985	my ($obj) = @_;
903		986
…		…
950	sub object_freezer_save {	1033	sub object_freezer_save {
951	my ($filename, $rdata, $objs) = @_;	1034	my ($filename, $rdata, $objs) = @_;
952		1035
953	sync_job {	1036	sync_job {
954	if (length $$rdata) {	1037	if (length $$rdata) {
		1038	utf8::decode (my $decname = $filename);
955	warn sprintf "saving %s (%d,%d)\n",	1039	warn sprintf "saving %s (%d,%d)\n",
956	$filename, length $$rdata, scalar @$objs;	1040	$decname, length $$rdata, scalar @$objs;
957		1041
958	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1042	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
959	chmod SAVE_MODE, $fh;	1043	chmod SAVE_MODE, $fh;
960	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1044	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
961	aio_fsync $fh if $cf::USE_FSYNC;	1045	aio_fsync $fh if $cf::USE_FSYNC;
962	close $fh;	1046	close $fh;
963		1047
964	if (@$objs) {	1048	if (@$objs) {
965	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1049	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
966	chmod SAVE_MODE, $fh;	1050	chmod SAVE_MODE, $fh;
967	my $data = Storable::nfreeze { version => 1, objs => $objs };	1051	my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
968	aio_write $fh, 0, (length $data), $data, 0;	1052	aio_write $fh, 0, (length $data), $data, 0;
969	aio_fsync $fh if $cf::USE_FSYNC;	1053	aio_fsync $fh if $cf::USE_FSYNC;
970	close $fh;	1054	close $fh;
971	aio_rename "$filename.pst~", "$filename.pst";	1055	aio_rename "$filename.pst~", "$filename.pst";
972	}	1056	}
…		…
980	}	1064	}
981	} else {	1065	} else {
982	aio_unlink $filename;	1066	aio_unlink $filename;
983	aio_unlink "$filename.pst";	1067	aio_unlink "$filename.pst";
984	}	1068	}
985	}	1069	};
986	}	1070	}
987		1071
988	sub object_freezer_as_string {	1072	sub object_freezer_as_string {
989	my ($rdata, $objs) = @_;	1073	my ($rdata, $objs) = @_;
990		1074
…		…
1002	or return;	1086	or return;
1003		1087
1004	unless (aio_stat "$filename.pst") {	1088	unless (aio_stat "$filename.pst") {
1005	(aio_load "$filename.pst", $av) >= 0	1089	(aio_load "$filename.pst", $av) >= 0
1006	or return;	1090	or return;
1007	$av = eval { (Storable::thaw $av)->{objs} };
1008	}
1009		1091
		1092	my $st = eval { Coro::Storable::thaw $av }
		1093	|| eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
		1094	$av = $st->{objs};
		1095	}
		1096
		1097	utf8::decode (my $decname = $filename);
1010	warn sprintf "loading %s (%d)\n",	1098	warn sprintf "loading %s (%d,%d)\n",
1011	$filename, length $data, scalar @{$av || []};	1099	$decname, length $data, scalar @{$av || []};
		1100
1012	return ($data, $av);	1101	($data, $av)
1013	}	1102	}
1014		1103
1015	=head2 COMMAND CALLBACKS	1104	=head2 COMMAND CALLBACKS
1016		1105
1017	=over 4	1106	=over 4
…		…
1087	cf::override;	1176	cf::override;
1088	},	1177	},
1089	on_extcmd => sub {	1178	on_extcmd => sub {
1090	my ($pl, $buf) = @_;	1179	my ($pl, $buf) = @_;
1091		1180
1092	my $msg = eval { from_json $buf };	1181	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1093		1182
1094	if (ref $msg) {	1183	if (ref $msg) {
		1184	my ($type, $reply, @payload) =
		1185	"ARRAY" eq ref $msg
		1186	? @$msg
		1187	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1188
		1189	my @reply;
		1190
1095	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1191	if (my $cb = $EXTCMD{$type}) {
1096	if (my %reply = $cb->($pl, $msg)) {	1192	@reply = $cb->($pl, @payload);
1097	$pl->ext_reply ($msg->{msgid}, %reply);
1098	}
1099	}	1193	}
		1194
		1195	$pl->ext_reply ($reply, @reply)
		1196	if $reply;
		1197
1100	} else {	1198	} else {
1101	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1199	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1102	}	1200	}
1103		1201
1104	cf::override;	1202	cf::override;
…		…
1194		1292
1195	=head3 cf::player	1293	=head3 cf::player
1196		1294
1197	=over 4	1295	=over 4
1198		1296
		1297	=item cf::player::num_playing
		1298
		1299	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1300
		1301	=cut
		1302
		1303	sub num_playing {
		1304	scalar grep
		1305	$_->ob->map
		1306	&& !$_->hidden
		1307	&& !$_->ob->flag (cf::FLAG_WIZ),
		1308	cf::player::list
		1309	}
		1310
1199	=item cf::player::find $login	1311	=item cf::player::find $login
1200		1312
1201	Returns the given player object, loading it if necessary (might block).	1313	Returns the given player object, loading it if necessary (might block).
1202		1314
1203	=cut	1315	=cut
…		…
1238	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1350	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1239	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1351	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1240	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1352	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1241	aio_unlink +(playerdir $login) . "/$login.pl";	1353	aio_unlink +(playerdir $login) . "/$login.pl";
1242		1354
1243	my $pl = load_pl path $login	1355	my $f = new_from_file cf::object::thawer path $login
1244	or return;	1356	or return;
		1357
		1358	my $pl = cf::player::load_pl $f
		1359	or return;
		1360	local $cf::PLAYER_LOADING{$login} = $pl;
		1361	$f->resolve_delayed_derefs;
1245	$cf::PLAYER{$login} = $pl	1362	$cf::PLAYER{$login} = $pl
1246	}	1363	}
1247	}	1364	}
1248	}	1365	}
1249		1366
…		…
1259		1376
1260	aio_mkdir playerdir $pl, 0770;	1377	aio_mkdir playerdir $pl, 0770;
1261	$pl->{last_save} = $cf::RUNTIME;	1378	$pl->{last_save} = $cf::RUNTIME;
1262		1379
1263	$pl->save_pl ($path);	1380	$pl->save_pl ($path);
1264	Coro::cede;	1381	cf::cede_to_tick;
1265	}	1382	}
1266		1383
1267	sub new($) {	1384	sub new($) {
1268	my ($login) = @_;	1385	my ($login) = @_;
1269		1386
…		…
1273	$self->{deny_save} = 1;	1390	$self->{deny_save} = 1;
1274		1391
1275	$cf::PLAYER{$login} = $self;	1392	$cf::PLAYER{$login} = $self;
1276		1393
1277	$self	1394	$self
		1395	}
		1396
		1397	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1398
		1399	=cut
		1400
		1401	sub send_msg {
		1402	my $ns = shift->ns
		1403	or return;
		1404	$ns->send_msg (@_);
1278	}	1405	}
1279		1406
1280	=item $pl->quit_character	1407	=item $pl->quit_character
1281		1408
1282	Nukes the player without looking back. If logged in, the connection will	1409	Nukes the player without looking back. If logged in, the connection will
…		…
1337	or return [];	1464	or return [];
1338		1465
1339	my @logins;	1466	my @logins;
1340		1467
1341	for my $login (@$dirs) {	1468	for my $login (@$dirs) {
		1469	my $path = path $login;
		1470
		1471	# a .pst is a dead give-away for a valid player
		1472	unless (-e "$path.pst") {
1342	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1473	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1343	aio_read $fh, 0, 512, my $buf, 0 or next;	1474	aio_read $fh, 0, 512, my $buf, 0 or next;
1344	$buf !~ /^password -------------$/m or next; # official not-valid tag	1475	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1476	}
1345		1477
1346	utf8::decode $login;	1478	utf8::decode $login;
1347	push @logins, $login;	1479	push @logins, $login;
1348	}	1480	}
1349		1481
…		…
1387	sub expand_cfpod {	1519	sub expand_cfpod {
1388	((my $self), (local $_)) = @_;	1520	((my $self), (local $_)) = @_;
1389		1521
1390	# escape & and <	1522	# escape & and <
1391	s/&/&amp;/g;	1523	s/&/&amp;/g;
1392	s/(?<![BIUGH])</&lt;/g;	1524	s/(?<![BIUGHT])</&lt;/g;
1393		1525
1394	# this is buggy, it needs to properly take care of nested <'s	1526	# this is buggy, it needs to properly take care of nested <'s
1395		1527
1396	1 while	1528	1 while
1397	# replace B<>, I<>, U<> etc.	1529	# replace B<>, I<>, U<> etc.
1398	s/B<([^\>]*)>/<b>$1<\/b>/	1530	s/B<([^\>]*)>/<b>$1<\/b>/
1399	|| s/I<([^\>]*)>/<i>$1<\/i>/	1531	|| s/I<([^\>]*)>/<i>$1<\/i>/
1400	|| s/U<([^\>]*)>/<u>$1<\/u>/	1532	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1533	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1401	# replace G<male|female> tags	1534	# replace G<male|female> tags
1402	|| s{G<([^>|]*)\|([^>]*)>}{	1535	|| s{G<([^>|]*)\|([^>]*)>}{
1403	$self->gender ? $2 : $1	1536	$self->gender ? $2 : $1
1404	}ge	1537	}ge
1405	# replace H<hint text>	1538	# replace H<hint text>
1406	|| s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;	1539	|| s{H<([^\>]*)>}
		1540	{
		1541	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1542	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1543	"")
		1544	[$self->{hintmode}]
		1545	}ge;
1407		1546
1408	# create single paragraphs (very hackish)	1547	# create single paragraphs (very hackish)
1409	s/(?<=\S)\n(?=\w)/ /g;	1548	s/(?<=\S)\n(?=\w)/ /g;
1410		1549
		1550	# compress some whitespace
		1551	s/\s+\n/\n/g; # ws line-ends
		1552	s/\n\n+/\n/g; # double lines
		1553	s/^\n+//; # beginning lines
		1554	s/\n+$//; # ending lines
		1555
1411	$_	1556	$_
1412	}	1557	}
1413		1558
		1559	sub hintmode {
		1560	$_[0]{hintmode} = $_[1] if @_ > 1;
		1561	$_[0]{hintmode}
		1562	}
		1563
1414	=item $player->ext_reply ($msgid, %msg)	1564	=item $player->ext_reply ($msgid, @msg)
1415		1565
1416	Sends an ext reply to the player.	1566	Sends an ext reply to the player.
1417		1567
1418	=cut	1568	=cut
1419		1569
1420	sub ext_reply($$%) {	1570	sub ext_reply($$@) {
1421	my ($self, $id, %msg) = @_;	1571	my ($self, $id, @msg) = @_;
1422		1572
1423	$msg{msgid} = $id;	1573	$self->ns->ext_reply ($id, @msg)
1424	$self->send ("ext " . cf::to_json \%msg);
1425	}	1574	}
1426		1575
1427	=item $player->ext_event ($type, %msg)	1576	=item $player->ext_msg ($type, @msg)
1428		1577
1429	Sends an ext event to the client.	1578	Sends an ext event to the client.
1430		1579
1431	=cut	1580	=cut
1432		1581
1433	sub ext_event($$%) {	1582	sub ext_msg($$@) {
1434	my ($self, $type, %msg) = @_;	1583	my ($self, $type, @msg) = @_;
1435		1584
1436	$self->ns->ext_event ($type, %msg);	1585	$self->ns->ext_msg ($type, @msg);
1437	}	1586	}
1438		1587
1439	=head3 cf::region	1588	=head3 cf::region
1440		1589
1441	=over 4	1590	=over 4
…		…
1454	my ($path) = @_;	1603	my ($path) = @_;
1455		1604
1456	my ($match, $specificity);	1605	my ($match, $specificity);
1457		1606
1458	for my $region (list) {	1607	for my $region (list) {
1459	if ($region->match && $path =~ $region->match) {	1608	if ($region->{match} && $path =~ $region->{match}) {
1460	($match, $specificity) = ($region, $region->specificity)	1609	($match, $specificity) = ($region, $region->specificity)
1461	if $region->specificity > $specificity;	1610	if $region->specificity > $specificity;
1462	}	1611	}
1463	}	1612	}
1464		1613
…		…
1584	$self->init; # pass $1 etc.	1733	$self->init; # pass $1 etc.
1585	return $self;	1734	return $self;
1586	}	1735	}
1587	}	1736	}
1588		1737
1589	Carp::carp "unable to resolve path '$path' (base '$base').";	1738	Carp::cluck "unable to resolve path '$path' (base '$base').";
1590	()	1739	()
1591	}	1740	}
1592		1741
1593	sub init {	1742	sub init {
1594	my ($self) = @_;	1743	my ($self) = @_;
…		…
1657		1806
1658	sub load_header_from($) {	1807	sub load_header_from($) {
1659	my ($self, $path) = @_;	1808	my ($self, $path) = @_;
1660		1809
1661	utf8::encode $path;	1810	utf8::encode $path;
1662	#aio_open $path, O_RDONLY, 0	1811	my $f = new_from_file cf::object::thawer $path
1663	# or return;
1664
1665	$self->_load_header ($path)
1666	or return;	1812	or return;
		1813
		1814	$self->_load_header ($f)
		1815	or return;
		1816
		1817	local $MAP_LOADING{$self->{path}} = $self;
		1818	$f->resolve_delayed_derefs;
1667		1819
1668	$self->{load_path} = $path;	1820	$self->{load_path} = $path;
1669		1821
1670	1	1822	1
1671	}	1823	}
…		…
1725	sub find {	1877	sub find {
1726	my ($path, $origin) = @_;	1878	my ($path, $origin) = @_;
1727		1879
1728	$path = normalise $path, $origin && $origin->path;	1880	$path = normalise $path, $origin && $origin->path;
1729		1881
		1882	cf::lock_wait "map_data:$path";#d#remove
1730	cf::lock_wait "map_find:$path";	1883	cf::lock_wait "map_find:$path";
1731		1884
1732	$cf::MAP{$path} || do {	1885	$cf::MAP{$path} || do {
1733	my $guard = cf::lock_acquire "map_find:$path";	1886	my $guard1 = cf::lock_acquire "map_find:$path";
		1887	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1888
1734	my $map = new_from_path cf::map $path	1889	my $map = new_from_path cf::map $path
1735	or return;	1890	or return;
1736		1891
1737	$map->{last_save} = $cf::RUNTIME;	1892	$map->{last_save} = $cf::RUNTIME;
1738		1893
…		…
1740	or return;	1895	or return;
1741		1896
1742	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1897	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1743	# doing this can freeze the server in a sync job, obviously	1898	# doing this can freeze the server in a sync job, obviously
1744	#$cf::WAIT_FOR_TICK->wait;	1899	#$cf::WAIT_FOR_TICK->wait;
		1900	undef $guard1;
		1901	undef $guard2;
1745	$map->reset;	1902	$map->reset;
1746	undef $guard;
1747	return find $path;	1903	return find $path;
1748	}	1904	}
1749		1905
1750	$cf::MAP{$path} = $map	1906	$cf::MAP{$path} = $map
1751	}	1907	}
…		…
1760	local $self->{deny_reset} = 1; # loading can take a long time	1916	local $self->{deny_reset} = 1; # loading can take a long time
1761		1917
1762	my $path = $self->{path};	1918	my $path = $self->{path};
1763		1919
1764	{	1920	{
1765	my $guard = cf::lock_acquire "map_load:$path";	1921	my $guard = cf::lock_acquire "map_data:$path";
1766		1922
		1923	return unless $self->valid;
1767	return if $self->in_memory != cf::MAP_SWAPPED;	1924	return unless $self->in_memory == cf::MAP_SWAPPED;
1768		1925
1769	$self->in_memory (cf::MAP_LOADING);	1926	$self->in_memory (cf::MAP_LOADING);
1770		1927
1771	$self->alloc;	1928	$self->alloc;
1772		1929
1773	$self->pre_load;	1930	$self->pre_load;
1774	Coro::cede;	1931	cf::cede_to_tick;
1775		1932
		1933	my $f = new_from_file cf::object::thawer $self->{load_path};
		1934	$f->skip_block;
1776	$self->_load_objects ($self->{load_path}, 1)	1935	$self->_load_objects ($f)
1777	or return;	1936	or return;
1778		1937
1779	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1938	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1780	if delete $self->{load_original};	1939	if delete $self->{load_original};
1781		1940
1782	if (my $uniq = $self->uniq_path) {	1941	if (my $uniq = $self->uniq_path) {
1783	utf8::encode $uniq;	1942	utf8::encode $uniq;
1784	if (aio_open $uniq, O_RDONLY, 0) {	1943	unless (aio_stat $uniq) {
		1944	if (my $f = new_from_file cf::object::thawer $uniq) {
1785	$self->clear_unique_items;	1945	$self->clear_unique_items;
1786	$self->_load_objects ($uniq, 0);	1946	$self->_load_objects ($f);
		1947	$f->resolve_delayed_derefs;
		1948	}
1787	}	1949	}
1788	}	1950	}
1789		1951
1790	Coro::cede;	1952	$f->resolve_delayed_derefs;
		1953
		1954	cf::cede_to_tick;
1791	# now do the right thing for maps	1955	# now do the right thing for maps
1792	$self->link_multipart_objects;	1956	$self->link_multipart_objects;
1793	$self->difficulty ($self->estimate_difficulty)	1957	$self->difficulty ($self->estimate_difficulty)
1794	unless $self->difficulty;	1958	unless $self->difficulty;
1795	Coro::cede;	1959	cf::cede_to_tick;
1796		1960
1797	unless ($self->{deny_activate}) {	1961	unless ($self->{deny_activate}) {
1798	$self->decay_objects;	1962	$self->decay_objects;
1799	$self->fix_auto_apply;	1963	$self->fix_auto_apply;
1800	$self->update_buttons;	1964	$self->update_buttons;
1801	Coro::cede;	1965	cf::cede_to_tick;
1802	$self->set_darkness_map;	1966	$self->set_darkness_map;
1803	Coro::cede;	1967	cf::cede_to_tick;
1804	$self->activate;	1968	$self->activate;
1805	}	1969	}
		1970
		1971	$self->{last_save} = $cf::RUNTIME;
		1972	$self->last_access ($cf::RUNTIME);
1806		1973
1807	$self->in_memory (cf::MAP_IN_MEMORY);	1974	$self->in_memory (cf::MAP_IN_MEMORY);
1808	}	1975	}
1809		1976
1810	$self->post_load;	1977	$self->post_load;
…		…
1821		1988
1822	$self	1989	$self
1823	}	1990	}
1824		1991
1825	# find and load all maps in the 3x3 area around a map	1992	# find and load all maps in the 3x3 area around a map
1826	sub load_diag {	1993	sub load_neighbours {
1827	my ($map) = @_;	1994	my ($map) = @_;
1828		1995
1829	my @diag; # diagonal neighbours	1996	my @neigh; # diagonal neighbours
1830		1997
1831	for (0 .. 3) {	1998	for (0 .. 3) {
1832	my $neigh = $map->tile_path ($_)	1999	my $neigh = $map->tile_path ($_)
1833	or next;	2000	or next;
1834	$neigh = find $neigh, $map	2001	$neigh = find $neigh, $map
1835	or next;	2002	or next;
1836	$neigh->load;	2003	$neigh->load;
1837		2004
		2005	push @neigh,
1838	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2006	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1839	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2007	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1840	}	2008	}
1841		2009
1842	for (@diag) {	2010	for (grep defined $_->[0], @neigh) {
		2011	my ($path, $origin) = @$_;
1843	my $neigh = find @$_	2012	my $neigh = find $path, $origin
1844	or next;	2013	or next;
1845	$neigh->load;	2014	$neigh->load;
1846	}	2015	}
1847	}	2016	}
1848		2017
…		…
1853	}	2022	}
1854		2023
1855	sub do_load_sync {	2024	sub do_load_sync {
1856	my ($map) = @_;	2025	my ($map) = @_;
1857		2026
		2027	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2028	if $Coro::current == $Coro::main;
		2029
1858	cf::sync_job { $map->load };	2030	cf::sync_job { $map->load };
1859	}	2031	}
1860		2032
1861	our %MAP_PREFETCH;	2033	our %MAP_PREFETCH;
1862	our $MAP_PREFETCHER = undef;	2034	our $MAP_PREFETCHER = undef;
1863		2035
1864	sub find_async {	2036	sub find_async {
1865	my ($path, $origin) = @_;	2037	my ($path, $origin, $load) = @_;
1866		2038
1867	$path = normalise $path, $origin && $origin->{path};	2039	$path = normalise $path, $origin && $origin->{path};
1868		2040
1869	if (my $map = $cf::MAP{$path}) {	2041	if (my $map = $cf::MAP{$path}) {
1870	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2042	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1871	}	2043	}
1872		2044
1873	undef $MAP_PREFETCH{$path};	2045	$MAP_PREFETCH{$path} |= $load;
		2046
1874	$MAP_PREFETCHER ||= cf::async {	2047	$MAP_PREFETCHER ||= cf::async {
		2048	$Coro::current->{desc} = "map prefetcher";
		2049
1875	while (%MAP_PREFETCH) {	2050	while (%MAP_PREFETCH) {
1876	for my $path (keys %MAP_PREFETCH) {	2051	while (my ($k, $v) = each %MAP_PREFETCH) {
1877	my $map = find $path	2052	if (my $map = find $k) {
1878	or next;
1879	$map->load;	2053	$map->load if $v;
		2054	}
1880		2055
1881	delete $MAP_PREFETCH{$path};	2056	delete $MAP_PREFETCH{$k};
1882	}	2057	}
1883	}	2058	}
1884	undef $MAP_PREFETCHER;	2059	undef $MAP_PREFETCHER;
1885	};	2060	};
1886	$MAP_PREFETCHER->prio (6);	2061	$MAP_PREFETCHER->prio (6);
…		…
1889	}	2064	}
1890		2065
1891	sub save {	2066	sub save {
1892	my ($self) = @_;	2067	my ($self) = @_;
1893		2068
1894	my $lock = cf::lock_acquire "map_data:" . $self->path;	2069	my $lock = cf::lock_acquire "map_data:$self->{path}";
1895		2070
1896	$self->{last_save} = $cf::RUNTIME;	2071	$self->{last_save} = $cf::RUNTIME;
1897		2072
1898	return unless $self->dirty;	2073	return unless $self->dirty;
1899		2074
…		…
1905	return if $self->{deny_save};	2080	return if $self->{deny_save};
1906		2081
1907	local $self->{last_access} = $self->last_access;#d#	2082	local $self->{last_access} = $self->last_access;#d#
1908		2083
1909	cf::async {	2084	cf::async {
		2085	$Coro::current->{desc} = "map player save";
1910	$_->contr->save for $self->players;	2086	$_->contr->save for $self->players;
1911	};	2087	};
1912		2088
1913	if ($uniq) {	2089	if ($uniq) {
1914	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2090	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
1922	my ($self) = @_;	2098	my ($self) = @_;
1923		2099
1924	# save first because save cedes	2100	# save first because save cedes
1925	$self->save;	2101	$self->save;
1926		2102
1927	my $lock = cf::lock_acquire "map_data:" . $self->path;	2103	my $lock = cf::lock_acquire "map_data:$self->{path}";
1928		2104
1929	return if $self->players;	2105	return if $self->players;
1930	return if $self->in_memory != cf::MAP_IN_MEMORY;	2106	return if $self->in_memory != cf::MAP_IN_MEMORY;
1931	return if $self->{deny_save};	2107	return if $self->{deny_save};
1932		2108
		2109	$self->in_memory (cf::MAP_SWAPPED);
		2110
		2111	$self->deactivate;
		2112	$_->clear_links_to ($self) for values %cf::MAP;
1933	$self->clear;	2113	$self->clear;
1934	$self->in_memory (cf::MAP_SWAPPED);
1935	}	2114	}
1936		2115
1937	sub reset_at {	2116	sub reset_at {
1938	my ($self) = @_;	2117	my ($self) = @_;
1939		2118
…		…
1971	if $uniq;	2150	if $uniq;
1972	}	2151	}
1973		2152
1974	delete $cf::MAP{$self->path};	2153	delete $cf::MAP{$self->path};
1975		2154
		2155	$self->deactivate;
		2156	$_->clear_links_to ($self) for values %cf::MAP;
1976	$self->clear;	2157	$self->clear;
1977
1978	$_->clear_links_to ($self) for values %cf::MAP;
1979		2158
1980	$self->unlink_save;	2159	$self->unlink_save;
1981	$self->destroy;	2160	$self->destroy;
1982	}	2161	}
1983		2162
1984	my $nuke_counter = "aaaa";	2163	my $nuke_counter = "aaaa";
1985		2164
1986	sub nuke {	2165	sub nuke {
1987	my ($self) = @_;	2166	my ($self) = @_;
1988		2167
		2168	{
		2169	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2170
1989	delete $cf::MAP{$self->path};	2171	delete $cf::MAP{$self->path};
1990		2172
1991	$self->unlink_save;	2173	$self->unlink_save;
1992		2174
1993	bless $self, "cf::map";	2175	bless $self, "cf::map";
1994	delete $self->{deny_reset};	2176	delete $self->{deny_reset};
1995	$self->{deny_save} = 1;	2177	$self->{deny_save} = 1;
1996	$self->reset_timeout (1);	2178	$self->reset_timeout (1);
1997	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2179	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1998		2180
1999	$cf::MAP{$self->path} = $self;	2181	$cf::MAP{$self->path} = $self;
		2182	}
2000		2183
2001	$self->reset; # polite request, might not happen	2184	$self->reset; # polite request, might not happen
2002	}	2185	}
2003		2186
2004	=item $maps = cf::map::tmp_maps	2187	=item $maps = cf::map::tmp_maps
…		…
2080		2263
2081	sub inv_recursive {	2264	sub inv_recursive {
2082	inv_recursive_ inv $_[0]	2265	inv_recursive_ inv $_[0]
2083	}	2266	}
2084		2267
		2268	=item $ref = $ob->ref
		2269
		2270	creates and returns a persistent reference to an objetc that can be stored as a string.
		2271
		2272	=item $ob = cf::object::deref ($refstring)
		2273
		2274	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2275	even if the object actually exists. May block.
		2276
		2277	=cut
		2278
		2279	sub deref {
		2280	my ($ref) = @_;
		2281
		2282	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2283	my ($uuid, $name) = ($1, $2);
		2284	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2285	or return;
		2286	$pl->ob->uuid eq $uuid
		2287	or return;
		2288
		2289	$pl->ob
		2290	} else {
		2291	warn "$ref: cannot resolve object reference\n";
		2292	undef
		2293	}
		2294	}
		2295
2085	package cf;	2296	package cf;
2086		2297
2087	=back	2298	=back
2088		2299
2089	=head3 cf::object::player	2300	=head3 cf::object::player
…		…
2111		2322
2112	} else {	2323	} else {
2113	my $pl = $self->contr;	2324	my $pl = $self->contr;
2114		2325
2115	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2326	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2116	my $diag = $pl->{npc_dialog};	2327	my $dialog = $pl->{npc_dialog};
2117	$diag->{pl}->ext_reply (	2328	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2118	$diag->{id},
2119	msgtype => "reply",
2120	msg => $diag->{pl}->expand_cfpod ($msg),
2121	add_topics => []
2122	);
2123		2329
2124	} else {	2330	} else {
2125	$msg = $npc->name . " says: $msg" if $npc;	2331	$msg = $npc->name . " says: $msg" if $npc;
2126	$self->message ($msg, $flags);	2332	$self->message ($msg, $flags);
2127	}	2333	}
2128	}	2334	}
		2335	}
		2336
		2337	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2338
		2339	=cut
		2340
		2341	sub cf::object::send_msg {
		2342	my $pl = shift->contr
		2343	or return;
		2344	$pl->send_msg (@_);
2129	}	2345	}
2130		2346
2131	=item $player_object->may ("access")	2347	=item $player_object->may ("access")
2132		2348
2133	Returns wether the given player is authorized to access resource "access"	2349	Returns wether the given player is authorized to access resource "access"
…		…
2212	# use -1 or undef as default coordinates, not 0, 0	2428	# use -1 or undef as default coordinates, not 0, 0
2213	($x, $y) = ($map->enter_x, $map->enter_y)	2429	($x, $y) = ($map->enter_x, $map->enter_y)
2214	if $x <=0 && $y <= 0;	2430	if $x <=0 && $y <= 0;
2215		2431
2216	$map->load;	2432	$map->load;
2217	$map->load_diag;	2433	$map->load_neighbours;
2218		2434
2219	return unless $self->contr->active;	2435	return unless $self->contr->active;
2220	$self->activate_recursive;	2436	$self->activate_recursive;
2221		2437
2222	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2438	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223	$self->enter_map ($map, $x, $y);	2439	$self->enter_map ($map, $x, $y);
2224	}	2440	}
2225		2441
2226	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2442	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2227		2443
2228	Moves the player to the given map-path and coordinates by first freezing	2444	Moves the player to the given map-path and coordinates by first freezing
2229	her, loading and preparing them map, calling the provided $check callback	2445	her, loading and preparing them map, calling the provided $check callback
2230	that has to return the map if sucecssful, and then unfreezes the player on	2446	that has to return the map if sucecssful, and then unfreezes the player on
2231	the new (success) or old (failed) map position.	2447	the new (success) or old (failed) map position. In either case, $done will
		2448	be called at the end of this process.
2232		2449
2233	=cut	2450	=cut
2234		2451
2235	our $GOTOGEN;	2452	our $GOTOGEN;
2236		2453
2237	sub cf::object::player::goto {	2454	sub cf::object::player::goto {
2238	my ($self, $path, $x, $y, $check) = @_;	2455	my ($self, $path, $x, $y, $check, $done) = @_;
2239		2456
2240	# do generation counting so two concurrent goto's will be executed in-order	2457	# do generation counting so two concurrent goto's will be executed in-order
2241	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2458	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242		2459
2243	$self->enter_link;	2460	$self->enter_link;
2244		2461
2245	(async {	2462	(async {
		2463	$Coro::current->{desc} = "player::goto $path $x $y";
		2464
		2465	# *tag paths override both path and x|y
		2466	if ($path =~ /^\*(.*)$/) {
		2467	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2468	my $ob = $obs[rand @obs];
		2469
		2470	# see if we actually can go there
		2471	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2472	$ob = $obs[rand @obs];
		2473	} else {
		2474	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2475	}
		2476	# else put us there anyways for now #d#
		2477
		2478	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2479	} else {
		2480	($path, $x, $y) = (undef, undef, undef);
		2481	}
		2482	}
		2483
2246	my $map = eval {	2484	my $map = eval {
2247	my $map = cf::map::find $path;	2485	my $map = defined $path ? cf::map::find $path : undef;
2248		2486
2249	if ($map) {	2487	if ($map) {
2250	$map = $map->customise_for ($self);	2488	$map = $map->customise_for ($self);
2251	$map = $check->($map) if $check && $map;	2489	$map = $check->($map) if $check && $map;
2252	} else {	2490	} else {
2253	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2491	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2254	}	2492	}
2255		2493
2256	$map	2494	$map
2257	};	2495	};
2258		2496
…		…
2263		2501
2264	if ($gen == $self->{_goto_generation}) {	2502	if ($gen == $self->{_goto_generation}) {
2265	delete $self->{_goto_generation};	2503	delete $self->{_goto_generation};
2266	$self->leave_link ($map, $x, $y);	2504	$self->leave_link ($map, $x, $y);
2267	}	2505	}
		2506
		2507	$done->() if $done;
2268	})->prio (1);	2508	})->prio (1);
2269	}	2509	}
2270		2510
2271	=item $player_object->enter_exit ($exit_object)	2511	=item $player_object->enter_exit ($exit_object)
2272		2512
…		…
2341	my $hp = $exit->stats->hp;	2581	my $hp = $exit->stats->hp;
2342	my $sp = $exit->stats->sp;	2582	my $sp = $exit->stats->sp;
2343		2583
2344	$self->enter_link;	2584	$self->enter_link;
2345		2585
		2586	# if exit is damned, update players death & WoR home-position
		2587	$self->contr->savebed ($slaying, $hp, $sp)
		2588	if $exit->flag (FLAG_DAMNED);
		2589
2346	(async {	2590	(async {
		2591	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2592
2347	$self->deactivate_recursive; # just to be sure	2593	$self->deactivate_recursive; # just to be sure
2348	unless (eval {	2594	unless (eval {
2349	$self->goto ($slaying, $hp, $sp);	2595	$self->goto ($slaying, $hp, $sp);
2350		2596
2351	1;	2597	1;
…		…
2377		2623
2378	utf8::encode $text;	2624	utf8::encode $text;
2379	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2625	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2380	}	2626	}
2381		2627
2382	=item $client->send_msg ($color, $type, $msg, [extra...])	2628	=item $client->send_msg ($channel, $msg, $color, [extra...])
2383		2629
2384	Send a drawinfo or msg packet to the client, formatting the msg for the	2630	Send a drawinfo or msg packet to the client, formatting the msg for the
2385	client if neccessary. C<$type> should be a string identifying the type of	2631	client if neccessary. C<$type> should be a string identifying the type of
2386	the message, with C<log> being the default. If C<$color> is negative, suppress	2632	the message, with C<log> being the default. If C<$color> is negative, suppress
2387	the message unless the client supports the msg packet.	2633	the message unless the client supports the msg packet.
2388		2634
2389	=cut	2635	=cut
2390		2636
		2637	our %CHANNEL = (
		2638	"c/identify" => {
		2639	id => "infobox",
		2640	title => "Identify",
		2641	reply => undef,
		2642	tooltip => "Items recently identified",
		2643	},
		2644	"c/examine" => {
		2645	id => "infobox",
		2646	title => "Examine",
		2647	reply => undef,
		2648	tooltip => "Signs and other items you examined",
		2649	},
		2650	"c/lookat" => {
		2651	id => "infobox",
		2652	title => "Look",
		2653	reply => undef,
		2654	tooltip => "What you saw there",
		2655	},
		2656	);
		2657
2391	sub cf::client::send_msg {	2658	sub cf::client::send_msg {
2392	my ($self, $color, $type, $msg, @extra) = @_;	2659	my ($self, $channel, $msg, $color, @extra) = @_;
2393		2660
2394	$msg = $self->pl->expand_cfpod ($msg);	2661	$msg = $self->pl->expand_cfpod ($msg);
2395		2662
		2663	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2664
		2665	# check predefined channels, for the benefit of C
		2666	if ($CHANNEL{$channel}) {
		2667	$channel = $CHANNEL{$channel};
		2668
		2669	$self->ext_msg (channel_info => $channel)
		2670	if $self->can_msg;
		2671
		2672	$channel = $channel->{id};
		2673
		2674	} elsif (ref $channel) {
		2675	# send meta info to client, if not yet sent
		2676	unless (exists $self->{channel}{$channel->{id}}) {
		2677	$self->{channel}{$channel->{id}} = $channel;
		2678	$self->ext_msg (channel_info => $channel)
		2679	if $self->can_msg;
		2680	}
		2681
		2682	$channel = $channel->{id};
		2683	}
		2684
		2685	return unless @extra || length $msg;
		2686
2396	if ($self->can_msg) {	2687	if ($self->can_msg) {
2397	$self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);	2688	# default colour, mask it out
		2689	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2690	if $color & cf::NDI_DEF;
		2691
		2692	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2693	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2398	} else {	2694	} else {
2399	# replace some tags by gcfclient-compatible ones
2400	for ($msg) {
2401	1 while
2402	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2403	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2404	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2405	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2406	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2407	}
2408
2409	if ($color >= 0) {	2695	if ($color >= 0) {
		2696	# replace some tags by gcfclient-compatible ones
		2697	for ($msg) {
		2698	1 while
		2699	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2700	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2701	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2702	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2703	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2704	}
		2705
		2706	$color &= cf::NDI_COLOR_MASK;
		2707
		2708	utf8::encode $msg;
		2709
2410	if (0 && $msg =~ /\[/) {	2710	if (0 && $msg =~ /\[/) {
		2711	# COMMAND/INFO
2411	$self->send_packet ("drawextinfo $color 4 0 $msg")	2712	$self->send_packet ("drawextinfo $color 10 8 $msg")
2412	} else {	2713	} else {
2413	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	2714	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2414	$self->send_packet ("drawinfo $color $msg")	2715	$self->send_packet ("drawinfo $color $msg")
2415	}	2716	}
2416	}	2717	}
2417	}	2718	}
2418	}	2719	}
2419		2720
2420	=item $client->ext_event ($type, %msg)	2721	=item $client->ext_msg ($type, @msg)
2421		2722
2422	Sends an ext event to the client.	2723	Sends an ext event to the client.
2423		2724
2424	=cut	2725	=cut
2425		2726
2426	sub cf::client::ext_event($$%) {	2727	sub cf::client::ext_msg($$@) {
2427	my ($self, $type, %msg) = @_;	2728	my ($self, $type, @msg) = @_;
2428		2729
		2730	if ($self->extcmd == 2) {
		2731	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2732	} elsif ($self->extcmd == 1) { # TODO: remove
2429	$msg{msgtype} = "event_$type";	2733	push @msg, msgtype => "event_$type";
2430	$self->send_packet ("ext " . cf::to_json \%msg);	2734	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2735	}
		2736	}
		2737
		2738	=item $client->ext_reply ($msgid, @msg)
		2739
		2740	Sends an ext reply to the client.
		2741
		2742	=cut
		2743
		2744	sub cf::client::ext_reply($$@) {
		2745	my ($self, $id, @msg) = @_;
		2746
		2747	if ($self->extcmd == 2) {
		2748	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2749	} elsif ($self->extcmd == 1) {
		2750	#TODO: version 1, remove
		2751	unshift @msg, msgtype => "reply", msgid => $id;
		2752	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2753	}
2431	}	2754	}
2432		2755
2433	=item $success = $client->query ($flags, "text", \&cb)	2756	=item $success = $client->query ($flags, "text", \&cb)
2434		2757
2435	Queues a query to the client, calling the given callback with	2758	Queues a query to the client, calling the given callback with
…		…
2458		2781
2459	1	2782	1
2460	}	2783	}
2461		2784
2462	cf::client->attach (	2785	cf::client->attach (
		2786	on_connect => sub {
		2787	my ($ns) = @_;
		2788
		2789	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2790	},
2463	on_reply => sub {	2791	on_reply => sub {
2464	my ($ns, $msg) = @_;	2792	my ($ns, $msg) = @_;
2465		2793
2466	# this weird shuffling is so that direct followup queries	2794	# this weird shuffling is so that direct followup queries
2467	# get handled first	2795	# get handled first
…		…
2482	}	2810	}
2483	},	2811	},
2484	on_exticmd => sub {	2812	on_exticmd => sub {
2485	my ($ns, $buf) = @_;	2813	my ($ns, $buf) = @_;
2486		2814
2487	my $msg = eval { from_json $buf };	2815	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488		2816
2489	if (ref $msg) {	2817	if (ref $msg) {
		2818	my ($type, $reply, @payload) =
		2819	"ARRAY" eq ref $msg
		2820	? @$msg
		2821	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2822
		2823	my @reply;
		2824
2490	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2825	if (my $cb = $EXTICMD{$type}) {
2491	if (my %reply = $cb->($ns, $msg)) {	2826	@reply = $cb->($ns, @payload);
2492	$reply{msgid} = $msg->{msgid};
2493	$ns->send ("ext " . cf::to_json \%reply);
2494	}
2495	}	2827	}
		2828
		2829	$ns->ext_reply ($reply, @reply)
		2830	if $reply;
		2831
2496	} else {	2832	} else {
2497	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2833	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2498	}	2834	}
2499		2835
2500	cf::override;	2836	cf::override;
…		…
2547	our $safe = new Safe "safe";	2883	our $safe = new Safe "safe";
2548	our $safe_hole = new Safe::Hole;	2884	our $safe_hole = new Safe::Hole;
2549		2885
2550	$SIG{FPE} = 'IGNORE';	2886	$SIG{FPE} = 'IGNORE';
2551		2887
2552	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2888	$safe->permit_only (Opcode::opset qw(
		2889	:base_core :base_mem :base_orig :base_math
		2890	grepstart grepwhile mapstart mapwhile
		2891	sort time
		2892	));
2553		2893
2554	# here we export the classes and methods available to script code	2894	# here we export the classes and methods available to script code
2555		2895
2556	=pod	2896	=pod
2557		2897
2558	The following functions and methods are available within a safe environment:	2898	The following functions and methods are available within a safe environment:
2559		2899
2560	cf::object contr pay_amount pay_player map	2900	cf::object
		2901	contr pay_amount pay_player map x y force_find force_add destroy
		2902	insert remove name archname title slaying race decrease_ob_nr
		2903
2561	cf::object::player player	2904	cf::object::player
2562	cf::player peaceful	2905	player
2563	cf::map trigger	2906
		2907	cf::player
		2908	peaceful
		2909
		2910	cf::map
		2911	trigger
2564		2912
2565	=cut	2913	=cut
2566		2914
2567	for (	2915	for (
2568	["cf::object" => qw(contr pay_amount pay_player map)],	2916	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2917	insert remove inv name archname title slaying race
		2918	decrease_ob_nr destroy)],
2569	["cf::object::player" => qw(player)],	2919	["cf::object::player" => qw(player)],
2570	["cf::player" => qw(peaceful)],	2920	["cf::player" => qw(peaceful)],
2571	["cf::map" => qw(trigger)],	2921	["cf::map" => qw(trigger)],
2572	) {	2922	) {
2573	no strict 'refs';	2923	no strict 'refs';
…		…
2649	# the server's init and main functions	2999	# the server's init and main functions
2650		3000
2651	sub load_facedata($) {	3001	sub load_facedata($) {
2652	my ($path) = @_;	3002	my ($path) = @_;
2653		3003
		3004	# HACK to clear player env face cache, we need some signal framework
		3005	# for this (global event?)
		3006	%ext::player_env::MUSIC_FACE_CACHE = ();
		3007
		3008	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3009
2654	warn "loading facedata from $path\n";	3010	warn "loading facedata from $path\n";
2655		3011
2656	my $facedata;	3012	my $facedata;
2657	0 < aio_load $path, $facedata	3013	0 < aio_load $path, $facedata
2658	or die "$path: $!";	3014	or die "$path: $!";
…		…
2660	$facedata = Coro::Storable::thaw $facedata;	3016	$facedata = Coro::Storable::thaw $facedata;
2661		3017
2662	$facedata->{version} == 2	3018	$facedata->{version} == 2
2663	or cf::cleanup "$path: version mismatch, cannot proceed.";	3019	or cf::cleanup "$path: version mismatch, cannot proceed.";
2664		3020
		3021	# patch in the exptable
		3022	$facedata->{resource}{"res/exp_table"} = {
		3023	type => FT_RSRC,
		3024	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3025	};
		3026	cf::cede_to_tick;
		3027
2665	{	3028	{
2666	my $faces = $facedata->{faceinfo};	3029	my $faces = $facedata->{faceinfo};
2667		3030
2668	while (my ($face, $info) = each %$faces) {	3031	while (my ($face, $info) = each %$faces) {
2669	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3032	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2670	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3033	cf::face::set_visibility $idx, $info->{visibility};
		3034	cf::face::set_magicmap $idx, $info->{magicmap};
2671	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3035	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2672	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3036	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2673	Coro::cede;	3037
		3038	cf::cede_to_tick;
2674	}	3039	}
2675		3040
2676	while (my ($face, $info) = each %$faces) {	3041	while (my ($face, $info) = each %$faces) {
2677	next unless $info->{smooth};	3042	next unless $info->{smooth};
2678	my $idx = cf::face::find $face	3043	my $idx = cf::face::find $face
2679	or next;	3044	or next;
2680	if (my $smooth = cf::face::find $info->{smooth}) {	3045	if (my $smooth = cf::face::find $info->{smooth}) {
		3046	cf::face::set_smooth $idx, $smooth;
2681	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3047	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682	} else {	3048	} else {
2683	warn "smooth face '$info->{smooth}' not found for face '$face'";	3049	warn "smooth face '$info->{smooth}' not found for face '$face'";
2684	}	3050	}
2685	Coro::cede;	3051
		3052	cf::cede_to_tick;
2686	}	3053	}
2687	}	3054	}
2688		3055
2689	{	3056	{
2690	my $anims = $facedata->{animinfo};	3057	my $anims = $facedata->{animinfo};
2691		3058
2692	while (my ($anim, $info) = each %$anims) {	3059	while (my ($anim, $info) = each %$anims) {
2693	cf::anim::set $anim, $info->{frames}, $info->{facings};	3060	cf::anim::set $anim, $info->{frames}, $info->{facings};
2694	Coro::cede;	3061	cf::cede_to_tick;
2695	}	3062	}
2696		3063
2697	cf::anim::invalidate_all; # d'oh	3064	cf::anim::invalidate_all; # d'oh
2698	}	3065	}
2699		3066
		3067	{
		3068	# TODO: for gcfclient pleasure, we should give resources
		3069	# that gcfclient doesn't grok a >10000 face index.
		3070	my $res = $facedata->{resource};
		3071
		3072	my $soundconf = delete $res->{"res/sound.conf"};
		3073
		3074	while (my ($name, $info) = each %$res) {
		3075	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3076	my $data;
		3077
		3078	if ($info->{type} & 1) {
		3079	# prepend meta info
		3080
		3081	my $meta = $enc->encode ({
		3082	name => $name,
		3083	%{ $info->{meta} || {} },
		3084	});
		3085
		3086	$data = pack "(w/a*)*", $meta, $info->{data};
		3087	} else {
		3088	$data = $info->{data};
		3089	}
		3090
		3091	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3092	cf::face::set_type $idx, $info->{type};
		3093
		3094	cf::cede_to_tick;
		3095	}
		3096
		3097	if ($soundconf) {
		3098	$soundconf = $enc->decode (delete $soundconf->{data});
		3099
		3100	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3101	my $sound = $soundconf->{compat}[$_]
		3102	or next;
		3103
		3104	my $face = cf::face::find "sound/$sound->[1]";
		3105	cf::sound::set $sound->[0] => $face;
		3106	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3107	}
		3108
		3109	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3110	my $face = cf::face::find "sound/$v";
		3111	cf::sound::set $k => $face;
		3112	}
		3113	}
		3114	}
		3115
2700	1	3116	1
2701	}	3117	}
2702		3118
		3119	register_exticmd fx_want => sub {
		3120	my ($ns, $want) = @_;
		3121
		3122	while (my ($k, $v) = each %$want) {
		3123	$ns->fx_want ($k, $v);
		3124	}
		3125	};
		3126
2703	sub reload_regions {	3127	sub reload_regions {
		3128	# HACK to clear player env face cache, we need some signal framework
		3129	# for this (global event?)
		3130	%ext::player_env::MUSIC_FACE_CACHE = ();
		3131
2704	load_resource_file "$MAPDIR/regions"	3132	load_resource_file "$MAPDIR/regions"
2705	or die "unable to load regions file\n";	3133	or die "unable to load regions file\n";
		3134
		3135	for (cf::region::list) {
		3136	$_->{match} = qr/$_->{match}/
		3137	if exists $_->{match};
		3138	}
2706	}	3139	}
2707		3140
2708	sub reload_facedata {	3141	sub reload_facedata {
2709	load_facedata "$DATADIR/facedata"	3142	load_facedata "$DATADIR/facedata"
2710	or die "unable to load facedata\n";	3143	or die "unable to load facedata\n";
2711	}	3144	}
2712		3145
2713	sub reload_archetypes {	3146	sub reload_archetypes {
		3147	load_resource_file "$DATADIR/archetypes"
		3148	or die "unable to load archetypes\n";
		3149	#d# NEED to laod twice to resolve forward references
		3150	# this really needs to be done in an extra post-pass
		3151	# (which needs to be synchronous, so solve it differently)
2714	load_resource_file "$DATADIR/archetypes"	3152	load_resource_file "$DATADIR/archetypes"
2715	or die "unable to load archetypes\n";	3153	or die "unable to load archetypes\n";
2716	}	3154	}
2717		3155
2718	sub reload_treasures {	3156	sub reload_treasures {
…		…
2734		3172
2735	sub init {	3173	sub init {
2736	reload_resources;	3174	reload_resources;
2737	}	3175	}
2738		3176
2739	sub cfg_load {	3177	sub reload_config {
2740	open my $fh, "<:utf8", "$CONFDIR/config"	3178	open my $fh, "<:utf8", "$CONFDIR/config"
2741	or return;	3179	or return;
2742		3180
2743	local $/;	3181	local $/;
2744	*CFG = YAML::Syck::Load <$fh>;	3182	*CFG = YAML::Syck::Load <$fh>;
…		…
2760	sub main {	3198	sub main {
2761	# we must not ever block the main coroutine	3199	# we must not ever block the main coroutine
2762	local $Coro::idle = sub {	3200	local $Coro::idle = sub {
2763	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3201	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2764	(async {	3202	(async {
		3203	$Coro::current->{desc} = "IDLE BUG HANDLER";
2765	Event::one_event;	3204	Event::one_event;
2766	})->prio (Coro::PRIO_MAX);	3205	})->prio (Coro::PRIO_MAX);
2767	};	3206	};
2768		3207
2769	cfg_load;	3208	reload_config;
2770	db_init;	3209	db_init;
2771	load_extensions;	3210	load_extensions;
2772		3211
2773	$TICK_WATCHER->start;	3212	$TICK_WATCHER->start;
2774	Event::loop;	3213	Event::loop;
…		…
2841	# and maps saved/destroyed asynchronously.	3280	# and maps saved/destroyed asynchronously.
2842	warn "begin emergency player save\n";	3281	warn "begin emergency player save\n";
2843	for my $login (keys %cf::PLAYER) {	3282	for my $login (keys %cf::PLAYER) {
2844	my $pl = $cf::PLAYER{$login} or next;	3283	my $pl = $cf::PLAYER{$login} or next;
2845	$pl->valid or next;	3284	$pl->valid or next;
		3285	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2846	$pl->save;	3286	$pl->save;
2847	}	3287	}
2848	warn "end emergency player save\n";	3288	warn "end emergency player save\n";
2849		3289
2850	warn "begin emergency map save\n";	3290	warn "begin emergency map save\n";
…		…
2967	warn "reloading cf.pm";	3407	warn "reloading cf.pm";
2968	require cf;	3408	require cf;
2969	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3409	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2970		3410
2971	warn "loading config and database again";	3411	warn "loading config and database again";
2972	cf::cfg_load;	3412	cf::reload_config;
2973		3413
2974	warn "loading extensions";	3414	warn "loading extensions";
2975	cf::load_extensions;	3415	cf::load_extensions;
2976		3416
2977	warn "reattaching attachments to objects/players";	3417	warn "reattaching attachments to objects/players";
…		…
3013	register_command "reload" => sub {	3453	register_command "reload" => sub {
3014	my ($who, $arg) = @_;	3454	my ($who, $arg) = @_;
3015		3455
3016	if ($who->flag (FLAG_WIZ)) {	3456	if ($who->flag (FLAG_WIZ)) {
3017	$who->message ("reloading server.");	3457	$who->message ("reloading server.");
		3458	async {
		3459	$Coro::current->{desc} = "perl_reload";
3018	async { reload_perl };	3460	reload_perl;
		3461	};
3019	}	3462	}
3020	};	3463	};
3021		3464
3022	unshift @INC, $LIBDIR;	3465	unshift @INC, $LIBDIR;
3023		3466
…		…
3042	my $signal = new Coro::Signal;	3485	my $signal = new Coro::Signal;
3043	push @WAIT_FOR_TICK_BEGIN, $signal;	3486	push @WAIT_FOR_TICK_BEGIN, $signal;
3044	$signal->wait;	3487	$signal->wait;
3045	}	3488	}
3046		3489
3047	my $min = 1e6;#d#
3048	my $avg = 10;
3049	$TICK_WATCHER = Event->timer (	3490	$TICK_WATCHER = Event->timer (
3050	reentrant => 0,	3491	reentrant => 0,
3051	parked => 1,	3492	parked => 1,
3052	prio => 0,	3493	prio => 0,
3053	at => $NEXT_TICK || $TICK,	3494	at => $NEXT_TICK || $TICK,
…		…
3061		3502
3062	$NOW = $tick_start = Event::time;	3503	$NOW = $tick_start = Event::time;
3063		3504
3064	cf::server_tick; # one server iteration	3505	cf::server_tick; # one server iteration
3065		3506
3066	0 && sync_job {#d#
3067	for(1..10) {
3068	my $t = Event::time;
3069	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3070	or die;
3071
3072	$map->width (50);
3073	$map->height (50);
3074	$map->alloc;
3075	$map->_load_objects ("/tmp/x.map", 1);
3076	my $t = Event::time - $t;
3077
3078	#next unless $t < 0.0013;#d#
3079	if ($t < $min) {
3080	$min = $t;
3081	}
3082	$avg = $avg * 0.99 + $t * 0.01;
3083	}
3084	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3085	exit 0;
3086	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3087	};
3088
3089	$RUNTIME += $TICK;	3507	$RUNTIME += $TICK;
3090	$NEXT_TICK += $TICK;	3508	$NEXT_TICK += $TICK;
3091		3509
3092	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3510	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3093	$NEXT_RUNTIME_WRITE = $NOW + 10;	3511	$NEXT_RUNTIME_WRITE = $NOW + 10;
3094	Coro::async_pool {	3512	Coro::async_pool {
		3513	$Coro::current->{desc} = "runtime saver";
3095	write_runtime	3514	write_runtime
3096	or warn "ERROR: unable to write runtime file: $!";	3515	or warn "ERROR: unable to write runtime file: $!";
3097	};	3516	};
3098	}	3517	}
3099		3518
3100	# my $AFTER = Event::time;
3101	# warn $AFTER - $NOW;#d#
3102
3103	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3519	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3104	$sig->send;	3520	$sig->send;
3105	}	3521	}
3106	while (my $sig = shift @WAIT_FOR_TICK) {	3522	while (my $sig = shift @WAIT_FOR_TICK) {
3107	$sig->send;	3523	$sig->send;
…		…
3117		3533
3118	$LOAD = ($NOW - $tick_start) / $TICK;	3534	$LOAD = ($NOW - $tick_start) / $TICK;
3119	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3535	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3120		3536
3121	_post_tick;	3537	_post_tick;
3122
3123
3124	},	3538	},
3125	);	3539	);
3126		3540
3127	{	3541	{
		3542	BDB::min_parallel 8;
3128	BDB::max_poll_time $TICK * 0.1;	3543	BDB::max_poll_time $TICK * 0.1;
3129	$BDB_POLL_WATCHER = Event->io (	3544	$BDB_POLL_WATCHER = Event->io (
3130	reentrant => 0,	3545	reentrant => 0,
3131	fd => BDB::poll_fileno,	3546	fd => BDB::poll_fileno,
3132	poll => 'r',	3547	poll => 'r',
3133	prio => 0,	3548	prio => 0,
3134	data => WF_AUTOCANCEL,	3549	data => WF_AUTOCANCEL,
3135	cb => \&BDB::poll_cb,	3550	cb => \&BDB::poll_cb,
3136	);	3551	);
3137	BDB::min_parallel 8;
3138		3552
3139	BDB::set_sync_prepare {	3553	BDB::set_sync_prepare {
3140	my $status;	3554	my $status;
3141	my $current = $Coro::current;	3555	my $current = $Coro::current;
3142	(	3556	(
…		…
3151	)	3565	)
3152	};	3566	};
3153		3567
3154	unless ($DB_ENV) {	3568	unless ($DB_ENV) {
3155	$DB_ENV = BDB::db_env_create;	3569	$DB_ENV = BDB::db_env_create;
		3570	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3571	| BDB::LOG_AUTOREMOVE, 1);
		3572	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3573	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3156		3574
3157	cf::sync_job {	3575	cf::sync_job {
3158	eval {	3576	eval {
3159	BDB::db_env_open	3577	BDB::db_env_open
3160	$DB_ENV,	3578	$DB_ENV,
…		…
3162	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3580	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3163	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3581	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3164	0666;	3582	0666;
3165		3583
3166	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3584	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3167
3168	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3169	$DB_ENV->set_lk_detect;
3170	};	3585	};
3171		3586
3172	cf::cleanup "db_env_open(db): $@" if $@;	3587	cf::cleanup "db_env_open(db): $@" if $@;
3173	};	3588	};
3174	}	3589	}
		3590
		3591	$BDB_DEADLOCK_WATCHER = Event->timer (
		3592	after => 3,
		3593	interval => 1,
		3594	hard => 1,
		3595	prio => 0,
		3596	data => WF_AUTOCANCEL,
		3597	cb => sub {
		3598	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3599	},
		3600	);
		3601	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3602	after => 11,
		3603	interval => 60,
		3604	hard => 1,
		3605	prio => 0,
		3606	data => WF_AUTOCANCEL,
		3607	cb => sub {
		3608	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3609	},
		3610	);
		3611	$BDB_TRICKLE_WATCHER = Event->timer (
		3612	after => 5,
		3613	interval => 10,
		3614	hard => 1,
		3615	prio => 0,
		3616	data => WF_AUTOCANCEL,
		3617	cb => sub {
		3618	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3619	},
		3620	);
3175	}	3621	}
3176		3622
3177	{	3623	{
3178	IO::AIO::min_parallel 8;	3624	IO::AIO::min_parallel 8;
3179		3625
…		…
3182	$AIO_POLL_WATCHER = Event->io (	3628	$AIO_POLL_WATCHER = Event->io (
3183	reentrant => 0,	3629	reentrant => 0,
3184	data => WF_AUTOCANCEL,	3630	data => WF_AUTOCANCEL,
3185	fd => IO::AIO::poll_fileno,	3631	fd => IO::AIO::poll_fileno,
3186	poll => 'r',	3632	poll => 'r',
3187	prio => 6,	3633	prio => 0,
3188	cb => \&IO::AIO::poll_cb,	3634	cb => \&IO::AIO::poll_cb,
3189	);	3635	);
3190	}	3636	}
3191		3637
3192	my $_log_backtrace;	3638	my $_log_backtrace;
…		…
3198		3644
3199	# limit the # of concurrent backtraces	3645	# limit the # of concurrent backtraces
3200	if ($_log_backtrace < 2) {	3646	if ($_log_backtrace < 2) {
3201	++$_log_backtrace;	3647	++$_log_backtrace;
3202	async {	3648	async {
		3649	$Coro::current->{desc} = "abt $msg";
		3650
3203	my @bt = fork_call {	3651	my @bt = fork_call {
3204	@addr = map { sprintf "%x", $_ } @addr;	3652	@addr = map { sprintf "%x", $_ } @addr;
3205	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3653	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3206	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	3654	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3207	or die "addr2line: $!";	3655	or die "addr2line: $!";

Diff Legend

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