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.388 by root, Thu Oct 18 02:56:13 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
367	while ($busy) {	448	while ($busy) {
		449	if (Coro::nready) {
		450	Coro::cede_notself;
		451	} else {
368	Coro::cede or Event::one_event;	452	Event::one_event;
		453	}
369	}	454	}
370		455
371	$time = Event::time - $time;	456	$time = Event::time - $time;
372		457
373	LOG llevError | logBacktrace, Carp::longmess "long sync job"	458	LOG llevError | logBacktrace, Carp::longmess "long sync job"
…		…
413	=cut	498	=cut
414		499
415	sub fork_call(&@) {	500	sub fork_call(&@) {
416	my ($cb, @args) = @_;	501	my ($cb, @args) = @_;
417		502
418	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	503	# we seemingly have to make a local copy of the whole thing,
419	# or die "socketpair: $!";	504	# otherwise perl prematurely frees the stuff :/
420	pipe my $fh1, my $fh2	505	# TODO: investigate and fix (likely this will be rather laborious)
421	or die "pipe: $!";
422		506
423	if (my $pid = fork) {	507	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;	508	reset_signals;
436	local $SIG{__WARN__};	509	&$cb
437	local $SIG{__DIE__};	510	}, @args;
438	eval {
439	close $fh1;
440		511
441	my @res = eval { $cb->(@args) };	512	wantarray ? @res : $res[-1]
442	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
443	};
444
445	warn $@ if $@;
446	_exit 0;
447	}
448	}	513	}
449		514
450	=item $value = cf::db_get $family => $key	515	=item $value = cf::db_get $family => $key
451		516
452	Returns a single value from the environment database.	517	Returns a single value from the environment database.
…		…
454	=item cf::db_put $family => $key => $value	519	=item cf::db_put $family => $key => $value
455		520
456	Stores the given C<$value> in the family. It can currently store binary	521	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).	522	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
458		523
		524	=item $db = cf::db_table "name"
		525
		526	Create and/or open a new database table. The string must not be "db" and must be unique
		527	within each server.
		528
459	=cut	529	=cut
		530
		531	sub db_table($) {
		532	my ($name) = @_;
		533	my $db = BDB::db_create $DB_ENV;
		534
		535	eval {
		536	$db->set_flags (BDB::CHKSUM);
		537
		538	utf8::encode $name;
		539	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		540	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		541	cf::cleanup "db_open(db): $!" if $!;
		542	};
		543	cf::cleanup "db_open(db): $@" if $@;
		544
		545	$db
		546	}
