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.385 by root, Fri Oct 12 19:13:26 2007 UTC

…		…
4	use strict;	4	use strict;
5		5
6	use Symbol;	6	use Symbol;
7	use List::Util;	7	use List::Util;
8	use Socket;	8	use Socket;
9	use Storable;
10	use Event;	9	use Event;
11	use Opcode;	10	use Opcode;
12	use Safe;	11	use Safe;
13	use Safe::Hole;	12	use Safe::Hole;
		13	use Storable ();
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, 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	return 1;#d#
		977
		978	#todo#d# kill yourself and do some recursive checking manually without storable
		979	sync_job {
		980	my $guard = Coro::Storable::guard;
		981	local $Storable::canonical = 1;
		982	my $fob1 = Storable::freeze $ob1;
		983	my $fob2 = Storable::freeze $ob2;
		984	$fob1 eq $fob2
		985	}
		986	}
899		987
900	sub reattach {	988	sub reattach {
901	# basically do the same as instantiate, without calling instantiate	989	# basically do the same as instantiate, without calling instantiate
902	my ($obj) = @_;	990	my ($obj) = @_;
903		991
…		…
950	sub object_freezer_save {	1038	sub object_freezer_save {
951	my ($filename, $rdata, $objs) = @_;	1039	my ($filename, $rdata, $objs) = @_;
952		1040
953	sync_job {	1041	sync_job {
954	if (length $$rdata) {	1042	if (length $$rdata) {
		1043	utf8::decode (my $decname = $filename);
955	warn sprintf "saving %s (%d,%d)\n",	1044	warn sprintf "saving %s (%d,%d)\n",
956	$filename, length $$rdata, scalar @$objs;	1045	$decname, length $$rdata, scalar @$objs;
957		1046
958	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1047	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
959	chmod SAVE_MODE, $fh;	1048	chmod SAVE_MODE, $fh;
960	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1049	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
961	aio_fsync $fh if $cf::USE_FSYNC;	1050	aio_fsync $fh if $cf::USE_FSYNC;
962	close $fh;	1051	close $fh;
963		1052
964	if (@$objs) {	1053	if (@$objs) {
965	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1054	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
966	chmod SAVE_MODE, $fh;	1055	chmod SAVE_MODE, $fh;
967	my $data = Storable::nfreeze { version => 1, objs => $objs };	1056	my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
968	aio_write $fh, 0, (length $data), $data, 0;	1057	aio_write $fh, 0, (length $data), $data, 0;
969	aio_fsync $fh if $cf::USE_FSYNC;	1058	aio_fsync $fh if $cf::USE_FSYNC;
970	close $fh;	1059	close $fh;
971	aio_rename "$filename.pst~", "$filename.pst";	1060	aio_rename "$filename.pst~", "$filename.pst";
972	}	1061	}
…		…
980	}	1069	}
981	} else {	1070	} else {
982	aio_unlink $filename;	1071	aio_unlink $filename;
983	aio_unlink "$filename.pst";	1072	aio_unlink "$filename.pst";
984	}	1073	}
985	}	1074	};
986	}	1075	}
987		1076
988	sub object_freezer_as_string {	1077	sub object_freezer_as_string {
989	my ($rdata, $objs) = @_;	1078	my ($rdata, $objs) = @_;
990		1079
…		…
1002	or return;	1091	or return;
1003		1092
1004	unless (aio_stat "$filename.pst") {	1093	unless (aio_stat "$filename.pst") {
1005	(aio_load "$filename.pst", $av) >= 0	1094	(aio_load "$filename.pst", $av) >= 0
1006	or return;	1095	or return;
1007	$av = eval { (Storable::thaw $av)->{objs} };
1008	}
1009		1096
		1097	my $st = eval { Coro::Storable::thaw $av }
		1098	|| eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
		1099	$av = $st->{objs};
		1100	}
		1101
		1102	utf8::decode (my $decname = $filename);
1010	warn sprintf "loading %s (%d)\n",	1103	warn sprintf "loading %s (%d,%d)\n",
1011	$filename, length $data, scalar @{$av || []};	1104	$decname, length $data, scalar @{$av || []};
		1105
1012	return ($data, $av);	1106	($data, $av)
1013	}	1107	}
1014		1108
1015	=head2 COMMAND CALLBACKS	1109	=head2 COMMAND CALLBACKS
1016		1110
1017	=over 4	1111	=over 4
…		…
1087	cf::override;	1181	cf::override;
1088	},	1182	},
1089	on_extcmd => sub {	1183	on_extcmd => sub {
1090	my ($pl, $buf) = @_;	1184	my ($pl, $buf) = @_;
1091		1185
1092	my $msg = eval { from_json $buf };	1186	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1093		1187
1094	if (ref $msg) {	1188	if (ref $msg) {
		1189	my ($type, $reply, @payload) =
		1190	"ARRAY" eq ref $msg
		1191	? @$msg
		1192	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1193
		1194	my @reply;
		1195
1095	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1196	if (my $cb = $EXTCMD{$type}) {
1096	if (my %reply = $cb->($pl, $msg)) {	1197	@reply = $cb->($pl, @payload);
1097	$pl->ext_reply ($msg->{msgid}, %reply);
1098	}
1099	}	1198	}
		1199
		1200	$pl->ext_reply ($reply, @reply)
		1201	if $reply;
		1202
1100	} else {	1203	} else {
1101	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1204	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1102	}	1205	}
1103		1206
1104	cf::override;	1207	cf::override;
…		…
1194		1297
1195	=head3 cf::player	1298	=head3 cf::player
1196		1299
1197	=over 4	1300	=over 4
1198		1301
		1302	=item cf::player::num_playing
		1303
		1304	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1305
		1306	=cut
		1307
		1308	sub num_playing {
		1309	scalar grep
		1310	$_->ob->map
		1311	&& !$_->hidden
		1312	&& !$_->ob->flag (cf::FLAG_WIZ),
		1313	cf::player::list
		1314	}
		1315
1199	=item cf::player::find $login	1316	=item cf::player::find $login
1200		1317
1201	Returns the given player object, loading it if necessary (might block).	1318	Returns the given player object, loading it if necessary (might block).
1202		1319
1203	=cut	1320	=cut
…		…
1238	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1355	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1239	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1356	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1240	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1357	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1241	aio_unlink +(playerdir $login) . "/$login.pl";	1358	aio_unlink +(playerdir $login) . "/$login.pl";
1242		1359
1243	my $pl = load_pl path $login	1360	my $f = new_from_file cf::object::thawer path $login
1244	or return;	1361	or return;
		1362
		1363	my $pl = cf::player::load_pl $f
		1364	or return;
		1365	local $cf::PLAYER_LOADING{$login} = $pl;
		1366	$f->resolve_delayed_derefs;
1245	$cf::PLAYER{$login} = $pl	1367	$cf::PLAYER{$login} = $pl
1246	}	1368	}
1247	}	1369	}
1248	}	1370	}
1249		1371
…		…
1259		1381
1260	aio_mkdir playerdir $pl, 0770;	1382	aio_mkdir playerdir $pl, 0770;
1261	$pl->{last_save} = $cf::RUNTIME;	1383	$pl->{last_save} = $cf::RUNTIME;
1262		1384
1263	$pl->save_pl ($path);	1385	$pl->save_pl ($path);
1264	Coro::cede;	1386	cf::cede_to_tick;
1265	}	1387	}
1266		1388
1267	sub new($) {	1389	sub new($) {
1268	my ($login) = @_;	1390	my ($login) = @_;
1269		1391
…		…
1273	$self->{deny_save} = 1;	1395	$self->{deny_save} = 1;
1274		1396
1275	$cf::PLAYER{$login} = $self;	1397	$cf::PLAYER{$login} = $self;
1276		1398
1277	$self	1399	$self
		1400	}
		1401
		1402	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1403
		1404	=cut
		1405
		1406	sub send_msg {
		1407	my $ns = shift->ns
		1408	or return;
		1409	$ns->send_msg (@_);
1278	}	1410	}
1279		1411
1280	=item $pl->quit_character	1412	=item $pl->quit_character
1281		1413
1282	Nukes the player without looking back. If logged in, the connection will	1414	Nukes the player without looking back. If logged in, the connection will
…		…
1337	or return [];	1469	or return [];
1338		1470
1339	my @logins;	1471	my @logins;
1340		1472
1341	for my $login (@$dirs) {	1473	for my $login (@$dirs) {
		1474	my $path = path $login;
		1475
		1476	# a .pst is a dead give-away for a valid player
		1477	unless (-e "$path.pst") {
1342	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1478	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1343	aio_read $fh, 0, 512, my $buf, 0 or next;	1479	aio_read $fh, 0, 512, my $buf, 0 or next;
1344	$buf !~ /^password -------------$/m or next; # official not-valid tag	1480	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1481	}
1345		1482
1346	utf8::decode $login;	1483	utf8::decode $login;
1347	push @logins, $login;	1484	push @logins, $login;
1348	}	1485	}
1349		1486
…		…
1387	sub expand_cfpod {	1524	sub expand_cfpod {
1388	((my $self), (local $_)) = @_;	1525	((my $self), (local $_)) = @_;
1389		1526
1390	# escape & and <	1527	# escape & and <
1391	s/&/&amp;/g;	1528	s/&/&amp;/g;
1392	s/(?<![BIUGH])</&lt;/g;	1529	s/(?<![BIUGHT])</&lt;/g;
1393		1530
1394	# this is buggy, it needs to properly take care of nested <'s	1531	# this is buggy, it needs to properly take care of nested <'s
1395		1532
1396	1 while	1533	1 while
1397	# replace B<>, I<>, U<> etc.	1534	# replace B<>, I<>, U<> etc.
1398	s/B<([^\>]*)>/<b>$1<\/b>/	1535	s/B<([^\>]*)>/<b>$1<\/b>/
1399	|| s/I<([^\>]*)>/<i>$1<\/i>/	1536	|| s/I<([^\>]*)>/<i>$1<\/i>/
1400	|| s/U<([^\>]*)>/<u>$1<\/u>/	1537	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1538	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1401	# replace G<male|female> tags	1539	# replace G<male|female> tags
1402	|| s{G<([^>|]*)\|([^>]*)>}{	1540	|| s{G<([^>|]*)\|([^>]*)>}{
1403	$self->gender ? $2 : $1	1541	$self->gender ? $2 : $1
1404	}ge	1542	}ge
1405	# replace H<hint text>	1543	# replace H<hint text>
1406	|| s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;	1544	|| s{H<([^\>]*)>}
		1545	{
		1546	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1547	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1548	"")
		1549	[$self->{hintmode}]
		1550	}ge;
1407		1551
1408	# create single paragraphs (very hackish)	1552	# create single paragraphs (very hackish)
1409	s/(?<=\S)\n(?=\w)/ /g;	1553	s/(?<=\S)\n(?=\w)/ /g;
1410		1554
		1555	# compress some whitespace
		1556	s/\s+\n/\n/g; # ws line-ends
		1557	s/\n\n+/\n/g; # double lines
		1558	s/^\n+//; # beginning lines
		1559	s/\n+$//; # ending lines
		1560
1411	$_	1561	$_
1412	}	1562	}
1413		1563
		1564	sub hintmode {
		1565	$_[0]{hintmode} = $_[1] if @_ > 1;
		1566	$_[0]{hintmode}
		1567	}
		1568