460		547
461	our $DB;	548	our $DB;
462		549
463	sub db_init {	550	sub db_init {
464	unless ($DB) {
465	$DB = BDB::db_create $DB_ENV;
466
467	cf::sync_job {	551	cf::sync_job {
468	eval {	552	$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	}	553	};
478	}	554	}
479		555
480	sub db_get($$) {	556	sub db_get($$) {
481	my $key = "$_[0]/$_[1]";	557	my $key = "$_[0]/$_[1]";
482		558
…		…
532	if (1) {	608	if (1) {
533	$md5 =	609	$md5 =
534	join "\x00",	610	join "\x00",
535	$processversion,	611	$processversion,
536	map {	612	map {
537	Coro::cede;	613	cf::cede_to_tick;
538	($src->[$_], Digest::MD5::md5_hex $data[$_])	614	($src->[$_], Digest::MD5::md5_hex $data[$_])
539	} 0.. $#$src;	615	} 0.. $#$src;
540		616
541		617
542	my $dbmd5 = db_get cache => "$id/md5";	618	my $dbmd5 = db_get cache => "$id/md5";
…		…
848	";	924	";
849	die if $@;	925	die if $@;
850	}	926	}
851		927
852	our $override;	928	our $override;
853	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	929	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
854		930
855	sub override {	931	sub override {
856	$override = 1;	932	$override = 1;
857	@invoke_results = ();	933	@INVOKE_RESULTS = (@_);
858	}	934	}
859		935
860	sub do_invoke {	936	sub do_invoke {
861	my $event = shift;	937	my $event = shift;
862	my $callbacks = shift;	938	my $callbacks = shift;
863		939
864	@invoke_results = ();	940	@INVOKE_RESULTS = ();
865		941
866	local $override;	942	local $override;
867		943
868	for (@$callbacks) {	944	for (@$callbacks) {
869	eval { &{$_->[1]} };	945	eval { &{$_->[1]} };
…		…
886		962
887	Generate an object-specific event with the given arguments.	963	Generate an object-specific event with the given arguments.
888		964
889	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	965	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	966	removed in future versions), and there is no public API to access override
891	results (if you must, access C<@cf::invoke_results> directly).	967	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
892		968
893	=back	969	=back
894		970
895	=cut	971	=cut
896		972
897	#############################################################################	973	#############################################################################
898	# object support	974	# object support
		975
		976	sub _object_equal($$);
		977	sub _object_equal($$) {
		978	my ($a, $b) = @_;
		979
		980	return 0 unless (ref $a) eq (ref $b);
		981
		982	if ("HASH" eq ref $a) {
		983	my @ka = keys %$a;
		984	my @kb = keys %$b;
		985
		986	return 0 if @ka != @kb;
		987
		988	for (0 .. $#ka) {
		989	return 0 unless $ka[$_] eq $kb[$_];
		990	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		991	}
		992
		993	} elsif ("ARRAY" eq ref $a) {
		994
		995	return 0 if @$a != @$b;
		996
		997	for (0 .. $#$a) {
		998	return 0 unless _object_equal $a->[$_], $b->[$_];
		999	}
		1000
		1001	} elsif ($a ne $b) {
		1002	return 0;
		1003	}
		1004
		1005	1
		1006	}
		1007
		1008	our $SLOW_MERGES;#d#
		1009	sub _can_merge {
		1010	my ($ob1, $ob2) = @_;
		1011
		1012	++$SLOW_MERGES;#d#
		1013
		1014	# we do the slow way here
		1015	return _object_equal $ob1, $ob2
		1016	}
899		1017
900	sub reattach {	1018	sub reattach {
901	# basically do the same as instantiate, without calling instantiate	1019	# basically do the same as instantiate, without calling instantiate
902	my ($obj) = @_;	1020	my ($obj) = @_;
903		1021
…		…
950	sub object_freezer_save {	1068	sub object_freezer_save {
951	my ($filename, $rdata, $objs) = @_;	1069	my ($filename, $rdata, $objs) = @_;
952		1070
953	sync_job {	1071	sync_job {
954	if (length $$rdata) {	1072	if (length $$rdata) {
		1073	utf8::decode (my $decname = $filename);
955	warn sprintf "saving %s (%d,%d)\n",	1074	warn sprintf "saving %s (%d,%d)\n",
956	$filename, length $$rdata, scalar @$objs;	1075	$decname, length $$rdata, scalar @$objs;
957		1076
958	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1077	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
959	chmod SAVE_MODE, $fh;	1078	chmod SAVE_MODE, $fh;
960	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1079	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
961	aio_fsync $fh if $cf::USE_FSYNC;	1080	aio_fsync $fh if $cf::USE_FSYNC;
962	close $fh;	1081	close $fh;
963		1082
964	if (@$objs) {	1083	if (@$objs) {
965	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1084	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
966	chmod SAVE_MODE, $fh;	1085	chmod SAVE_MODE, $fh;
967	my $data = Storable::nfreeze { version => 1, objs => $objs };	1086	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
968	aio_write $fh, 0, (length $data), $data, 0;	1087	aio_write $fh, 0, (length $data), $data, 0;
969	aio_fsync $fh if $cf::USE_FSYNC;	1088	aio_fsync $fh if $cf::USE_FSYNC;
970	close $fh;	1089	close $fh;
971	aio_rename "$filename.pst~", "$filename.pst";	1090	aio_rename "$filename.pst~", "$filename.pst";
972	}	1091	}
…		…
980	}	1099	}
981	} else {	1100	} else {
982	aio_unlink $filename;	1101	aio_unlink $filename;
983	aio_unlink "$filename.pst";	1102	aio_unlink "$filename.pst";
984	}	1103	}
985	}	1104	};
986	}	1105	}
987		1106
988	sub object_freezer_as_string {	1107	sub object_freezer_as_string {
989	my ($rdata, $objs) = @_;	1108	my ($rdata, $objs) = @_;
990		1109
…		…
1002	or return;	1121	or return;
1003		1122
1004	unless (aio_stat "$filename.pst") {	1123	unless (aio_stat "$filename.pst") {
1005	(aio_load "$filename.pst", $av) >= 0	1124	(aio_load "$filename.pst", $av) >= 0
1006	or return;	1125	or return;
		1126
1007	$av = eval { (Storable::thaw $av)->{objs} };	1127	my $st = eval { Coro::Storable::thaw $av };
		1128	$av = $st->{objs};
1008	}	1129	}
1009		1130
		1131	utf8::decode (my $decname = $filename);
1010	warn sprintf "loading %s (%d)\n",	1132	warn sprintf "loading %s (%d,%d)\n",
1011	$filename, length $data, scalar @{$av || []};	1133	$decname, length $data, scalar @{$av || []};
		1134
1012	return ($data, $av);	1135	($data, $av)
1013	}	1136	}
1014		1137
1015	=head2 COMMAND CALLBACKS	1138	=head2 COMMAND CALLBACKS
1016		1139
1017	=over 4	1140	=over 4
…		…
1087	cf::override;	1210	cf::override;
1088	},	1211	},
1089	on_extcmd => sub {	1212	on_extcmd => sub {
1090	my ($pl, $buf) = @_;	1213	my ($pl, $buf) = @_;
1091		1214
1092	my $msg = eval { from_json $buf };	1215	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1093		1216
1094	if (ref $msg) {	1217	if (ref $msg) {
		1218	my ($type, $reply, @payload) =
		1219	"ARRAY" eq ref $msg
		1220	? @$msg
		1221	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1222
		1223	my @reply;
		1224
1095	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1225	if (my $cb = $EXTCMD{$type}) {
1096	if (my %reply = $cb->($pl, $msg)) {	1226	@reply = $cb->($pl, @payload);
1097	$pl->ext_reply ($msg->{msgid}, %reply);
1098	}
1099	}	1227	}
		1228
		1229	$pl->ext_reply ($reply, @reply)
		1230	if $reply;
		1231
1100	} else {	1232	} else {
1101	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1233	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1102	}	1234	}
1103		1235
1104	cf::override;	1236	cf::override;
…		…
1194		1326
1195	=head3 cf::player	1327	=head3 cf::player
1196		1328
1197	=over 4	1329	=over 4
1198		1330
		1331	=item cf::player::num_playing
		1332
		1333	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1334
		1335	=cut
		1336
		1337	sub num_playing {
		1338	scalar grep
		1339	$_->ob->map
		1340	&& !$_->hidden
		1341	&& !$_->ob->flag (cf::FLAG_WIZ),
		1342	cf::player::list
		1343	}
		1344
1199	=item cf::player::find $login	1345	=item cf::player::find $login
1200		1346
1201	Returns the given player object, loading it if necessary (might block).	1347	Returns the given player object, loading it if necessary (might block).
1202		1348
1203	=cut	1349	=cut
…		…
1238	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1384	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1239	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1385	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1240	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1386	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1241	aio_unlink +(playerdir $login) . "/$login.pl";	1387	aio_unlink +(playerdir $login) . "/$login.pl";
1242		1388
1243	my $pl = load_pl path $login	1389	my $f = new_from_file cf::object::thawer path $login
1244	or return;	1390	or return;
		1391
		1392	my $pl = cf::player::load_pl $f
		1393	or return;
		1394	local $cf::PLAYER_LOADING{$login} = $pl;
		1395	$f->resolve_delayed_derefs;
1245	$cf::PLAYER{$login} = $pl	1396	$cf::PLAYER{$login} = $pl
1246	}	1397	}
1247	}	1398	}
1248	}	1399	}
1249		1400
…		…
1259		1410
1260	aio_mkdir playerdir $pl, 0770;	1411	aio_mkdir playerdir $pl, 0770;
1261	$pl->{last_save} = $cf::RUNTIME;	1412	$pl->{last_save} = $cf::RUNTIME;
1262		1413
1263	$pl->save_pl ($path);	1414	$pl->save_pl ($path);
1264	Coro::cede;	1415	cf::cede_to_tick;
1265	}	1416	}
1266		1417
1267	sub new($) {	1418	sub new($) {
1268	my ($login) = @_;	1419	my ($login) = @_;
1269		1420
…		…
1273	$self->{deny_save} = 1;	1424	$self->{deny_save} = 1;
1274		1425
1275	$cf::PLAYER{$login} = $self;	1426	$cf::PLAYER{$login} = $self;
1276		1427
1277	$self	1428	$self
		1429	}
		1430
		1431	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1432
		1433	=cut
		1434
		1435	sub send_msg {
		1436	my $ns = shift->ns
		1437	or return;
		1438	$ns->send_msg (@_);
1278	}	1439	}
1279		1440
1280	=item $pl->quit_character	1441	=item $pl->quit_character
1281		1442
1282	Nukes the player without looking back. If logged in, the connection will	1443	Nukes the player without looking back. If logged in, the connection will
…		…
1337	or return [];	1498	or return [];
1338		1499
1339	my @logins;	1500	my @logins;
1340		1501
1341	for my $login (@$dirs) {	1502	for my $login (@$dirs) {
		1503	my $path = path $login;
		1504
		1505	# a .pst is a dead give-away for a valid player
		1506	unless (-e "$path.pst") {
1342	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1507	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1343	aio_read $fh, 0, 512, my $buf, 0 or next;	1508	aio_read $fh, 0, 512, my $buf, 0 or next;
1344	$buf !~ /^password -------------$/m or next; # official not-valid tag	1509	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1510	}
1345		1511
1346	utf8::decode $login;	1512	utf8::decode $login;
1347	push @logins, $login;	1513	push @logins, $login;
1348	}	1514	}
1349		1515
…		…
1387	sub expand_cfpod {	1553	sub expand_cfpod {
1388	((my $self), (local $_)) = @_;	1554	((my $self), (local $_)) = @_;
1389		1555
1390	# escape & and <	1556	# escape & and <
1391	s/&/&amp;/g;	1557	s/&/&amp;/g;
1392	s/(?<![BIUGH])</&lt;/g;	1558	s/(?<![BIUGHT])</&lt;/g;
1393		1559
1394	# this is buggy, it needs to properly take care of nested <'s	1560	# this is buggy, it needs to properly take care of nested <'s
1395		1561
1396	1 while	1562	1 while
1397	# replace B<>, I<>, U<> etc.	1563	# replace B<>, I<>, U<> etc.
1398	s/B<([^\>]*)>/<b>$1<\/b>/	1564	s/B<([^\>]*)>/<b>$1<\/b>/
1399	|| s/I<([^\>]*)>/<i>$1<\/i>/	1565	|| s/I<([^\>]*)>/<i>$1<\/i>/
1400	|| s/U<([^\>]*)>/<u>$1<\/u>/	1566	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1567	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1401	# replace G<male|female> tags	1568	# replace G<male|female> tags
1402	|| s{G<([^>|]*)\|([^>]*)>}{	1569	|| s{G<([^>|]*)\|([^>]*)>}{
1403	$self->gender ? $2 : $1	1570	$self->gender ? $2 : $1
1404	}ge	1571	}ge
1405	# replace H<hint text>	1572	# replace H<hint text>
1406	|| s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;	1573	|| s{H<([^\>]*)>}
		1574	{
		1575	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1576	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1577	"")
		1578	[$self->{hintmode}]
		1579	}ge;
1407		1580
1408	# create single paragraphs (very hackish)	1581	# create single paragraphs (very hackish)
1409	s/(?<=\S)\n(?=\w)/ /g;	1582	s/(?<=\S)\n(?=\w)/ /g;
1410		1583
		1584	# compress some whitespace
		1585	s/\s+\n/\n/g; # ws line-ends
		1586	s/\n\n+/\n/g; # double lines
		1587	s/^\n+//; # beginning lines
		1588	s/\n+$//; # ending lines
		1589
1411	$_	1590	$_
1412	}	1591	}
1413		1592
		1593	sub hintmode {
		1594	$_[0]{hintmode} = $_[1] if @_ > 1;
		1595	$_[0]{hintmode}
		1596	}
		1597