1414	=item $player->ext_reply ($msgid, %msg)	1569	=item $player->ext_reply ($msgid, @msg)
1415		1570
1416	Sends an ext reply to the player.	1571	Sends an ext reply to the player.
1417		1572
1418	=cut	1573	=cut
1419		1574
1420	sub ext_reply($$%) {	1575	sub ext_reply($$@) {
1421	my ($self, $id, %msg) = @_;	1576	my ($self, $id, @msg) = @_;
1422		1577
1423	$msg{msgid} = $id;	1578	$self->ns->ext_reply ($id, @msg)
1424	$self->send ("ext " . cf::to_json \%msg);
1425	}	1579	}
1426		1580
1427	=item $player->ext_event ($type, %msg)	1581	=item $player->ext_msg ($type, @msg)
1428		1582
1429	Sends an ext event to the client.	1583	Sends an ext event to the client.
1430		1584
1431	=cut	1585	=cut
1432		1586
1433	sub ext_event($$%) {	1587	sub ext_msg($$@) {
1434	my ($self, $type, %msg) = @_;	1588	my ($self, $type, @msg) = @_;
1435		1589
1436	$self->ns->ext_event ($type, %msg);	1590	$self->ns->ext_msg ($type, @msg);
1437	}	1591	}
1438		1592
1439	=head3 cf::region	1593	=head3 cf::region
1440		1594
1441	=over 4	1595	=over 4
…		…
1454	my ($path) = @_;	1608	my ($path) = @_;
1455		1609
1456	my ($match, $specificity);	1610	my ($match, $specificity);
1457		1611
1458	for my $region (list) {	1612	for my $region (list) {
1459	if ($region->match && $path =~ $region->match) {	1613	if ($region->{match} && $path =~ $region->{match}) {
1460	($match, $specificity) = ($region, $region->specificity)	1614	($match, $specificity) = ($region, $region->specificity)
1461	if $region->specificity > $specificity;	1615	if $region->specificity > $specificity;
1462	}	1616	}
1463	}	1617	}
1464		1618
…		…
1584	$self->init; # pass $1 etc.	1738	$self->init; # pass $1 etc.
1585	return $self;	1739	return $self;
1586	}	1740	}
1587	}	1741	}
1588		1742
1589	Carp::carp "unable to resolve path '$path' (base '$base').";	1743	Carp::cluck "unable to resolve path '$path' (base '$base').";
1590	()	1744	()
1591	}	1745	}
1592		1746
1593	sub init {	1747	sub init {
1594	my ($self) = @_;	1748	my ($self) = @_;
…		…
1657		1811
1658	sub load_header_from($) {	1812	sub load_header_from($) {
1659	my ($self, $path) = @_;	1813	my ($self, $path) = @_;
1660		1814
1661	utf8::encode $path;	1815	utf8::encode $path;
1662	#aio_open $path, O_RDONLY, 0	1816	my $f = new_from_file cf::object::thawer $path
1663	# or return;
1664
1665	$self->_load_header ($path)
1666	or return;	1817	or return;
		1818
		1819	$self->_load_header ($f)
		1820	or return;
		1821
		1822	local $MAP_LOADING{$self->{path}} = $self;
		1823	$f->resolve_delayed_derefs;
1667		1824
1668	$self->{load_path} = $path;	1825	$self->{load_path} = $path;
1669		1826
1670	1	1827	1
1671	}	1828	}
…		…
1725	sub find {	1882	sub find {
1726	my ($path, $origin) = @_;	1883	my ($path, $origin) = @_;
1727		1884
1728	$path = normalise $path, $origin && $origin->path;	1885	$path = normalise $path, $origin && $origin->path;
1729		1886
		1887	cf::lock_wait "map_data:$path";#d#remove
1730	cf::lock_wait "map_find:$path";	1888	cf::lock_wait "map_find:$path";
1731		1889
1732	$cf::MAP{$path} || do {	1890	$cf::MAP{$path} || do {
1733	my $guard = cf::lock_acquire "map_find:$path";	1891	my $guard1 = cf::lock_acquire "map_find:$path";
		1892	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1893
1734	my $map = new_from_path cf::map $path	1894	my $map = new_from_path cf::map $path
1735	or return;	1895	or return;
1736		1896
1737	$map->{last_save} = $cf::RUNTIME;	1897	$map->{last_save} = $cf::RUNTIME;
1738		1898
…		…
1740	or return;	1900	or return;
1741		1901
1742	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1902	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1743	# doing this can freeze the server in a sync job, obviously	1903	# doing this can freeze the server in a sync job, obviously
1744	#$cf::WAIT_FOR_TICK->wait;	1904	#$cf::WAIT_FOR_TICK->wait;
		1905	undef $guard1;
		1906	undef $guard2;
1745	$map->reset;	1907	$map->reset;
1746	undef $guard;
1747	return find $path;	1908	return find $path;
1748	}	1909	}
1749		1910
1750	$cf::MAP{$path} = $map	1911	$cf::MAP{$path} = $map
1751	}	1912	}
…		…
1760	local $self->{deny_reset} = 1; # loading can take a long time	1921	local $self->{deny_reset} = 1; # loading can take a long time
1761		1922
1762	my $path = $self->{path};	1923	my $path = $self->{path};
1763		1924
1764	{	1925	{
1765	my $guard = cf::lock_acquire "map_load:$path";	1926	my $guard = cf::lock_acquire "map_data:$path";
1766		1927
		1928	return unless $self->valid;
1767	return if $self->in_memory != cf::MAP_SWAPPED;	1929	return unless $self->in_memory == cf::MAP_SWAPPED;
1768		1930
1769	$self->in_memory (cf::MAP_LOADING);	1931	$self->in_memory (cf::MAP_LOADING);
1770		1932
1771	$self->alloc;	1933	$self->alloc;
1772		1934
1773	$self->pre_load;	1935	$self->pre_load;
1774	Coro::cede;	1936	cf::cede_to_tick;
1775		1937
		1938	my $f = new_from_file cf::object::thawer $self->{load_path};
		1939	$f->skip_block;
1776	$self->_load_objects ($self->{load_path}, 1)	1940	$self->_load_objects ($f)
1777	or return;	1941	or return;
1778		1942
1779	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1943	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1780	if delete $self->{load_original};	1944	if delete $self->{load_original};
1781		1945
1782	if (my $uniq = $self->uniq_path) {	1946	if (my $uniq = $self->uniq_path) {
1783	utf8::encode $uniq;	1947	utf8::encode $uniq;
1784	if (aio_open $uniq, O_RDONLY, 0) {	1948	unless (aio_stat $uniq) {
		1949	if (my $f = new_from_file cf::object::thawer $uniq) {
1785	$self->clear_unique_items;	1950	$self->clear_unique_items;
1786	$self->_load_objects ($uniq, 0);	1951	$self->_load_objects ($f);
		1952	$f->resolve_delayed_derefs;
		1953	}
1787	}	1954	}
1788	}	1955	}
1789		1956
1790	Coro::cede;	1957	$f->resolve_delayed_derefs;
		1958
		1959	cf::cede_to_tick;
1791	# now do the right thing for maps	1960	# now do the right thing for maps
1792	$self->link_multipart_objects;	1961	$self->link_multipart_objects;
1793	$self->difficulty ($self->estimate_difficulty)	1962	$self->difficulty ($self->estimate_difficulty)
1794	unless $self->difficulty;	1963	unless $self->difficulty;
1795	Coro::cede;	1964	cf::cede_to_tick;
1796		1965
1797	unless ($self->{deny_activate}) {	1966	unless ($self->{deny_activate}) {
1798	$self->decay_objects;	1967	$self->decay_objects;
1799	$self->fix_auto_apply;	1968	$self->fix_auto_apply;
1800	$self->update_buttons;	1969	$self->update_buttons;
1801	Coro::cede;	1970	cf::cede_to_tick;
1802	$self->set_darkness_map;	1971	$self->set_darkness_map;
1803	Coro::cede;	1972	cf::cede_to_tick;
1804	$self->activate;	1973	$self->activate;
1805	}	1974	}
		1975
		1976	$self->{last_save} = $cf::RUNTIME;
		1977	$self->last_access ($cf::RUNTIME);
1806		1978
1807	$self->in_memory (cf::MAP_IN_MEMORY);	1979	$self->in_memory (cf::MAP_IN_MEMORY);
1808	}	1980	}
1809		1981
1810	$self->post_load;	1982	$self->post_load;
…		…
1821		1993
1822	$self	1994	$self
1823	}	1995	}
1824		1996
1825	# find and load all maps in the 3x3 area around a map	1997	# find and load all maps in the 3x3 area around a map
1826	sub load_diag {	1998	sub load_neighbours {
1827	my ($map) = @_;	1999	my ($map) = @_;
1828		2000
1829	my @diag; # diagonal neighbours	2001	my @neigh; # diagonal neighbours
1830		2002
1831	for (0 .. 3) {	2003	for (0 .. 3) {
1832	my $neigh = $map->tile_path ($_)	2004	my $neigh = $map->tile_path ($_)
1833	or next;	2005	or next;
1834	$neigh = find $neigh, $map	2006	$neigh = find $neigh, $map
1835	or next;	2007	or next;
1836	$neigh->load;	2008	$neigh->load;
1837		2009
		2010	push @neigh,
1838	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2011	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1839	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2012	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1840	}	2013	}
1841		2014
1842	for (@diag) {	2015	for (grep defined $_->[0], @neigh) {
		2016	my ($path, $origin) = @$_;
1843	my $neigh = find @$_	2017	my $neigh = find $path, $origin
1844	or next;	2018	or next;
1845	$neigh->load;	2019	$neigh->load;
1846	}	2020	}
1847	}	2021	}
1848		2022
…		…
1853	}	2027	}
1854		2028
1855	sub do_load_sync {	2029	sub do_load_sync {
1856	my ($map) = @_;	2030	my ($map) = @_;
1857		2031
		2032	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2033	if $Coro::current == $Coro::main;
		2034
1858	cf::sync_job { $map->load };	2035	cf::sync_job { $map->load };
1859	}	2036	}
1860		2037
1861	our %MAP_PREFETCH;	2038	our %MAP_PREFETCH;
1862	our $MAP_PREFETCHER = undef;	2039	our $MAP_PREFETCHER = undef;
1863		2040
1864	sub find_async {	2041	sub find_async {
1865	my ($path, $origin) = @_;	2042	my ($path, $origin, $load) = @_;
1866		2043
1867	$path = normalise $path, $origin && $origin->{path};	2044	$path = normalise $path, $origin && $origin->{path};
1868		2045
1869	if (my $map = $cf::MAP{$path}) {	2046	if (my $map = $cf::MAP{$path}) {
1870	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2047	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1871	}	2048	}
1872		2049
1873	undef $MAP_PREFETCH{$path};	2050	$MAP_PREFETCH{$path} |= $load;
		2051
1874	$MAP_PREFETCHER ||= cf::async {	2052	$MAP_PREFETCHER ||= cf::async {
		2053	$Coro::current->{desc} = "map prefetcher";
		2054
1875	while (%MAP_PREFETCH) {	2055	while (%MAP_PREFETCH) {
1876	for my $path (keys %MAP_PREFETCH) {	2056	while (my ($k, $v) = each %MAP_PREFETCH) {
1877	my $map = find $path	2057	if (my $map = find $k) {
1878	or next;
1879	$map->load;	2058	$map->load if $v;
		2059	}
1880		2060
1881	delete $MAP_PREFETCH{$path};	2061	delete $MAP_PREFETCH{$k};
1882	}	2062	}
1883	}	2063	}
1884	undef $MAP_PREFETCHER;	2064	undef $MAP_PREFETCHER;
1885	};	2065	};
1886	$MAP_PREFETCHER->prio (6);	2066	$MAP_PREFETCHER->prio (6);
…		…
1889	}	2069	}
1890		2070
1891	sub save {	2071	sub save {
1892	my ($self) = @_;	2072	my ($self) = @_;
1893		2073
1894	my $lock = cf::lock_acquire "map_data:" . $self->path;	2074	my $lock = cf::lock_acquire "map_data:$self->{path}";
1895		2075
1896	$self->{last_save} = $cf::RUNTIME;	2076	$self->{last_save} = $cf::RUNTIME;
1897		2077
1898	return unless $self->dirty;	2078	return unless $self->dirty;
1899		2079
…		…
1905	return if $self->{deny_save};	2085	return if $self->{deny_save};
1906		2086
1907	local $self->{last_access} = $self->last_access;#d#	2087	local $self->{last_access} = $self->last_access;#d#
1908		2088
1909	cf::async {	2089	cf::async {
		2090	$Coro::current->{desc} = "map player save";
1910	$_->contr->save for $self->players;	2091	$_->contr->save for $self->players;
1911	};	2092	};
1912		2093
1913	if ($uniq) {	2094	if ($uniq) {
1914	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2095	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
1922	my ($self) = @_;	2103	my ($self) = @_;
1923		2104
1924	# save first because save cedes	2105	# save first because save cedes
1925	$self->save;	2106	$self->save;
1926		2107
1927	my $lock = cf::lock_acquire "map_data:" . $self->path;	2108	my $lock = cf::lock_acquire "map_data:$self->{path}";
1928		2109
1929	return if $self->players;	2110	return if $self->players;
1930	return if $self->in_memory != cf::MAP_IN_MEMORY;	2111	return if $self->in_memory != cf::MAP_IN_MEMORY;
1931	return if $self->{deny_save};	2112	return if $self->{deny_save};
1932		2113
		2114	$self->in_memory (cf::MAP_SWAPPED);
		2115
		2116	$self->deactivate;
		2117	$_->clear_links_to ($self) for values %cf::MAP;
1933	$self->clear;	2118	$self->clear;
1934	$self->in_memory (cf::MAP_SWAPPED);
1935	}	2119	}
1936		2120
1937	sub reset_at {	2121	sub reset_at {
1938	my ($self) = @_;	2122	my ($self) = @_;
1939		2123
…		…
1971	if $uniq;	2155	if $uniq;
1972	}	2156	}
1973		2157
1974	delete $cf::MAP{$self->path};	2158	delete $cf::MAP{$self->path};
1975		2159
		2160	$self->deactivate;
		2161	$_->clear_links_to ($self) for values %cf::MAP;
1976	$self->clear;	2162	$self->clear;
1977
1978	$_->clear_links_to ($self) for values %cf::MAP;
1979		2163
1980	$self->unlink_save;	2164	$self->unlink_save;
1981	$self->destroy;	2165	$self->destroy;
1982	}	2166	}
1983		2167
1984	my $nuke_counter = "aaaa";	2168	my $nuke_counter = "aaaa";
1985		2169
1986	sub nuke {	2170	sub nuke {
1987	my ($self) = @_;	2171	my ($self) = @_;
1988		2172
		2173	{
		2174	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2175
1989	delete $cf::MAP{$self->path};	2176	delete $cf::MAP{$self->path};
1990		2177
1991	$self->unlink_save;	2178	$self->unlink_save;
1992		2179
1993	bless $self, "cf::map";	2180	bless $self, "cf::map";
1994	delete $self->{deny_reset};	2181	delete $self->{deny_reset};
1995	$self->{deny_save} = 1;	2182	$self->{deny_save} = 1;
1996	$self->reset_timeout (1);	2183	$self->reset_timeout (1);
1997	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2184	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1998		2185
1999	$cf::MAP{$self->path} = $self;	2186	$cf::MAP{$self->path} = $self;
		2187	}
2000		2188
2001	$self->reset; # polite request, might not happen	2189	$self->reset; # polite request, might not happen
2002	}	2190	}
2003		2191
2004	=item $maps = cf::map::tmp_maps	2192	=item $maps = cf::map::tmp_maps
…		…
2080		2268
2081	sub inv_recursive {	2269	sub inv_recursive {
2082	inv_recursive_ inv $_[0]	2270	inv_recursive_ inv $_[0]
2083	}	2271	}
2084		2272
		2273	=item $ref = $ob->ref
		2274
		2275	creates and returns a persistent reference to an objetc that can be stored as a string.
		2276
		2277	=item $ob = cf::object::deref ($refstring)
		2278
		2279	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2280	even if the object actually exists. May block.
		2281
		2282	=cut
		2283
		2284	sub deref {
		2285	my ($ref) = @_;
		2286
		2287	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2288	my ($uuid, $name) = ($1, $2);
		2289	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2290	or return;
		2291	$pl->ob->uuid eq $uuid
		2292	or return;
		2293
		2294	$pl->ob
		2295	} else {
		2296	warn "$ref: cannot resolve object reference\n";
		2297	undef
		2298	}
		2299	}
		2300
2085	package cf;	2301	package cf;
2086		2302
2087	=back	2303	=back
2088		2304
2089	=head3 cf::object::player	2305	=head3 cf::object::player
…		…
2111		2327
2112	} else {	2328	} else {
2113	my $pl = $self->contr;	2329	my $pl = $self->contr;
2114		2330
2115	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2331	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2116	my $diag = $pl->{npc_dialog};	2332	my $dialog = $pl->{npc_dialog};
2117	$diag->{pl}->ext_reply (	2333	$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		2334
2124	} else {	2335	} else {
2125	$msg = $npc->name . " says: $msg" if $npc;	2336	$msg = $npc->name . " says: $msg" if $npc;
2126	$self->message ($msg, $flags);	2337	$self->message ($msg, $flags);
2127	}	2338	}
2128	}	2339	}
		2340	}
		2341
		2342	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2343
		2344	=cut
		2345
		2346	sub cf::object::send_msg {
		2347	my $pl = shift->contr
		2348	or return;
		2349	$pl->send_msg (@_);
2129	}	2350	}
2130		2351
2131	=item $player_object->may ("access")	2352	=item $player_object->may ("access")
2132		2353
2133	Returns wether the given player is authorized to access resource "access"	2354	Returns wether the given player is authorized to access resource "access"
…		…
2212	# use -1 or undef as default coordinates, not 0, 0	2433	# use -1 or undef as default coordinates, not 0, 0
2213	($x, $y) = ($map->enter_x, $map->enter_y)	2434	($x, $y) = ($map->enter_x, $map->enter_y)
2214	if $x <=0 && $y <= 0;	2435	if $x <=0 && $y <= 0;
2215		2436
2216	$map->load;	2437	$map->load;
2217	$map->load_diag;	2438	$map->load_neighbours;
2218		2439
2219	return unless $self->contr->active;	2440	return unless $self->contr->active;
2220	$self->activate_recursive;	2441	$self->activate_recursive;
2221		2442
2222	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2443	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223	$self->enter_map ($map, $x, $y);	2444	$self->enter_map ($map, $x, $y);
2224	}	2445	}
2225		2446
2226	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2447	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2227		2448
2228	Moves the player to the given map-path and coordinates by first freezing	2449	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	2450	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	2451	that has to return the map if sucecssful, and then unfreezes the player on
2231	the new (success) or old (failed) map position.	2452	the new (success) or old (failed) map position. In either case, $done will
		2453	be called at the end of this process.