1414	=item $player->ext_reply ($msgid, %msg)	1598	=item $player->ext_reply ($msgid, @msg)
1415		1599
1416	Sends an ext reply to the player.	1600	Sends an ext reply to the player.
1417		1601
1418	=cut	1602	=cut
1419		1603
1420	sub ext_reply($$%) {	1604	sub ext_reply($$@) {
1421	my ($self, $id, %msg) = @_;	1605	my ($self, $id, @msg) = @_;
1422		1606
1423	$msg{msgid} = $id;	1607	$self->ns->ext_reply ($id, @msg)
1424	$self->send ("ext " . cf::to_json \%msg);
1425	}	1608	}
1426		1609
1427	=item $player->ext_event ($type, %msg)	1610	=item $player->ext_msg ($type, @msg)
1428		1611
1429	Sends an ext event to the client.	1612	Sends an ext event to the client.
1430		1613
1431	=cut	1614	=cut
1432		1615
1433	sub ext_event($$%) {	1616	sub ext_msg($$@) {
1434	my ($self, $type, %msg) = @_;	1617	my ($self, $type, @msg) = @_;
1435		1618
1436	$self->ns->ext_event ($type, %msg);	1619	$self->ns->ext_msg ($type, @msg);
1437	}	1620	}
1438		1621
1439	=head3 cf::region	1622	=head3 cf::region
1440		1623
1441	=over 4	1624	=over 4
…		…
1454	my ($path) = @_;	1637	my ($path) = @_;
1455		1638
1456	my ($match, $specificity);	1639	my ($match, $specificity);
1457		1640
1458	for my $region (list) {	1641	for my $region (list) {
1459	if ($region->match && $path =~ $region->match) {	1642	if ($region->{match} && $path =~ $region->{match}) {
1460	($match, $specificity) = ($region, $region->specificity)	1643	($match, $specificity) = ($region, $region->specificity)
1461	if $region->specificity > $specificity;	1644	if $region->specificity > $specificity;
1462	}	1645	}
1463	}	1646	}
1464		1647
…		…
1584	$self->init; # pass $1 etc.	1767	$self->init; # pass $1 etc.
1585	return $self;	1768	return $self;
1586	}	1769	}
1587	}	1770	}
1588		1771
1589	Carp::carp "unable to resolve path '$path' (base '$base').";	1772	Carp::cluck "unable to resolve path '$path' (base '$base').";
1590	()	1773	()
1591	}	1774	}
1592		1775
1593	sub init {	1776	sub init {
1594	my ($self) = @_;	1777	my ($self) = @_;
…		…
1657		1840
1658	sub load_header_from($) {	1841	sub load_header_from($) {
1659	my ($self, $path) = @_;	1842	my ($self, $path) = @_;
1660		1843
1661	utf8::encode $path;	1844	utf8::encode $path;
1662	#aio_open $path, O_RDONLY, 0	1845	my $f = new_from_file cf::object::thawer $path
1663	# or return;
1664
1665	$self->_load_header ($path)
1666	or return;	1846	or return;
		1847
		1848	$self->_load_header ($f)
		1849	or return;
		1850
		1851	local $MAP_LOADING{$self->{path}} = $self;
		1852	$f->resolve_delayed_derefs;
1667		1853
1668	$self->{load_path} = $path;	1854	$self->{load_path} = $path;
1669		1855
1670	1	1856	1
1671	}	1857	}
…		…
1725	sub find {	1911	sub find {
1726	my ($path, $origin) = @_;	1912	my ($path, $origin) = @_;
1727		1913
1728	$path = normalise $path, $origin && $origin->path;	1914	$path = normalise $path, $origin && $origin->path;
1729		1915
		1916	cf::lock_wait "map_data:$path";#d#remove
1730	cf::lock_wait "map_find:$path";	1917	cf::lock_wait "map_find:$path";
1731		1918
1732	$cf::MAP{$path} || do {	1919	$cf::MAP{$path} || do {
1733	my $guard = cf::lock_acquire "map_find:$path";	1920	my $guard1 = cf::lock_acquire "map_find:$path";
		1921	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1922
1734	my $map = new_from_path cf::map $path	1923	my $map = new_from_path cf::map $path
1735	or return;	1924	or return;
1736		1925
1737	$map->{last_save} = $cf::RUNTIME;	1926	$map->{last_save} = $cf::RUNTIME;
1738		1927
…		…
1740	or return;	1929	or return;
1741		1930
1742	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1931	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1743	# doing this can freeze the server in a sync job, obviously	1932	# doing this can freeze the server in a sync job, obviously
1744	#$cf::WAIT_FOR_TICK->wait;	1933	#$cf::WAIT_FOR_TICK->wait;
		1934	undef $guard1;
		1935	undef $guard2;
1745	$map->reset;	1936	$map->reset;
1746	undef $guard;
1747	return find $path;	1937	return find $path;
1748	}	1938	}
1749		1939
1750	$cf::MAP{$path} = $map	1940	$cf::MAP{$path} = $map
1751	}	1941	}
…		…
1760	local $self->{deny_reset} = 1; # loading can take a long time	1950	local $self->{deny_reset} = 1; # loading can take a long time
1761		1951
1762	my $path = $self->{path};	1952	my $path = $self->{path};
1763		1953
1764	{	1954	{
1765	my $guard = cf::lock_acquire "map_load:$path";	1955	my $guard = cf::lock_acquire "map_data:$path";
1766		1956
		1957	return unless $self->valid;
1767	return if $self->in_memory != cf::MAP_SWAPPED;	1958	return unless $self->in_memory == cf::MAP_SWAPPED;
1768		1959
1769	$self->in_memory (cf::MAP_LOADING);	1960	$self->in_memory (cf::MAP_LOADING);
1770		1961
1771	$self->alloc;	1962	$self->alloc;
1772		1963
1773	$self->pre_load;	1964	$self->pre_load;
1774	Coro::cede;	1965	cf::cede_to_tick;
1775		1966
		1967	my $f = new_from_file cf::object::thawer $self->{load_path};
		1968	$f->skip_block;
1776	$self->_load_objects ($self->{load_path}, 1)	1969	$self->_load_objects ($f)
1777	or return;	1970	or return;
1778		1971
1779	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1972	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1780	if delete $self->{load_original};	1973	if delete $self->{load_original};
1781		1974
1782	if (my $uniq = $self->uniq_path) {	1975	if (my $uniq = $self->uniq_path) {
1783	utf8::encode $uniq;	1976	utf8::encode $uniq;
1784	if (aio_open $uniq, O_RDONLY, 0) {	1977	unless (aio_stat $uniq) {
		1978	if (my $f = new_from_file cf::object::thawer $uniq) {
1785	$self->clear_unique_items;	1979	$self->clear_unique_items;
1786	$self->_load_objects ($uniq, 0);	1980	$self->_load_objects ($f);
		1981	$f->resolve_delayed_derefs;
		1982	}
1787	}	1983	}
1788	}	1984	}
1789		1985
1790	Coro::cede;	1986	$f->resolve_delayed_derefs;
		1987
		1988	cf::cede_to_tick;
1791	# now do the right thing for maps	1989	# now do the right thing for maps
1792	$self->link_multipart_objects;	1990	$self->link_multipart_objects;
1793	$self->difficulty ($self->estimate_difficulty)	1991	$self->difficulty ($self->estimate_difficulty)
1794	unless $self->difficulty;	1992	unless $self->difficulty;
1795	Coro::cede;	1993	cf::cede_to_tick;
1796		1994
1797	unless ($self->{deny_activate}) {	1995	unless ($self->{deny_activate}) {
1798	$self->decay_objects;	1996	$self->decay_objects;
1799	$self->fix_auto_apply;	1997	$self->fix_auto_apply;
1800	$self->update_buttons;	1998	$self->update_buttons;
1801	Coro::cede;	1999	cf::cede_to_tick;
1802	$self->set_darkness_map;	2000	$self->set_darkness_map;
1803	Coro::cede;	2001	cf::cede_to_tick;
1804	$self->activate;	2002	$self->activate;
1805	}	2003	}
		2004
		2005	$self->{last_save} = $cf::RUNTIME;
		2006	$self->last_access ($cf::RUNTIME);
1806		2007
1807	$self->in_memory (cf::MAP_IN_MEMORY);	2008	$self->in_memory (cf::MAP_IN_MEMORY);
1808	}	2009	}
1809		2010
1810	$self->post_load;	2011	$self->post_load;
…		…
1821		2022
1822	$self	2023	$self
1823	}	2024	}
1824		2025
1825	# find and load all maps in the 3x3 area around a map	2026	# find and load all maps in the 3x3 area around a map
1826	sub load_diag {	2027	sub load_neighbours {
1827	my ($map) = @_;	2028	my ($map) = @_;
1828		2029
1829	my @diag; # diagonal neighbours	2030	my @neigh; # diagonal neighbours
1830		2031
1831	for (0 .. 3) {	2032	for (0 .. 3) {
1832	my $neigh = $map->tile_path ($_)	2033	my $neigh = $map->tile_path ($_)
1833	or next;	2034	or next;
1834	$neigh = find $neigh, $map	2035	$neigh = find $neigh, $map
1835	or next;	2036	or next;
1836	$neigh->load;	2037	$neigh->load;
1837		2038
		2039	push @neigh,
1838	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2040	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1839	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2041	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1840	}	2042	}
1841		2043
1842	for (@diag) {	2044	for (grep defined $_->[0], @neigh) {
		2045	my ($path, $origin) = @$_;
1843	my $neigh = find @$_	2046	my $neigh = find $path, $origin
1844	or next;	2047	or next;
1845	$neigh->load;	2048	$neigh->load;
1846	}	2049	}
1847	}	2050	}
1848		2051
…		…
1853	}	2056	}
1854		2057
1855	sub do_load_sync {	2058	sub do_load_sync {
1856	my ($map) = @_;	2059	my ($map) = @_;
1857		2060
		2061	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2062	if $Coro::current == $Coro::main;
		2063
1858	cf::sync_job { $map->load };	2064	cf::sync_job { $map->load };
1859	}	2065	}
1860		2066
1861	our %MAP_PREFETCH;	2067	our %MAP_PREFETCH;
1862	our $MAP_PREFETCHER = undef;	2068	our $MAP_PREFETCHER = undef;
1863		2069
1864	sub find_async {	2070	sub find_async {
1865	my ($path, $origin) = @_;	2071	my ($path, $origin, $load) = @_;
1866		2072
1867	$path = normalise $path, $origin && $origin->{path};	2073	$path = normalise $path, $origin && $origin->{path};
1868		2074
1869	if (my $map = $cf::MAP{$path}) {	2075	if (my $map = $cf::MAP{$path}) {
1870	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2076	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1871	}	2077	}
1872		2078
1873	undef $MAP_PREFETCH{$path};	2079	$MAP_PREFETCH{$path} |= $load;
		2080
1874	$MAP_PREFETCHER ||= cf::async {	2081	$MAP_PREFETCHER ||= cf::async {
		2082	$Coro::current->{desc} = "map prefetcher";
		2083
1875	while (%MAP_PREFETCH) {	2084	while (%MAP_PREFETCH) {
1876	for my $path (keys %MAP_PREFETCH) {	2085	while (my ($k, $v) = each %MAP_PREFETCH) {
1877	my $map = find $path	2086	if (my $map = find $k) {
1878	or next;
1879	$map->load;	2087	$map->load if $v;
		2088	}
1880		2089
1881	delete $MAP_PREFETCH{$path};	2090	delete $MAP_PREFETCH{$k};
1882	}	2091	}
1883	}	2092	}
1884	undef $MAP_PREFETCHER;	2093	undef $MAP_PREFETCHER;
1885	};	2094	};
1886	$MAP_PREFETCHER->prio (6);	2095	$MAP_PREFETCHER->prio (6);
…		…
1889	}	2098	}
1890		2099
1891	sub save {	2100	sub save {
1892	my ($self) = @_;	2101	my ($self) = @_;
1893		2102
1894	my $lock = cf::lock_acquire "map_data:" . $self->path;	2103	my $lock = cf::lock_acquire "map_data:$self->{path}";
1895		2104
1896	$self->{last_save} = $cf::RUNTIME;	2105	$self->{last_save} = $cf::RUNTIME;
1897		2106
1898	return unless $self->dirty;	2107	return unless $self->dirty;
1899		2108
…		…
1905	return if $self->{deny_save};	2114	return if $self->{deny_save};
1906		2115
1907	local $self->{last_access} = $self->last_access;#d#	2116	local $self->{last_access} = $self->last_access;#d#
1908		2117
1909	cf::async {	2118	cf::async {
		2119	$Coro::current->{desc} = "map player save";
1910	$_->contr->save for $self->players;	2120	$_->contr->save for $self->players;
1911	};	2121	};
1912		2122
1913	if ($uniq) {	2123	if ($uniq) {
1914	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2124	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
1922	my ($self) = @_;	2132	my ($self) = @_;
1923		2133
1924	# save first because save cedes	2134	# save first because save cedes
1925	$self->save;	2135	$self->save;
1926		2136
1927	my $lock = cf::lock_acquire "map_data:" . $self->path;	2137	my $lock = cf::lock_acquire "map_data:$self->{path}";
1928		2138
1929	return if $self->players;	2139	return if $self->players;
1930	return if $self->in_memory != cf::MAP_IN_MEMORY;	2140	return if $self->in_memory != cf::MAP_IN_MEMORY;
1931	return if $self->{deny_save};	2141	return if $self->{deny_save};
1932		2142
		2143	$self->in_memory (cf::MAP_SWAPPED);
		2144
		2145	$self->deactivate;
		2146	$_->clear_links_to ($self) for values %cf::MAP;
1933	$self->clear;	2147	$self->clear;
1934	$self->in_memory (cf::MAP_SWAPPED);
1935	}	2148	}
1936		2149
1937	sub reset_at {	2150	sub reset_at {
1938	my ($self) = @_;	2151	my ($self) = @_;
1939		2152
…		…
1971	if $uniq;	2184	if $uniq;
1972	}	2185	}
1973		2186
1974	delete $cf::MAP{$self->path};	2187	delete $cf::MAP{$self->path};
1975		2188
		2189	$self->deactivate;
		2190	$_->clear_links_to ($self) for values %cf::MAP;
1976	$self->clear;	2191	$self->clear;
1977
1978	$_->clear_links_to ($self) for values %cf::MAP;
1979		2192
1980	$self->unlink_save;	2193	$self->unlink_save;
1981	$self->destroy;	2194	$self->destroy;
1982	}	2195	}
1983		2196
1984	my $nuke_counter = "aaaa";	2197	my $nuke_counter = "aaaa";
1985		2198
1986	sub nuke {	2199	sub nuke {
1987	my ($self) = @_;	2200	my ($self) = @_;
1988		2201
		2202	{
		2203	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2204
1989	delete $cf::MAP{$self->path};	2205	delete $cf::MAP{$self->path};
1990		2206
1991	$self->unlink_save;	2207	$self->unlink_save;
1992		2208
1993	bless $self, "cf::map";	2209	bless $self, "cf::map";
1994	delete $self->{deny_reset};	2210	delete $self->{deny_reset};
1995	$self->{deny_save} = 1;	2211	$self->{deny_save} = 1;
1996	$self->reset_timeout (1);	2212	$self->reset_timeout (1);
1997	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2213	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1998		2214
1999	$cf::MAP{$self->path} = $self;	2215	$cf::MAP{$self->path} = $self;
		2216	}
2000		2217
2001	$self->reset; # polite request, might not happen	2218	$self->reset; # polite request, might not happen
2002	}	2219	}
2003		2220
2004	=item $maps = cf::map::tmp_maps	2221	=item $maps = cf::map::tmp_maps
…		…
2080		2297
2081	sub inv_recursive {	2298	sub inv_recursive {
2082	inv_recursive_ inv $_[0]	2299	inv_recursive_ inv $_[0]
2083	}	2300	}
2084		2301
		2302	=item $ref = $ob->ref
		2303
		2304	creates and returns a persistent reference to an objetc that can be stored as a string.
		2305
		2306	=item $ob = cf::object::deref ($refstring)
		2307
		2308	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2309	even if the object actually exists. May block.
		2310
		2311	=cut
		2312
		2313	sub deref {
		2314	my ($ref) = @_;
		2315
		2316	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2317	my ($uuid, $name) = ($1, $2);
		2318	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2319	or return;
		2320	$pl->ob->uuid eq $uuid
		2321	or return;
		2322
		2323	$pl->ob
		2324	} else {
		2325	warn "$ref: cannot resolve object reference\n";
		2326	undef
		2327	}
		2328	}
		2329