2232		2454
2233	=cut	2455	=cut
2234		2456
2235	our $GOTOGEN;	2457	our $GOTOGEN;
2236		2458
2237	sub cf::object::player::goto {	2459	sub cf::object::player::goto {
2238	my ($self, $path, $x, $y, $check) = @_;	2460	my ($self, $path, $x, $y, $check, $done) = @_;
2239		2461
2240	# do generation counting so two concurrent goto's will be executed in-order	2462	# do generation counting so two concurrent goto's will be executed in-order
2241	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2463	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242		2464
2243	$self->enter_link;	2465	$self->enter_link;
2244		2466
2245	(async {	2467	(async {
		2468	$Coro::current->{desc} = "player::goto $path $x $y";
		2469
		2470	# *tag paths override both path and x|y
		2471	if ($path =~ /^\*(.*)$/) {
		2472	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2473	my $ob = $obs[rand @obs];
		2474
		2475	# see if we actually can go there
		2476	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2477	$ob = $obs[rand @obs];
		2478	} else {
		2479	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2480	}
		2481	# else put us there anyways for now #d#
		2482
		2483	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2484	} else {
		2485	($path, $x, $y) = (undef, undef, undef);
		2486	}
		2487	}
		2488
2246	my $map = eval {	2489	my $map = eval {
2247	my $map = cf::map::find $path;	2490	my $map = defined $path ? cf::map::find $path : undef;
2248		2491
2249	if ($map) {	2492	if ($map) {
2250	$map = $map->customise_for ($self);	2493	$map = $map->customise_for ($self);
2251	$map = $check->($map) if $check && $map;	2494	$map = $check->($map) if $check && $map;
2252	} else {	2495	} else {
2253	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2496	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2254	}	2497	}
2255		2498
2256	$map	2499	$map
2257	};	2500	};
2258		2501
…		…
2263		2506
2264	if ($gen == $self->{_goto_generation}) {	2507	if ($gen == $self->{_goto_generation}) {
2265	delete $self->{_goto_generation};	2508	delete $self->{_goto_generation};
2266	$self->leave_link ($map, $x, $y);	2509	$self->leave_link ($map, $x, $y);
2267	}	2510	}
		2511
		2512	$done->() if $done;
2268	})->prio (1);	2513	})->prio (1);
2269	}	2514	}
2270		2515
2271	=item $player_object->enter_exit ($exit_object)	2516	=item $player_object->enter_exit ($exit_object)
2272		2517
…		…
2341	my $hp = $exit->stats->hp;	2586	my $hp = $exit->stats->hp;
2342	my $sp = $exit->stats->sp;	2587	my $sp = $exit->stats->sp;
2343		2588
2344	$self->enter_link;	2589	$self->enter_link;
2345		2590
		2591	# if exit is damned, update players death & WoR home-position
		2592	$self->contr->savebed ($slaying, $hp, $sp)
		2593	if $exit->flag (FLAG_DAMNED);
		2594