2085	package cf;	2330	package cf;
2086		2331
2087	=back	2332	=back
2088		2333
2089	=head3 cf::object::player	2334	=head3 cf::object::player
…		…
2111		2356
2112	} else {	2357	} else {
2113	my $pl = $self->contr;	2358	my $pl = $self->contr;
2114		2359
2115	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2360	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2116	my $diag = $pl->{npc_dialog};	2361	my $dialog = $pl->{npc_dialog};
2117	$diag->{pl}->ext_reply (	2362	$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		2363
2124	} else {	2364	} else {
2125	$msg = $npc->name . " says: $msg" if $npc;	2365	$msg = $npc->name . " says: $msg" if $npc;
2126	$self->message ($msg, $flags);	2366	$self->message ($msg, $flags);
2127	}	2367	}
2128	}	2368	}
		2369	}
		2370
		2371	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2372
		2373	=cut
		2374
		2375	sub cf::object::send_msg {
		2376	my $pl = shift->contr
		2377	or return;
		2378	$pl->send_msg (@_);
2129	}	2379	}
2130		2380
2131	=item $player_object->may ("access")	2381	=item $player_object->may ("access")
2132		2382
2133	Returns wether the given player is authorized to access resource "access"	2383	Returns wether the given player is authorized to access resource "access"
…		…
2212	# use -1 or undef as default coordinates, not 0, 0	2462	# use -1 or undef as default coordinates, not 0, 0
2213	($x, $y) = ($map->enter_x, $map->enter_y)	2463	($x, $y) = ($map->enter_x, $map->enter_y)
2214	if $x <=0 && $y <= 0;	2464	if $x <=0 && $y <= 0;
2215		2465
2216	$map->load;	2466	$map->load;
2217	$map->load_diag;	2467	$map->load_neighbours;
2218		2468
2219	return unless $self->contr->active;	2469	return unless $self->contr->active;
2220	$self->activate_recursive;	2470	$self->activate_recursive;
2221		2471
2222	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2472	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223	$self->enter_map ($map, $x, $y);	2473	$self->enter_map ($map, $x, $y);
2224	}	2474	}
2225		2475
2226	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2476	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2227		2477
2228	Moves the player to the given map-path and coordinates by first freezing	2478	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	2479	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	2480	that has to return the map if sucecssful, and then unfreezes the player on
2231	the new (success) or old (failed) map position.	2481	the new (success) or old (failed) map position. In either case, $done will
		2482	be called at the end of this process.
2232		2483
2233	=cut	2484	=cut
2234		2485
2235	our $GOTOGEN;	2486	our $GOTOGEN;
2236		2487
2237	sub cf::object::player::goto {	2488	sub cf::object::player::goto {
2238	my ($self, $path, $x, $y, $check) = @_;	2489	my ($self, $path, $x, $y, $check, $done) = @_;
2239		2490
2240	# do generation counting so two concurrent goto's will be executed in-order	2491	# do generation counting so two concurrent goto's will be executed in-order
2241	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2492	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242		2493
2243	$self->enter_link;	2494	$self->enter_link;
2244		2495
2245	(async {	2496	(async {
		2497	$Coro::current->{desc} = "player::goto $path $x $y";
		2498
		2499	# *tag paths override both path and x|y
		2500	if ($path =~ /^\*(.*)$/) {
		2501	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2502	my $ob = $obs[rand @obs];
		2503
		2504	# see if we actually can go there
		2505	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2506	$ob = $obs[rand @obs];
		2507	} else {
		2508	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2509	}
		2510	# else put us there anyways for now #d#
		2511
		2512	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2513	} else {
		2514	($path, $x, $y) = (undef, undef, undef);
		2515	}
		2516	}
		2517
2246	my $map = eval {	2518	my $map = eval {
2247	my $map = cf::map::find $path;	2519	my $map = defined $path ? cf::map::find $path : undef;
2248		2520
2249	if ($map) {	2521	if ($map) {
2250	$map = $map->customise_for ($self);	2522	$map = $map->customise_for ($self);
2251	$map = $check->($map) if $check && $map;	2523	$map = $check->($map) if $check && $map;
2252	} else {	2524	} else {
2253	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2525	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2254	}	2526	}
2255		2527
2256	$map	2528	$map
2257	};	2529	};
2258		2530
…		…
2263		2535
2264	if ($gen == $self->{_goto_generation}) {	2536	if ($gen == $self->{_goto_generation}) {
2265	delete $self->{_goto_generation};	2537	delete $self->{_goto_generation};
2266	$self->leave_link ($map, $x, $y);	2538	$self->leave_link ($map, $x, $y);
2267	}	2539	}
		2540
		2541	$done->() if $done;
2268	})->prio (1);	2542	})->prio (1);
2269	}	2543	}
2270		2544
2271	=item $player_object->enter_exit ($exit_object)	2545	=item $player_object->enter_exit ($exit_object)
2272		2546
…		…
2341	my $hp = $exit->stats->hp;	2615	my $hp = $exit->stats->hp;
2342	my $sp = $exit->stats->sp;	2616	my $sp = $exit->stats->sp;
2343		2617
2344	$self->enter_link;	2618	$self->enter_link;
2345		2619
		2620	# if exit is damned, update players death & WoR home-position
		2621	$self->contr->savebed ($slaying, $hp, $sp)
		2622	if $exit->flag (FLAG_DAMNED);
		2623