2346	(async {	2595	(async {
		2596	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2597
2347	$self->deactivate_recursive; # just to be sure	2598	$self->deactivate_recursive; # just to be sure
2348	unless (eval {	2599	unless (eval {
2349	$self->goto ($slaying, $hp, $sp);	2600	$self->goto ($slaying, $hp, $sp);
2350		2601
2351	1;	2602	1;
…		…
2377		2628
2378	utf8::encode $text;	2629	utf8::encode $text;
2379	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2630	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2380	}	2631	}
2381		2632
2382	=item $client->send_msg ($color, $type, $msg, [extra...])	2633	=item $client->send_msg ($channel, $msg, $color, [extra...])
2383		2634
2384	Send a drawinfo or msg packet to the client, formatting the msg for the	2635	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	2636	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	2637	the message, with C<log> being the default. If C<$color> is negative, suppress
2387	the message unless the client supports the msg packet.	2638	the message unless the client supports the msg packet.
2388		2639
2389	=cut	2640	=cut
2390		2641
		2642	our %CHANNEL = (
		2643	"c/identify" => {
		2644	id => "infobox",
		2645	title => "Identify",
		2646	reply => undef,
		2647	tooltip => "Items recently identified",
		2648	},
		2649	"c/examine" => {
		2650	id => "infobox",
		2651	title => "Examine",
		2652	reply => undef,
		2653	tooltip => "Signs and other items you examined",
		2654	},
		2655	"c/lookat" => {
		2656	id => "infobox",
		2657	title => "Look",
		2658	reply => undef,
		2659	tooltip => "What you saw there",
		2660	},
		2661	);
		2662
2391	sub cf::client::send_msg {	2663	sub cf::client::send_msg {
2392	my ($self, $color, $type, $msg, @extra) = @_;	2664	my ($self, $channel, $msg, $color, @extra) = @_;
2393		2665
2394	$msg = $self->pl->expand_cfpod ($msg);	2666	$msg = $self->pl->expand_cfpod ($msg);
2395		2667
		2668	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2669
		2670	# check predefined channels, for the benefit of C
		2671	if ($CHANNEL{$channel}) {
		2672	$channel = $CHANNEL{$channel};
		2673
		2674	$self->ext_msg (channel_info => $channel)
		2675	if $self->can_msg;
		2676
		2677	$channel = $channel->{id};
		2678
		2679	} elsif (ref $channel) {
		2680	# send meta info to client, if not yet sent
		2681	unless (exists $self->{channel}{$channel->{id}}) {
		2682	$self->{channel}{$channel->{id}} = $channel;
		2683	$self->ext_msg (channel_info => $channel)
		2684	if $self->can_msg;
		2685	}
		2686
		2687	$channel = $channel->{id};
		2688	}
		2689
		2690	return unless @extra || length $msg;
		2691
2396	if ($self->can_msg) {	2692	if ($self->can_msg) {
2397	$self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);	2693	# default colour, mask it out
		2694	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2695	if $color & cf::NDI_DEF;
		2696
		2697	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2698	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2398	} else {	2699	} 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) {	2700	if ($color >= 0) {
		2701	# replace some tags by gcfclient-compatible ones
		2702	for ($msg) {
		2703	1 while
		2704	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2705	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2706	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2707	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2708	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2709	}
		2710
		2711	$color &= cf::NDI_COLOR_MASK;
		2712
		2713	utf8::encode $msg;
		2714
2410	if (0 && $msg =~ /\[/) {	2715	if (0 && $msg =~ /\[/) {
		2716	# COMMAND/INFO
2411	$self->send_packet ("drawextinfo $color 4 0 $msg")	2717	$self->send_packet ("drawextinfo $color 10 8 $msg")
2412	} else {	2718	} else {
2413	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	2719	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2414	$self->send_packet ("drawinfo $color $msg")	2720	$self->send_packet ("drawinfo $color $msg")
2415	}	2721	}
2416	}	2722	}
2417	}	2723	}
2418	}	2724	}
2419		2725
2420	=item $client->ext_event ($type, %msg)	2726	=item $client->ext_msg ($type, @msg)
2421		2727
2422	Sends an ext event to the client.	2728	Sends an ext event to the client.
2423		2729
2424	=cut	2730	=cut
2425		2731
2426	sub cf::client::ext_event($$%) {	2732	sub cf::client::ext_msg($$@) {
2427	my ($self, $type, %msg) = @_;	2733	my ($self, $type, @msg) = @_;
2428		2734
		2735	if ($self->extcmd == 2) {
		2736	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2737	} elsif ($self->extcmd == 1) { # TODO: remove
2429	$msg{msgtype} = "event_$type";	2738	push @msg, msgtype => "event_$type";
2430	$self->send_packet ("ext " . cf::to_json \%msg);	2739	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2740	}
		2741	}
		2742
		2743	=item $client->ext_reply ($msgid, @msg)
		2744
		2745	Sends an ext reply to the client.
		2746
		2747	=cut
		2748
		2749	sub cf::client::ext_reply($$@) {
		2750	my ($self, $id, @msg) = @_;
		2751
		2752	if ($self->extcmd == 2) {
		2753	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2754	} elsif ($self->extcmd == 1) {
		2755	#TODO: version 1, remove
		2756	unshift @msg, msgtype => "reply", msgid => $id;
		2757	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2758	}
2431	}	2759	}
2432		2760
2433	=item $success = $client->query ($flags, "text", \&cb)	2761	=item $success = $client->query ($flags, "text", \&cb)
2434		2762
2435	Queues a query to the client, calling the given callback with	2763	Queues a query to the client, calling the given callback with
…		…
2458		2786
2459	1	2787	1
2460	}	2788	}
2461		2789
2462	cf::client->attach (	2790	cf::client->attach (
		2791	on_connect => sub {
		2792	my ($ns) = @_;
		2793
		2794	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2795	},
2463	on_reply => sub {	2796	on_reply => sub {
2464	my ($ns, $msg) = @_;	2797	my ($ns, $msg) = @_;
2465		2798
2466	# this weird shuffling is so that direct followup queries	2799	# this weird shuffling is so that direct followup queries
2467	# get handled first	2800	# get handled first
…		…
2482	}	2815	}
2483	},	2816	},
2484	on_exticmd => sub {	2817	on_exticmd => sub {
2485	my ($ns, $buf) = @_;	2818	my ($ns, $buf) = @_;
2486		2819
2487	my $msg = eval { from_json $buf };	2820	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488		2821
2489	if (ref $msg) {	2822	if (ref $msg) {
		2823	my ($type, $reply, @payload) =
		2824	"ARRAY" eq ref $msg
		2825	? @$msg
		2826	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2827
		2828	my @reply;
		2829
2490	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2830	if (my $cb = $EXTICMD{$type}) {
2491	if (my %reply = $cb->($ns, $msg)) {	2831	@reply = $cb->($ns, @payload);
2492	$reply{msgid} = $msg->{msgid};
2493	$ns->send ("ext " . cf::to_json \%reply);
2494	}
2495	}	2832	}
		2833
		2834	$ns->ext_reply ($reply, @reply)
		2835	if $reply;
		2836
2496	} else {	2837	} else {
2497	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2838	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2498	}	2839	}
2499		2840
2500	cf::override;	2841	cf::override;
…		…
2547	our $safe = new Safe "safe";	2888	our $safe = new Safe "safe";
2548	our $safe_hole = new Safe::Hole;	2889	our $safe_hole = new Safe::Hole;
2549		2890
2550	$SIG{FPE} = 'IGNORE';	2891	$SIG{FPE} = 'IGNORE';
2551		2892
2552	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2893	$safe->permit_only (Opcode::opset qw(
		2894	:base_core :base_mem :base_orig :base_math
		2895	grepstart grepwhile mapstart mapwhile
		2896	sort time
		2897	));
2553		2898
2554	# here we export the classes and methods available to script code	2899	# here we export the classes and methods available to script code
2555		2900
2556	=pod	2901	=pod
2557		2902
2558	The following functions and methods are available within a safe environment:	2903	The following functions and methods are available within a safe environment:
2559		2904
2560	cf::object contr pay_amount pay_player map	2905	cf::object
		2906	contr pay_amount pay_player map x y force_find force_add destroy
		2907	insert remove name archname title slaying race decrease_ob_nr
		2908
2561	cf::object::player player	2909	cf::object::player
2562	cf::player peaceful	2910	player
2563	cf::map trigger	2911
		2912	cf::player
		2913	peaceful
		2914
		2915	cf::map
		2916	trigger
2564		2917
2565	=cut	2918	=cut
2566		2919
2567	for (	2920	for (
2568	["cf::object" => qw(contr pay_amount pay_player map)],	2921	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2922	insert remove inv name archname title slaying race
		2923	decrease_ob_nr destroy)],
2569	["cf::object::player" => qw(player)],	2924	["cf::object::player" => qw(player)],
2570	["cf::player" => qw(peaceful)],	2925	["cf::player" => qw(peaceful)],
2571	["cf::map" => qw(trigger)],	2926	["cf::map" => qw(trigger)],
2572	) {	2927	) {
2573	no strict 'refs';	2928	no strict 'refs';
…		…
2649	# the server's init and main functions	3004	# the server's init and main functions
2650		3005
2651	sub load_facedata($) {	3006	sub load_facedata($) {
2652	my ($path) = @_;	3007	my ($path) = @_;
2653		3008
		3009	# HACK to clear player env face cache, we need some signal framework
		3010	# for this (global event?)
		3011	%ext::player_env::MUSIC_FACE_CACHE = ();
		3012
		3013	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3014
2654	warn "loading facedata from $path\n";	3015	warn "loading facedata from $path\n";
2655		3016
2656	my $facedata;	3017	my $facedata;
2657	0 < aio_load $path, $facedata	3018	0 < aio_load $path, $facedata
2658	or die "$path: $!";	3019	or die "$path: $!";
…		…
2660	$facedata = Coro::Storable::thaw $facedata;	3021	$facedata = Coro::Storable::thaw $facedata;
2661		3022
2662	$facedata->{version} == 2	3023	$facedata->{version} == 2
2663	or cf::cleanup "$path: version mismatch, cannot proceed.";	3024	or cf::cleanup "$path: version mismatch, cannot proceed.";
2664		3025
		3026	# patch in the exptable
		3027	$facedata->{resource}{"res/exp_table"} = {
		3028	type => FT_RSRC,
		3029	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3030	};
		3031	cf::cede_to_tick;
		3032
2665	{	3033	{
2666	my $faces = $facedata->{faceinfo};	3034	my $faces = $facedata->{faceinfo};
2667		3035
2668	while (my ($face, $info) = each %$faces) {	3036	while (my ($face, $info) = each %$faces) {
2669	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3037	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2670	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3038	cf::face::set_visibility $idx, $info->{visibility};
		3039	cf::face::set_magicmap $idx, $info->{magicmap};
2671	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3040	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2672	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3041	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2673	Coro::cede;	3042
		3043	cf::cede_to_tick;
2674	}	3044	}
2675		3045
2676	while (my ($face, $info) = each %$faces) {	3046	while (my ($face, $info) = each %$faces) {
2677	next unless $info->{smooth};	3047	next unless $info->{smooth};
2678	my $idx = cf::face::find $face	3048	my $idx = cf::face::find $face
2679	or next;	3049	or next;
2680	if (my $smooth = cf::face::find $info->{smooth}) {	3050	if (my $smooth = cf::face::find $info->{smooth}) {
		3051	cf::face::set_smooth $idx, $smooth;
2681	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3052	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682	} else {	3053	} else {
2683	warn "smooth face '$info->{smooth}' not found for face '$face'";	3054	warn "smooth face '$info->{smooth}' not found for face '$face'";
2684	}	3055	}
2685	Coro::cede;	3056
		3057	cf::cede_to_tick;
2686	}	3058	}
2687	}	3059	}
2688		3060
2689	{	3061	{
2690	my $anims = $facedata->{animinfo};	3062	my $anims = $facedata->{animinfo};
2691		3063
2692	while (my ($anim, $info) = each %$anims) {	3064	while (my ($anim, $info) = each %$anims) {
2693	cf::anim::set $anim, $info->{frames}, $info->{facings};	3065	cf::anim::set $anim, $info->{frames}, $info->{facings};
2694	Coro::cede;	3066	cf::cede_to_tick;
2695	}	3067	}
2696		3068
2697	cf::anim::invalidate_all; # d'oh	3069	cf::anim::invalidate_all; # d'oh
2698	}	3070	}
2699		3071
		3072	{
		3073	# TODO: for gcfclient pleasure, we should give resources
		3074	# that gcfclient doesn't grok a >10000 face index.
		3075	my $res = $facedata->{resource};
		3076
		3077	my $soundconf = delete $res->{"res/sound.conf"};
		3078
		3079	while (my ($name, $info) = each %$res) {
		3080	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3081	my $data;
		3082
		3083	if ($info->{type} & 1) {
		3084	# prepend meta info
		3085
		3086	my $meta = $enc->encode ({
		3087	name => $name,
		3088	%{ $info->{meta} || {} },
		3089	});
		3090
		3091	$data = pack "(w/a*)*", $meta, $info->{data};
		3092	} else {
		3093	$data = $info->{data};
		3094	}
		3095
		3096	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3097	cf::face::set_type $idx, $info->{type};
		3098
		3099	cf::cede_to_tick;
		3100	}
		3101
		3102	if ($soundconf) {
		3103	$soundconf = $enc->decode (delete $soundconf->{data});
		3104
		3105	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3106	my $sound = $soundconf->{compat}[$_]
		3107	or next;
		3108
		3109	my $face = cf::face::find "sound/$sound->[1]";
		3110	cf::sound::set $sound->[0] => $face;
		3111	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3112	}
		3113
		3114	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3115	my $face = cf::face::find "sound/$v";
		3116	cf::sound::set $k => $face;
		3117	}
		3118	}
		3119	}
		3120
2700	1	3121	1
2701	}	3122	}
2702		3123
		3124	register_exticmd fx_want => sub {
		3125	my ($ns, $want) = @_;
		3126
		3127	while (my ($k, $v) = each %$want) {
		3128	$ns->fx_want ($k, $v);
		3129	}
		3130	};
		3131
2703	sub reload_regions {	3132	sub reload_regions {
		3133	# HACK to clear player env face cache, we need some signal framework
		3134	# for this (global event?)
		3135	%ext::player_env::MUSIC_FACE_CACHE = ();
		3136
2704	load_resource_file "$MAPDIR/regions"	3137	load_resource_file "$MAPDIR/regions"
2705	or die "unable to load regions file\n";	3138	or die "unable to load regions file\n";
		3139
		3140	for (cf::region::list) {
		3141	$_->{match} = qr/$_->{match}/
		3142	if exists $_->{match};
		3143	}
2706	}	3144	}
2707		3145
2708	sub reload_facedata {	3146	sub reload_facedata {
2709	load_facedata "$DATADIR/facedata"	3147	load_facedata "$DATADIR/facedata"
2710	or die "unable to load facedata\n";	3148	or die "unable to load facedata\n";
2711	}	3149	}
2712		3150
2713	sub reload_archetypes {	3151	sub reload_archetypes {
		3152	load_resource_file "$DATADIR/archetypes"
		3153	or die "unable to load archetypes\n";
		3154	#d# NEED to laod twice to resolve forward references
		3155	# this really needs to be done in an extra post-pass
		3156	# (which needs to be synchronous, so solve it differently)
2714	load_resource_file "$DATADIR/archetypes"	3157	load_resource_file "$DATADIR/archetypes"
2715	or die "unable to load archetypes\n";	3158	or die "unable to load archetypes\n";
2716	}	3159	}
2717		3160
2718	sub reload_treasures {	3161	sub reload_treasures {
…		…
2734		3177
2735	sub init {	3178	sub init {
2736	reload_resources;	3179	reload_resources;
2737	}	3180	}
2738		3181
2739	sub cfg_load {	3182	sub reload_config {
2740	open my $fh, "<:utf8", "$CONFDIR/config"	3183	open my $fh, "<:utf8", "$CONFDIR/config"
2741	or return;	3184	or return;
2742		3185
2743	local $/;	3186	local $/;
2744	*CFG = YAML::Syck::Load <$fh>;	3187	*CFG = YAML::Syck::Load <$fh>;
…		…
2760	sub main {	3203	sub main {
2761	# we must not ever block the main coroutine	3204	# we must not ever block the main coroutine
2762	local $Coro::idle = sub {	3205	local $Coro::idle = sub {
2763	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3206	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2764	(async {	3207	(async {
		3208	$Coro::current->{desc} = "IDLE BUG HANDLER";
2765	Event::one_event;	3209	Event::one_event;
2766	})->prio (Coro::PRIO_MAX);	3210	})->prio (Coro::PRIO_MAX);
2767	};	3211	};
2768		3212
2769	cfg_load;	3213	reload_config;
2770	db_init;	3214	db_init;
2771	load_extensions;	3215	load_extensions;
2772		3216
2773	$TICK_WATCHER->start;	3217	$TICK_WATCHER->start;
2774	Event::loop;	3218	Event::loop;
…		…
2841	# and maps saved/destroyed asynchronously.	3285	# and maps saved/destroyed asynchronously.
2842	warn "begin emergency player save\n";	3286	warn "begin emergency player save\n";
2843	for my $login (keys %cf::PLAYER) {	3287	for my $login (keys %cf::PLAYER) {
2844	my $pl = $cf::PLAYER{$login} or next;	3288	my $pl = $cf::PLAYER{$login} or next;
2845	$pl->valid or next;	3289	$pl->valid or next;
		3290	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2846	$pl->save;	3291	$pl->save;
2847	}	3292	}
2848	warn "end emergency player save\n";	3293	warn "end emergency player save\n";
2849		3294
2850	warn "begin emergency map save\n";	3295	warn "begin emergency map save\n";
…		…
2967	warn "reloading cf.pm";	3412	warn "reloading cf.pm";
2968	require cf;	3413	require cf;
2969	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3414	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2970		3415
2971	warn "loading config and database again";	3416	warn "loading config and database again";
2972	cf::cfg_load;	3417	cf::reload_config;
2973		3418
2974	warn "loading extensions";	3419	warn "loading extensions";
2975	cf::load_extensions;	3420	cf::load_extensions;
2976		3421
2977	warn "reattaching attachments to objects/players";	3422	warn "reattaching attachments to objects/players";
…		…
3013	register_command "reload" => sub {	3458	register_command "reload" => sub {
3014	my ($who, $arg) = @_;	3459	my ($who, $arg) = @_;
3015		3460
3016	if ($who->flag (FLAG_WIZ)) {	3461	if ($who->flag (FLAG_WIZ)) {
3017	$who->message ("reloading server.");	3462	$who->message ("reloading server.");
		3463	async {
		3464	$Coro::current->{desc} = "perl_reload";
3018	async { reload_perl };	3465	reload_perl;
		3466	};
3019	}	3467	}
3020	};	3468	};
3021		3469
3022	unshift @INC, $LIBDIR;	3470	unshift @INC, $LIBDIR;
3023		3471
…		…
3042	my $signal = new Coro::Signal;	3490	my $signal = new Coro::Signal;
3043	push @WAIT_FOR_TICK_BEGIN, $signal;	3491	push @WAIT_FOR_TICK_BEGIN, $signal;
3044	$signal->wait;	3492	$signal->wait;
3045	}	3493	}
3046		3494
3047	my $min = 1e6;#d#
3048	my $avg = 10;
3049	$TICK_WATCHER = Event->timer (	3495	$TICK_WATCHER = Event->timer (
3050	reentrant => 0,	3496	reentrant => 0,
3051	parked => 1,	3497	parked => 1,
3052	prio => 0,	3498	prio => 0,
3053	at => $NEXT_TICK || $TICK,	3499	at => $NEXT_TICK || $TICK,
…		…
3061		3507
3062	$NOW = $tick_start = Event::time;	3508	$NOW = $tick_start = Event::time;
3063		3509
3064	cf::server_tick; # one server iteration	3510	cf::server_tick; # one server iteration
3065		3511
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;	3512	$RUNTIME += $TICK;
3090	$NEXT_TICK += $TICK;	3513	$NEXT_TICK += $TICK;
3091		3514
3092	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3515	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3093	$NEXT_RUNTIME_WRITE = $NOW + 10;	3516	$NEXT_RUNTIME_WRITE = $NOW + 10;
3094	Coro::async_pool {	3517	Coro::async_pool {
		3518	$Coro::current->{desc} = "runtime saver";
3095	write_runtime	3519	write_runtime
3096	or warn "ERROR: unable to write runtime file: $!";	3520	or warn "ERROR: unable to write runtime file: $!";
3097	};	3521	};
3098	}	3522	}
3099		3523
3100	# my $AFTER = Event::time;
3101	# warn $AFTER - $NOW;#d#
3102
3103	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3524	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3104	$sig->send;	3525	$sig->send;
3105	}	3526	}
3106	while (my $sig = shift @WAIT_FOR_TICK) {	3527	while (my $sig = shift @WAIT_FOR_TICK) {
3107	$sig->send;	3528	$sig->send;
…		…
3117		3538
3118	$LOAD = ($NOW - $tick_start) / $TICK;	3539	$LOAD = ($NOW - $tick_start) / $TICK;
3119	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3540	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3120		3541
3121	_post_tick;	3542	_post_tick;
3122
3123
3124	},	3543	},
3125	);	3544	);
3126		3545
3127	{	3546	{
		3547	BDB::min_parallel 8;
3128	BDB::max_poll_time $TICK * 0.1;	3548	BDB::max_poll_time $TICK * 0.1;
3129	$BDB_POLL_WATCHER = Event->io (	3549	$BDB_POLL_WATCHER = Event->io (
3130	reentrant => 0,	3550	reentrant => 0,
3131	fd => BDB::poll_fileno,	3551	fd => BDB::poll_fileno,
3132	poll => 'r',	3552	poll => 'r',
3133	prio => 0,	3553	prio => 0,
3134	data => WF_AUTOCANCEL,	3554	data => WF_AUTOCANCEL,
3135	cb => \&BDB::poll_cb,	3555	cb => \&BDB::poll_cb,
3136	);	3556	);
3137	BDB::min_parallel 8;
3138		3557
3139	BDB::set_sync_prepare {	3558	BDB::set_sync_prepare {
3140	my $status;	3559	my $status;
3141	my $current = $Coro::current;	3560	my $current = $Coro::current;
3142	(	3561	(
…		…
3151	)	3570	)
3152	};	3571	};
3153		3572
3154	unless ($DB_ENV) {	3573	unless ($DB_ENV) {
3155	$DB_ENV = BDB::db_env_create;	3574	$DB_ENV = BDB::db_env_create;
		3575	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3576	| BDB::LOG_AUTOREMOVE, 1);
		3577	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3578	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3156		3579
3157	cf::sync_job {	3580	cf::sync_job {
3158	eval {	3581	eval {
3159	BDB::db_env_open	3582	BDB::db_env_open
3160	$DB_ENV,	3583	$DB_ENV,
…		…
3162	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3585	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3163	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3586	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3164	0666;	3587	0666;
3165		3588
3166	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3589	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	};	3590	};
3171		3591
3172	cf::cleanup "db_env_open(db): $@" if $@;	3592	cf::cleanup "db_env_open(db): $@" if $@;
3173	};	3593	};
3174	}	3594	}
		3595
		3596	$BDB_DEADLOCK_WATCHER = Event->timer (
		3597	after => 3,
		3598	interval => 1,
		3599	hard => 1,
		3600	prio => 0,
		3601	data => WF_AUTOCANCEL,
		3602	cb => sub {
		3603	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3604	},
		3605	);
		3606	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3607	after => 11,
		3608	interval => 60,
		3609	hard => 1,
		3610	prio => 0,
		3611	data => WF_AUTOCANCEL,
		3612	cb => sub {
		3613	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3614	},
		3615	);
		3616	$BDB_TRICKLE_WATCHER = Event->timer (
		3617	after => 5,
		3618	interval => 10,
		3619	hard => 1,
		3620	prio => 0,
		3621	data => WF_AUTOCANCEL,
		3622	cb => sub {
		3623	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3624	},
		3625	);
3175	}	3626	}
3176		3627
3177	{	3628	{
3178	IO::AIO::min_parallel 8;	3629	IO::AIO::min_parallel 8;
3179		3630
…		…
3182	$AIO_POLL_WATCHER = Event->io (	3633	$AIO_POLL_WATCHER = Event->io (
3183	reentrant => 0,	3634	reentrant => 0,
3184	data => WF_AUTOCANCEL,	3635	data => WF_AUTOCANCEL,
3185	fd => IO::AIO::poll_fileno,	3636	fd => IO::AIO::poll_fileno,
3186	poll => 'r',	3637	poll => 'r',
3187	prio => 6,	3638	prio => 0,
3188	cb => \&IO::AIO::poll_cb,	3639	cb => \&IO::AIO::poll_cb,
3189	);	3640	);
3190	}	3641	}
3191		3642
3192	my $_log_backtrace;	3643	my $_log_backtrace;
…		…
3198		3649
3199	# limit the # of concurrent backtraces	3650	# limit the # of concurrent backtraces
3200	if ($_log_backtrace < 2) {	3651	if ($_log_backtrace < 2) {
3201	++$_log_backtrace;	3652	++$_log_backtrace;
3202	async {	3653	async {
		3654	$Coro::current->{desc} = "abt $msg";
		3655
3203	my @bt = fork_call {	3656	my @bt = fork_call {
3204	@addr = map { sprintf "%x", $_ } @addr;	3657	@addr = map { sprintf "%x", $_ } @addr;
3205	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3658	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3206	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	3659	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3207	or die "addr2line: $!";	3660	or die "addr2line: $!";

Diff Legend

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