2346	(async {	2624	(async {
		2625	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2626
2347	$self->deactivate_recursive; # just to be sure	2627	$self->deactivate_recursive; # just to be sure
2348	unless (eval {	2628	unless (eval {
2349	$self->goto ($slaying, $hp, $sp);	2629	$self->goto ($slaying, $hp, $sp);
2350		2630
2351	1;	2631	1;
…		…
2377		2657
2378	utf8::encode $text;	2658	utf8::encode $text;
2379	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2659	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2380	}	2660	}
2381		2661
2382	=item $client->send_msg ($color, $type, $msg, [extra...])	2662	=item $client->send_msg ($channel, $msg, $color, [extra...])
2383		2663
2384	Send a drawinfo or msg packet to the client, formatting the msg for the	2664	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	2665	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	2666	the message, with C<log> being the default. If C<$color> is negative, suppress
2387	the message unless the client supports the msg packet.	2667	the message unless the client supports the msg packet.
2388		2668
2389	=cut	2669	=cut
2390		2670
		2671	our %CHANNEL = (
		2672	"c/identify" => {
		2673	id => "infobox",
		2674	title => "Identify",
		2675	reply => undef,
		2676	tooltip => "Items recently identified",
		2677	},
		2678	"c/examine" => {
		2679	id => "infobox",
		2680	title => "Examine",
		2681	reply => undef,
		2682	tooltip => "Signs and other items you examined",
		2683	},
		2684	"c/lookat" => {
		2685	id => "infobox",
		2686	title => "Look",
		2687	reply => undef,
		2688	tooltip => "What you saw there",
		2689	},
		2690	);
		2691
2391	sub cf::client::send_msg {	2692	sub cf::client::send_msg {
2392	my ($self, $color, $type, $msg, @extra) = @_;	2693	my ($self, $channel, $msg, $color, @extra) = @_;
2393		2694
2394	$msg = $self->pl->expand_cfpod ($msg);	2695	$msg = $self->pl->expand_cfpod ($msg);
2395		2696
		2697	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2698
		2699	# check predefined channels, for the benefit of C
		2700	if ($CHANNEL{$channel}) {
		2701	$channel = $CHANNEL{$channel};
		2702
		2703	$self->ext_msg (channel_info => $channel)
		2704	if $self->can_msg;
		2705
		2706	$channel = $channel->{id};
		2707
		2708	} elsif (ref $channel) {
		2709	# send meta info to client, if not yet sent
		2710	unless (exists $self->{channel}{$channel->{id}}) {
		2711	$self->{channel}{$channel->{id}} = $channel;
		2712	$self->ext_msg (channel_info => $channel)
		2713	if $self->can_msg;
		2714	}
		2715
		2716	$channel = $channel->{id};
		2717	}
		2718
		2719	return unless @extra || length $msg;
		2720
2396	if ($self->can_msg) {	2721	if ($self->can_msg) {
2397	$self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);	2722	# default colour, mask it out
		2723	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2724	if $color & cf::NDI_DEF;
		2725
		2726	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2727	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2398	} else {	2728	} 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) {	2729	if ($color >= 0) {
		2730	# replace some tags by gcfclient-compatible ones
		2731	for ($msg) {
		2732	1 while
		2733	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2734	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2735	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2736	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2737	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2738	}
		2739
		2740	$color &= cf::NDI_COLOR_MASK;
		2741
		2742	utf8::encode $msg;
		2743
2410	if (0 && $msg =~ /\[/) {	2744	if (0 && $msg =~ /\[/) {
		2745	# COMMAND/INFO
2411	$self->send_packet ("drawextinfo $color 4 0 $msg")	2746	$self->send_packet ("drawextinfo $color 10 8 $msg")
2412	} else {	2747	} else {
2413	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	2748	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2414	$self->send_packet ("drawinfo $color $msg")	2749	$self->send_packet ("drawinfo $color $msg")
2415	}	2750	}
2416	}	2751	}
2417	}	2752	}
2418	}	2753	}
2419		2754
2420	=item $client->ext_event ($type, %msg)	2755	=item $client->ext_msg ($type, @msg)
2421		2756
2422	Sends an ext event to the client.	2757	Sends an ext event to the client.
2423		2758
2424	=cut	2759	=cut
2425		2760
2426	sub cf::client::ext_event($$%) {	2761	sub cf::client::ext_msg($$@) {
2427	my ($self, $type, %msg) = @_;	2762	my ($self, $type, @msg) = @_;
2428		2763
		2764	if ($self->extcmd == 2) {
		2765	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2766	} elsif ($self->extcmd == 1) { # TODO: remove
2429	$msg{msgtype} = "event_$type";	2767	push @msg, msgtype => "event_$type";
2430	$self->send_packet ("ext " . cf::to_json \%msg);	2768	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2769	}
		2770	}
		2771
		2772	=item $client->ext_reply ($msgid, @msg)
		2773
		2774	Sends an ext reply to the client.
		2775
		2776	=cut
		2777
		2778	sub cf::client::ext_reply($$@) {
		2779	my ($self, $id, @msg) = @_;
		2780
		2781	if ($self->extcmd == 2) {
		2782	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2783	} elsif ($self->extcmd == 1) {
		2784	#TODO: version 1, remove
		2785	unshift @msg, msgtype => "reply", msgid => $id;
		2786	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2787	}
2431	}	2788	}
2432		2789
2433	=item $success = $client->query ($flags, "text", \&cb)	2790	=item $success = $client->query ($flags, "text", \&cb)
2434		2791
2435	Queues a query to the client, calling the given callback with	2792	Queues a query to the client, calling the given callback with
…		…
2458		2815
2459	1	2816	1
2460	}	2817	}
2461		2818
2462	cf::client->attach (	2819	cf::client->attach (
		2820	on_connect => sub {
		2821	my ($ns) = @_;
		2822
		2823	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2824	},
2463	on_reply => sub {	2825	on_reply => sub {
2464	my ($ns, $msg) = @_;	2826	my ($ns, $msg) = @_;
2465		2827
2466	# this weird shuffling is so that direct followup queries	2828	# this weird shuffling is so that direct followup queries
2467	# get handled first	2829	# get handled first
…		…
2482	}	2844	}
2483	},	2845	},
2484	on_exticmd => sub {	2846	on_exticmd => sub {
2485	my ($ns, $buf) = @_;	2847	my ($ns, $buf) = @_;
2486		2848
2487	my $msg = eval { from_json $buf };	2849	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488		2850
2489	if (ref $msg) {	2851	if (ref $msg) {
		2852	my ($type, $reply, @payload) =
		2853	"ARRAY" eq ref $msg
		2854	? @$msg
		2855	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2856
		2857	my @reply;
		2858
2490	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2859	if (my $cb = $EXTICMD{$type}) {
2491	if (my %reply = $cb->($ns, $msg)) {	2860	@reply = $cb->($ns, @payload);
2492	$reply{msgid} = $msg->{msgid};
2493	$ns->send ("ext " . cf::to_json \%reply);
2494	}
2495	}	2861	}
		2862
		2863	$ns->ext_reply ($reply, @reply)
		2864	if $reply;
		2865
2496	} else {	2866	} else {
2497	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2867	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2498	}	2868	}
2499		2869
2500	cf::override;	2870	cf::override;
…		…
2547	our $safe = new Safe "safe";	2917	our $safe = new Safe "safe";
2548	our $safe_hole = new Safe::Hole;	2918	our $safe_hole = new Safe::Hole;
2549		2919
2550	$SIG{FPE} = 'IGNORE';	2920	$SIG{FPE} = 'IGNORE';
2551		2921
2552	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2922	$safe->permit_only (Opcode::opset qw(
		2923	:base_core :base_mem :base_orig :base_math
		2924	grepstart grepwhile mapstart mapwhile
		2925	sort time
		2926	));
2553		2927
2554	# here we export the classes and methods available to script code	2928	# here we export the classes and methods available to script code
2555		2929
2556	=pod	2930	=pod
2557		2931
2558	The following functions and methods are available within a safe environment:	2932	The following functions and methods are available within a safe environment:
2559		2933
2560	cf::object contr pay_amount pay_player map	2934	cf::object
		2935	contr pay_amount pay_player map x y force_find force_add destroy
		2936	insert remove name archname title slaying race decrease_ob_nr
		2937
2561	cf::object::player player	2938	cf::object::player
2562	cf::player peaceful	2939	player
2563	cf::map trigger	2940
		2941	cf::player
		2942	peaceful
		2943
		2944	cf::map
		2945	trigger
2564		2946
2565	=cut	2947	=cut
2566		2948
2567	for (	2949	for (
2568	["cf::object" => qw(contr pay_amount pay_player map)],	2950	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2951	insert remove inv name archname title slaying race
		2952	decrease_ob_nr destroy)],
2569	["cf::object::player" => qw(player)],	2953	["cf::object::player" => qw(player)],
2570	["cf::player" => qw(peaceful)],	2954	["cf::player" => qw(peaceful)],
2571	["cf::map" => qw(trigger)],	2955	["cf::map" => qw(trigger)],
2572	) {	2956	) {
2573	no strict 'refs';	2957	no strict 'refs';
…		…
2649	# the server's init and main functions	3033	# the server's init and main functions
2650		3034
2651	sub load_facedata($) {	3035	sub load_facedata($) {
2652	my ($path) = @_;	3036	my ($path) = @_;
2653		3037
		3038	# HACK to clear player env face cache, we need some signal framework
		3039	# for this (global event?)
		3040	%ext::player_env::MUSIC_FACE_CACHE = ();
		3041
		3042	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3043
2654	warn "loading facedata from $path\n";	3044	warn "loading facedata from $path\n";
2655		3045
2656	my $facedata;	3046	my $facedata;
2657	0 < aio_load $path, $facedata	3047	0 < aio_load $path, $facedata
2658	or die "$path: $!";	3048	or die "$path: $!";
…		…
2660	$facedata = Coro::Storable::thaw $facedata;	3050	$facedata = Coro::Storable::thaw $facedata;
2661		3051
2662	$facedata->{version} == 2	3052	$facedata->{version} == 2
2663	or cf::cleanup "$path: version mismatch, cannot proceed.";	3053	or cf::cleanup "$path: version mismatch, cannot proceed.";
2664		3054
		3055	# patch in the exptable
		3056	$facedata->{resource}{"res/exp_table"} = {
		3057	type => FT_RSRC,
		3058	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3059	};
		3060	cf::cede_to_tick;
		3061
2665	{	3062	{
2666	my $faces = $facedata->{faceinfo};	3063	my $faces = $facedata->{faceinfo};
2667		3064
2668	while (my ($face, $info) = each %$faces) {	3065	while (my ($face, $info) = each %$faces) {
2669	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3066	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2670	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3067	cf::face::set_visibility $idx, $info->{visibility};
		3068	cf::face::set_magicmap $idx, $info->{magicmap};
2671	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3069	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2672	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3070	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2673	Coro::cede;	3071
		3072	cf::cede_to_tick;
2674	}	3073	}
2675		3074
2676	while (my ($face, $info) = each %$faces) {	3075	while (my ($face, $info) = each %$faces) {
2677	next unless $info->{smooth};	3076	next unless $info->{smooth};
2678	my $idx = cf::face::find $face	3077	my $idx = cf::face::find $face
2679	or next;	3078	or next;
2680	if (my $smooth = cf::face::find $info->{smooth}) {	3079	if (my $smooth = cf::face::find $info->{smooth}) {
		3080	cf::face::set_smooth $idx, $smooth;
2681	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3081	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682	} else {	3082	} else {
2683	warn "smooth face '$info->{smooth}' not found for face '$face'";	3083	warn "smooth face '$info->{smooth}' not found for face '$face'";
2684	}	3084	}
2685	Coro::cede;	3085
		3086	cf::cede_to_tick;
2686	}	3087	}
2687	}	3088	}
2688		3089
2689	{	3090	{
2690	my $anims = $facedata->{animinfo};	3091	my $anims = $facedata->{animinfo};
2691		3092
2692	while (my ($anim, $info) = each %$anims) {	3093	while (my ($anim, $info) = each %$anims) {
2693	cf::anim::set $anim, $info->{frames}, $info->{facings};	3094	cf::anim::set $anim, $info->{frames}, $info->{facings};
2694	Coro::cede;	3095	cf::cede_to_tick;
2695	}	3096	}
2696		3097
2697	cf::anim::invalidate_all; # d'oh	3098	cf::anim::invalidate_all; # d'oh
2698	}	3099	}
2699		3100
		3101	{
		3102	# TODO: for gcfclient pleasure, we should give resources
		3103	# that gcfclient doesn't grok a >10000 face index.
		3104	my $res = $facedata->{resource};
		3105
		3106	my $soundconf = delete $res->{"res/sound.conf"};
		3107
		3108	while (my ($name, $info) = each %$res) {
		3109	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3110	my $data;
		3111
		3112	if ($info->{type} & 1) {
		3113	# prepend meta info
		3114
		3115	my $meta = $enc->encode ({
		3116	name => $name,
		3117	%{ $info->{meta} || {} },
		3118	});
		3119
		3120	$data = pack "(w/a*)*", $meta, $info->{data};
		3121	} else {
		3122	$data = $info->{data};
		3123	}
		3124
		3125	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3126	cf::face::set_type $idx, $info->{type};
		3127
		3128	cf::cede_to_tick;
		3129	}
		3130
		3131	if ($soundconf) {
		3132	$soundconf = $enc->decode (delete $soundconf->{data});
		3133
		3134	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3135	my $sound = $soundconf->{compat}[$_]
		3136	or next;
		3137
		3138	my $face = cf::face::find "sound/$sound->[1]";
		3139	cf::sound::set $sound->[0] => $face;
		3140	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3141	}
		3142
		3143	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3144	my $face = cf::face::find "sound/$v";
		3145	cf::sound::set $k => $face;
		3146	}
		3147	}
		3148	}
		3149
2700	1	3150	1
2701	}	3151	}
2702		3152
		3153	register_exticmd fx_want => sub {
		3154	my ($ns, $want) = @_;
		3155
		3156	while (my ($k, $v) = each %$want) {
		3157	$ns->fx_want ($k, $v);
		3158	}
		3159	};
		3160
2703	sub reload_regions {	3161	sub reload_regions {
		3162	# HACK to clear player env face cache, we need some signal framework
		3163	# for this (global event?)
		3164	%ext::player_env::MUSIC_FACE_CACHE = ();
		3165
2704	load_resource_file "$MAPDIR/regions"	3166	load_resource_file "$MAPDIR/regions"
2705	or die "unable to load regions file\n";	3167	or die "unable to load regions file\n";
		3168
		3169	for (cf::region::list) {
		3170	$_->{match} = qr/$_->{match}/
		3171	if exists $_->{match};
		3172	}
2706	}	3173	}
2707		3174
2708	sub reload_facedata {	3175	sub reload_facedata {
2709	load_facedata "$DATADIR/facedata"	3176	load_facedata "$DATADIR/facedata"
2710	or die "unable to load facedata\n";	3177	or die "unable to load facedata\n";
2711	}	3178	}
2712		3179
2713	sub reload_archetypes {	3180	sub reload_archetypes {
		3181	load_resource_file "$DATADIR/archetypes"
		3182	or die "unable to load archetypes\n";
		3183	#d# NEED to laod twice to resolve forward references
		3184	# this really needs to be done in an extra post-pass
		3185	# (which needs to be synchronous, so solve it differently)
2714	load_resource_file "$DATADIR/archetypes"	3186	load_resource_file "$DATADIR/archetypes"
2715	or die "unable to load archetypes\n";	3187	or die "unable to load archetypes\n";
2716	}	3188	}
2717		3189
2718	sub reload_treasures {	3190	sub reload_treasures {
…		…
2734		3206
2735	sub init {	3207	sub init {
2736	reload_resources;	3208	reload_resources;
2737	}	3209	}
2738		3210
2739	sub cfg_load {	3211	sub reload_config {
2740	open my $fh, "<:utf8", "$CONFDIR/config"	3212	open my $fh, "<:utf8", "$CONFDIR/config"
2741	or return;	3213	or return;
2742		3214
2743	local $/;	3215	local $/;
2744	*CFG = YAML::Syck::Load <$fh>;	3216	*CFG = YAML::Syck::Load <$fh>;
…		…
2760	sub main {	3232	sub main {
2761	# we must not ever block the main coroutine	3233	# we must not ever block the main coroutine
2762	local $Coro::idle = sub {	3234	local $Coro::idle = sub {
2763	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3235	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2764	(async {	3236	(async {
		3237	$Coro::current->{desc} = "IDLE BUG HANDLER";
2765	Event::one_event;	3238	Event::one_event;
2766	})->prio (Coro::PRIO_MAX);	3239	})->prio (Coro::PRIO_MAX);
2767	};	3240	};
2768		3241
2769	cfg_load;	3242	reload_config;
2770	db_init;	3243	db_init;
2771	load_extensions;	3244	load_extensions;
2772		3245
2773	$TICK_WATCHER->start;	3246	$TICK_WATCHER->start;
2774	Event::loop;	3247	Event::loop;
…		…
2841	# and maps saved/destroyed asynchronously.	3314	# and maps saved/destroyed asynchronously.
2842	warn "begin emergency player save\n";	3315	warn "begin emergency player save\n";
2843	for my $login (keys %cf::PLAYER) {	3316	for my $login (keys %cf::PLAYER) {
2844	my $pl = $cf::PLAYER{$login} or next;	3317	my $pl = $cf::PLAYER{$login} or next;
2845	$pl->valid or next;	3318	$pl->valid or next;
		3319	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2846	$pl->save;	3320	$pl->save;
2847	}	3321	}
2848	warn "end emergency player save\n";	3322	warn "end emergency player save\n";
2849		3323
2850	warn "begin emergency map save\n";	3324	warn "begin emergency map save\n";
…		…
2898		3372
2899	warn "flushing outstanding aio requests";	3373	warn "flushing outstanding aio requests";
2900	for (;;) {	3374	for (;;) {
2901	BDB::flush;	3375	BDB::flush;
2902	IO::AIO::flush;	3376	IO::AIO::flush;
2903	Coro::cede;	3377	Coro::cede_notself;
2904	last unless IO::AIO::nreqs || BDB::nreqs;	3378	last unless IO::AIO::nreqs || BDB::nreqs;
2905	warn "iterate...";	3379	warn "iterate...";
2906	}	3380	}
2907		3381
2908	++$RELOAD;	3382	++$RELOAD;
…		…
2967	warn "reloading cf.pm";	3441	warn "reloading cf.pm";
2968	require cf;	3442	require cf;
2969	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3443	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2970		3444
2971	warn "loading config and database again";	3445	warn "loading config and database again";
2972	cf::cfg_load;	3446	cf::reload_config;
2973		3447
2974	warn "loading extensions";	3448	warn "loading extensions";
2975	cf::load_extensions;	3449	cf::load_extensions;
2976		3450
2977	warn "reattaching attachments to objects/players";	3451	warn "reattaching attachments to objects/players";
…		…
3013	register_command "reload" => sub {	3487	register_command "reload" => sub {
3014	my ($who, $arg) = @_;	3488	my ($who, $arg) = @_;
3015		3489
3016	if ($who->flag (FLAG_WIZ)) {	3490	if ($who->flag (FLAG_WIZ)) {
3017	$who->message ("reloading server.");	3491	$who->message ("reloading server.");
		3492	async {
		3493	$Coro::current->{desc} = "perl_reload";
3018	async { reload_perl };	3494	reload_perl;
		3495	};
3019	}	3496	}
3020	};	3497	};
3021		3498
3022	unshift @INC, $LIBDIR;	3499	unshift @INC, $LIBDIR;
3023		3500
…		…
3042	my $signal = new Coro::Signal;	3519	my $signal = new Coro::Signal;
3043	push @WAIT_FOR_TICK_BEGIN, $signal;	3520	push @WAIT_FOR_TICK_BEGIN, $signal;
3044	$signal->wait;	3521	$signal->wait;
3045	}	3522	}
3046		3523
3047	my $min = 1e6;#d#
3048	my $avg = 10;
3049	$TICK_WATCHER = Event->timer (	3524	$TICK_WATCHER = Event->timer (
3050	reentrant => 0,	3525	reentrant => 0,
3051	parked => 1,	3526	parked => 1,
3052	prio => 0,	3527	prio => 0,
3053	at => $NEXT_TICK || $TICK,	3528	at => $NEXT_TICK || $TICK,
…		…
3061		3536
3062	$NOW = $tick_start = Event::time;	3537	$NOW = $tick_start = Event::time;
3063		3538
3064	cf::server_tick; # one server iteration	3539	cf::server_tick; # one server iteration
3065		3540
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;	3541	$RUNTIME += $TICK;
3090	$NEXT_TICK += $TICK;	3542	$NEXT_TICK += $TICK;
3091		3543
3092	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3544	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3093	$NEXT_RUNTIME_WRITE = $NOW + 10;	3545	$NEXT_RUNTIME_WRITE = $NOW + 10;
3094	Coro::async_pool {	3546	Coro::async_pool {
		3547	$Coro::current->{desc} = "runtime saver";
3095	write_runtime	3548	write_runtime
3096	or warn "ERROR: unable to write runtime file: $!";	3549	or warn "ERROR: unable to write runtime file: $!";
3097	};	3550	};
3098	}	3551	}
3099		3552
3100	# my $AFTER = Event::time;
3101	# warn $AFTER - $NOW;#d#
3102
3103	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3553	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3104	$sig->send;	3554	$sig->send;
3105	}	3555	}
3106	while (my $sig = shift @WAIT_FOR_TICK) {	3556	while (my $sig = shift @WAIT_FOR_TICK) {
3107	$sig->send;	3557	$sig->send;
…		…
3117		3567
3118	$LOAD = ($NOW - $tick_start) / $TICK;	3568	$LOAD = ($NOW - $tick_start) / $TICK;
3119	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3569	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3120		3570
3121	_post_tick;	3571	_post_tick;
3122
3123
3124	},	3572	},
3125	);	3573	);
3126		3574
3127	{	3575	{
		3576	BDB::min_parallel 8;
3128	BDB::max_poll_time $TICK * 0.1;	3577	BDB::max_poll_time $TICK * 0.1;
3129	$BDB_POLL_WATCHER = Event->io (	3578	$BDB_POLL_WATCHER = Event->io (
3130	reentrant => 0,	3579	reentrant => 0,
3131	fd => BDB::poll_fileno,	3580	fd => BDB::poll_fileno,
3132	poll => 'r',	3581	poll => 'r',
3133	prio => 0,	3582	prio => 0,
3134	data => WF_AUTOCANCEL,	3583	data => WF_AUTOCANCEL,
3135	cb => \&BDB::poll_cb,	3584	cb => \&BDB::poll_cb,
3136	);	3585	);
3137	BDB::min_parallel 8;
3138		3586
3139	BDB::set_sync_prepare {	3587	BDB::set_sync_prepare {
3140	my $status;	3588	my $status;
3141	my $current = $Coro::current;	3589	my $current = $Coro::current;
3142	(	3590	(
…		…
3151	)	3599	)
3152	};	3600	};
3153		3601
3154	unless ($DB_ENV) {	3602	unless ($DB_ENV) {
3155	$DB_ENV = BDB::db_env_create;	3603	$DB_ENV = BDB::db_env_create;
		3604	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3605	| BDB::LOG_AUTOREMOVE, 1);
		3606	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3607	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3156		3608
3157	cf::sync_job {	3609	cf::sync_job {
3158	eval {	3610	eval {
3159	BDB::db_env_open	3611	BDB::db_env_open
3160	$DB_ENV,	3612	$DB_ENV,
…		…
3162	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3614	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3163	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3615	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3164	0666;	3616	0666;
3165		3617
3166	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3618	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	};	3619	};
3171		3620
3172	cf::cleanup "db_env_open(db): $@" if $@;	3621	cf::cleanup "db_env_open(db): $@" if $@;
3173	};	3622	};
3174	}	3623	}
		3624
		3625	$BDB_DEADLOCK_WATCHER = Event->timer (
		3626	after => 3,
		3627	interval => 1,
		3628	hard => 1,
		3629	prio => 0,
		3630	data => WF_AUTOCANCEL,
		3631	cb => sub {
		3632	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3633	},
		3634	);
		3635	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3636	after => 11,
		3637	interval => 60,
		3638	hard => 1,
		3639	prio => 0,
		3640	data => WF_AUTOCANCEL,
		3641	cb => sub {
		3642	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3643	},
		3644	);
		3645	$BDB_TRICKLE_WATCHER = Event->timer (
		3646	after => 5,
		3647	interval => 10,
		3648	hard => 1,
		3649	prio => 0,
		3650	data => WF_AUTOCANCEL,
		3651	cb => sub {
		3652	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3653	},
		3654	);
3175	}	3655	}
3176		3656
3177	{	3657	{
3178	IO::AIO::min_parallel 8;	3658	IO::AIO::min_parallel 8;
3179		3659
…		…
3182	$AIO_POLL_WATCHER = Event->io (	3662	$AIO_POLL_WATCHER = Event->io (
3183	reentrant => 0,	3663	reentrant => 0,
3184	data => WF_AUTOCANCEL,	3664	data => WF_AUTOCANCEL,
3185	fd => IO::AIO::poll_fileno,	3665	fd => IO::AIO::poll_fileno,
3186	poll => 'r',	3666	poll => 'r',
3187	prio => 6,	3667	prio => 0,
3188	cb => \&IO::AIO::poll_cb,	3668	cb => \&IO::AIO::poll_cb,
3189	);	3669	);
3190	}	3670	}
3191		3671
3192	my $_log_backtrace;	3672	my $_log_backtrace;
…		…
3198		3678
3199	# limit the # of concurrent backtraces	3679	# limit the # of concurrent backtraces
3200	if ($_log_backtrace < 2) {	3680	if ($_log_backtrace < 2) {
3201	++$_log_backtrace;	3681	++$_log_backtrace;
3202	async {	3682	async {
		3683	$Coro::current->{desc} = "abt $msg";
		3684
3203	my @bt = fork_call {	3685	my @bt = fork_call {
3204	@addr = map { sprintf "%x", $_ } @addr;	3686	@addr = map { sprintf "%x", $_ } @addr;
3205	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3687	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3206	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	3688	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3207	or die "addr2line: $!";	3689	or die "addr2line: $!";

Diff Legend

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