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.294 by root, Tue Jul 3 06:00:48 2007 UTC vs.
Revision 1.391 by root, Fri Oct 26 04:22:05 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
25	use JSON::XS 1.4 ();	26	use JSON::XS ();
26	use BDB ();	27	use BDB ();
27	use Data::Dumper;	28	use Data::Dumper;
28	use Digest::MD5;	29	use Digest::MD5;
29	use Fcntl;	30	use Fcntl;
30	use YAML::Syck ();	31	use YAML::Syck ();
31	use IO::AIO 2.32 ();	32	use IO::AIO 2.51 ();
32	use Time::HiRes;	33	use Time::HiRes;
33	use Compress::LZF;	34	use Compress::LZF;
		35	use Digest::MD5 ();
34		36
35	# configure various modules to our taste	37	# configure various modules to our taste
36	#	38	#
37	$Storable::canonical = 1; # reduce rsync transfers	39	$Storable::canonical = 1; # reduce rsync transfers
38	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
…		…
78	our $NEXT_TICK;	80	our $NEXT_TICK;
79	our $NOW;	81	our $NOW;
80	our $USE_FSYNC = 1; # use fsync to write maps - default off	82	our $USE_FSYNC = 1; # use fsync to write maps - default off
81		83
82	our $BDB_POLL_WATCHER;	84	our $BDB_POLL_WATCHER;
		85	our $BDB_DEADLOCK_WATCHER;
		86	our $BDB_CHECKPOINT_WATCHER;
		87	our $BDB_TRICKLE_WATCHER;
83	our $DB_ENV;	88	our $DB_ENV;
84		89
85	our %CFG;	90	our %CFG;
86		91
87	our $UPTIME; $UPTIME ||= time;	92	our $UPTIME; $UPTIME ||= time;
88	our $RUNTIME;	93	our $RUNTIME;
89		94
90	our %PLAYER; # all users	95	our (%PLAYER, %PLAYER_LOADING); # all users
91	our %MAP; # all maps	96	our (%MAP, %MAP_LOADING ); # all maps
92	our $LINK_MAP; # the special {link} map, which is always available	97	our $LINK_MAP; # the special {link} map, which is always available
93		98
94	# 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 ∕
95	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	100	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96		101
…		…
166		171
167	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
168	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
169	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.
170		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
171	=back	182	=back
172		183
173	=cut	184	=cut
174		185
175	BEGIN {	186	BEGIN {
…		…
179	$msg .= "\n"	190	$msg .= "\n"
180	unless $msg =~ /\n$/;	191	unless $msg =~ /\n$/;
181		192
182	$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;
183		194
184	utf8::encode $msg;
185	LOG llevError, $msg;	195	LOG llevError, $msg;
186	};	196	};
187	}	197	}
188		198
189	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	199	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
264	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
265	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,
266	for example when the coroutine gets canceled), the lock is automatically	276	for example when the coroutine gets canceled), the lock is automatically
267	returned.	277	returned.
268		278
		279	Locks are *not* recursive, locking from the same coro twice results in a
		280	deadlocked coro.
		281
269	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
270	uses map_find and cf::map::load uses map_load).	283	uses map_find and cf::map::load uses map_load).
271		284
272	=item $locked = cf::lock_active $string	285	=item $locked = cf::lock_active $string
273		286
274	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.
275		288
276	=cut	289	=cut
277		290
278	our %LOCK;	291	our %LOCK;
		292	our %LOCKER;#d#
279		293
280	sub lock_wait($) {	294	sub lock_wait($) {
281	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#
282		301
283	# wait for lock, if any	302	# wait for lock, if any
284	while ($LOCK{$key}) {	303	while ($LOCK{$key}) {
285	push @{ $LOCK{$key} }, $Coro::current;	304	push @{ $LOCK{$key} }, $Coro::current;
286	Coro::schedule;	305	Coro::schedule;
…		…
292		311
293	# wait, to be sure we are not locked	312	# wait, to be sure we are not locked
294	lock_wait $key;	313	lock_wait $key;
295		314
296	$LOCK{$key} = [];	315	$LOCK{$key} = [];
		316	$LOCKER{$key} = $Coro::current;#d#
297		317
298	Coro::guard {	318	Coro::guard {
		319	delete $LOCKER{$key};#d#
299	# wake up all waiters, to be on the safe side	320	# wake up all waiters, to be on the safe side
300	$_->ready for @{ delete $LOCK{$key} };	321	$_->ready for @{ delete $LOCK{$key} };
301	}	322	}
302	}	323	}
303		324
…		…
315	};	336	};
316	$TICK_WATCHER->stop;	337	$TICK_WATCHER->stop;
317	$guard	338	$guard
318	}	339	}
319		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
320	=item cf::async { BLOCK }	399	=item cf::async { BLOCK }
321		400
322	Currently the same as Coro::async_pool, meaning you cannot use	401	Currently the same as Coro::async_pool, meaning you cannot use
323	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
324	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.
…		…
348	my $time = Event::time;	427	my $time = Event::time;
349		428
350	# this is the main coro, too bad, we have to block	429	# this is the main coro, too bad, we have to block
351	# till the operation succeeds, freezing the server :/	430	# till the operation succeeds, freezing the server :/
352		431
		432	LOG llevError, Carp::longmess "sync job";#d#
		433
353	# TODO: use suspend/resume instead	434	# TODO: use suspend/resume instead
354	# (but this is cancel-safe)	435	# (but this is cancel-safe)
355	my $freeze_guard = freeze_mainloop;	436	my $freeze_guard = freeze_mainloop;
356		437
357	my $busy = 1;	438	my $busy = 1;
358	my @res;	439	my @res;
359		440
360	(async {	441	(async {
		442	$Coro::current->desc ("sync job coro");
361	@res = eval { $job->() };	443	@res = eval { $job->() };
362	warn $@ if $@;	444	warn $@ if $@;
363	undef $busy;	445	undef $busy;
364	})->prio (Coro::PRIO_MAX);	446	})->prio (Coro::PRIO_MAX);
365		447
366	while ($busy) {	448	while ($busy) {
		449	if (Coro::nready) {
		450	Coro::cede_notself;
		451	} else {
367	Coro::cede or Event::one_event;	452	Event::one_event;
		453	}
368	}	454	}
369		455
370	$time = Event::time - $time;	456	$time = Event::time - $time;
371		457
372	LOG llevError | logBacktrace, Carp::longmess "long sync job"	458	LOG llevError | logBacktrace, Carp::longmess "long sync job"
…		…
412	=cut	498	=cut
413		499
414	sub fork_call(&@) {	500	sub fork_call(&@) {
415	my ($cb, @args) = @_;	501	my ($cb, @args) = @_;
416		502
417	# 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,
418	# or die "socketpair: $!";	504	# otherwise perl prematurely frees the stuff :/
419	pipe my $fh1, my $fh2	505	# TODO: investigate and fix (likely this will be rather laborious)
420	or die "pipe: $!";
421		506
422	if (my $pid = fork) {	507	my @res = Coro::Util::fork_eval {
423	close $fh2;
424
425	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426	$res = Coro::Storable::thaw $res;
427
428	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430	die $$res unless "ARRAY" eq ref $res;
431
432	return wantarray ? @$res : $res->[-1];
433	} else {
434	reset_signals;	508	reset_signals;
435	local $SIG{__WARN__};	509	&$cb
436	local $SIG{__DIE__};	510	}, @args;
437	eval {
438	close $fh1;
439		511
440	my @res = eval { $cb->(@args) };	512	wantarray ? @res : $res[-1]
441	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442	};
443
444	warn $@ if $@;
445	_exit 0;
446	}
447	}	513	}
448		514
449	=item $value = cf::db_get $family => $key	515	=item $value = cf::db_get $family => $key
450		516
451	Returns a single value from the environment database.	517	Returns a single value from the environment database.
…		…
453	=item cf::db_put $family => $key => $value	519	=item cf::db_put $family => $key => $value
454		520
455	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
456	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).
457		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
458	=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	}
459		547
460	our $DB;	548	our $DB;
461		549
462	sub db_init {	550	sub db_init {
463	unless ($DB) {
464	$DB = BDB::db_create $DB_ENV;
465
466	cf::sync_job {	551	cf::sync_job {
467	eval {	552	$DB ||= db_table "db";
468	$DB->set_flags (BDB::CHKSUM);
469
470	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472	cf::cleanup "db_open(db): $!" if $!;
473	};
474	cf::cleanup "db_open(db): $@" if $@;
475	};
476	}	553	};
477	}	554	}
478		555
479	sub db_get($$) {	556	sub db_get($$) {
480	my $key = "$_[0]/$_[1]";	557	my $key = "$_[0]/$_[1]";
481		558
…		…
531	if (1) {	608	if (1) {
532	$md5 =	609	$md5 =
533	join "\x00",	610	join "\x00",
534	$processversion,	611	$processversion,
535	map {	612	map {
536	Coro::cede;	613	cf::cede_to_tick;
537	($src->[$_], Digest::MD5::md5_hex $data[$_])	614	($src->[$_], Digest::MD5::md5_hex $data[$_])
538	} 0.. $#$src;	615	} 0.. $#$src;
539		616
540		617
541	my $dbmd5 = db_get cache => "$id/md5";	618	my $dbmd5 = db_get cache => "$id/md5";
…		…
847	";	924	";
848	die if $@;	925	die if $@;
849	}	926	}
850		927
851	our $override;	928	our $override;
852	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?
853		930
854	sub override {	931	sub override {
855	$override = 1;	932	$override = 1;
856	@invoke_results = ();	933	@INVOKE_RESULTS = (@_);
857	}	934	}
858		935
859	sub do_invoke {	936	sub do_invoke {
860	my $event = shift;	937	my $event = shift;
861	my $callbacks = shift;	938	my $callbacks = shift;
862		939
863	@invoke_results = ();	940	@INVOKE_RESULTS = ();
864		941
865	local $override;	942	local $override;
866		943
867	for (@$callbacks) {	944	for (@$callbacks) {
868	eval { &{$_->[1]} };	945	eval { &{$_->[1]} };
…		…
885		962
886	Generate an object-specific event with the given arguments.	963	Generate an object-specific event with the given arguments.
887		964
888	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
889	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
890	results (if you must, access C<@cf::invoke_results> directly).	967	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891		968
892	=back	969	=back
893		970
894	=cut	971	=cut
895		972
896	#############################################################################	973	#############################################################################
897	# 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	}
898		1017
899	sub reattach {	1018	sub reattach {
900	# basically do the same as instantiate, without calling instantiate	1019	# basically do the same as instantiate, without calling instantiate
901	my ($obj) = @_;	1020	my ($obj) = @_;
902		1021
…		…
949	sub object_freezer_save {	1068	sub object_freezer_save {
950	my ($filename, $rdata, $objs) = @_;	1069	my ($filename, $rdata, $objs) = @_;
951		1070
952	sync_job {	1071	sync_job {
953	if (length $$rdata) {	1072	if (length $$rdata) {
		1073	utf8::decode (my $decname = $filename);
954	warn sprintf "saving %s (%d,%d)\n",	1074	warn sprintf "saving %s (%d,%d)\n",
955	$filename, length $$rdata, scalar @$objs;	1075	$decname, length $$rdata, scalar @$objs;
956		1076
957	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1077	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
958	chmod SAVE_MODE, $fh;	1078	chmod SAVE_MODE, $fh;
959	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1079	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960	aio_fsync $fh if $cf::USE_FSYNC;	1080	aio_fsync $fh if $cf::USE_FSYNC;
961	close $fh;	1081	close $fh;
962		1082
963	if (@$objs) {	1083	if (@$objs) {
964	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) {
965	chmod SAVE_MODE, $fh;	1085	chmod SAVE_MODE, $fh;
966	my $data = Storable::nfreeze { version => 1, objs => $objs };	1086	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
967	aio_write $fh, 0, (length $data), $data, 0;	1087	aio_write $fh, 0, (length $data), $data, 0;
968	aio_fsync $fh if $cf::USE_FSYNC;	1088	aio_fsync $fh if $cf::USE_FSYNC;
969	close $fh;	1089	close $fh;
970	aio_rename "$filename.pst~", "$filename.pst";	1090	aio_rename "$filename.pst~", "$filename.pst";
971	}	1091	}
…		…
979	}	1099	}
980	} else {	1100	} else {
981	aio_unlink $filename;	1101	aio_unlink $filename;
982	aio_unlink "$filename.pst";	1102	aio_unlink "$filename.pst";
983	}	1103	}
984	}	1104	};
985	}	1105	}
986		1106
987	sub object_freezer_as_string {	1107	sub object_freezer_as_string {
988	my ($rdata, $objs) = @_;	1108	my ($rdata, $objs) = @_;
989		1109
…		…
1001	or return;	1121	or return;
1002		1122
1003	unless (aio_stat "$filename.pst") {	1123	unless (aio_stat "$filename.pst") {
1004	(aio_load "$filename.pst", $av) >= 0	1124	(aio_load "$filename.pst", $av) >= 0
1005	or return;	1125	or return;
		1126
1006	$av = eval { (Storable::thaw $av)->{objs} };	1127	my $st = eval { Coro::Storable::thaw $av };
		1128	$av = $st->{objs};
1007	}	1129	}
1008		1130
		1131	utf8::decode (my $decname = $filename);
1009	warn sprintf "loading %s (%d)\n",	1132	warn sprintf "loading %s (%d,%d)\n",
1010	$filename, length $data, scalar @{$av || []};	1133	$decname, length $data, scalar @{$av || []};
		1134
1011	return ($data, $av);	1135	($data, $av)
1012	}	1136	}
1013		1137
1014	=head2 COMMAND CALLBACKS	1138	=head2 COMMAND CALLBACKS
1015		1139
1016	=over 4	1140	=over 4
…		…
1089	my ($pl, $buf) = @_;	1213	my ($pl, $buf) = @_;
1090		1214
1091	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1215	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092		1216
1093	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
1094	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1225	if (my $cb = $EXTCMD{$type}) {
1095	if (my %reply = $cb->($pl, $msg)) {	1226	@reply = $cb->($pl, @payload);
1096	$pl->ext_reply ($msg->{msgid}, %reply);
1097	}
1098	}	1227	}
		1228
		1229	$pl->ext_reply ($reply, @reply)
		1230	if $reply;
		1231
1099	} else {	1232	} else {
1100	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1233	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101	}	1234	}
1102		1235
1103	cf::override;	1236	cf::override;
…		…
1193		1326
1194	=head3 cf::player	1327	=head3 cf::player
1195		1328
1196	=over 4	1329	=over 4
1197		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
1198	=item cf::player::find $login	1345	=item cf::player::find $login
1199		1346
1200	Returns the given player object, loading it if necessary (might block).	1347	Returns the given player object, loading it if necessary (might block).
1201		1348
1202	=cut	1349	=cut
…		…
1237	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1384	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1385	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1386	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240	aio_unlink +(playerdir $login) . "/$login.pl";	1387	aio_unlink +(playerdir $login) . "/$login.pl";
1241		1388
1242	my $pl = load_pl path $login	1389	my $f = new_from_file cf::object::thawer path $login
1243	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;
1244	$cf::PLAYER{$login} = $pl	1396	$cf::PLAYER{$login} = $pl
1245	}	1397	}
1246	}	1398	}
1247	}	1399	}
1248		1400
…		…
1258		1410
1259	aio_mkdir playerdir $pl, 0770;	1411	aio_mkdir playerdir $pl, 0770;
1260	$pl->{last_save} = $cf::RUNTIME;	1412	$pl->{last_save} = $cf::RUNTIME;
1261		1413
1262	$pl->save_pl ($path);	1414	$pl->save_pl ($path);
1263	Coro::cede;	1415	cf::cede_to_tick;
1264	}	1416	}
1265		1417
1266	sub new($) {	1418	sub new($) {
1267	my ($login) = @_;	1419	my ($login) = @_;
1268		1420
…		…
1272	$self->{deny_save} = 1;	1424	$self->{deny_save} = 1;
1273		1425
1274	$cf::PLAYER{$login} = $self;	1426	$cf::PLAYER{$login} = $self;
1275		1427
1276	$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 (@_);
1277	}	1439	}
1278		1440
1279	=item $pl->quit_character	1441	=item $pl->quit_character
1280		1442
1281	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
…		…
1336	or return [];	1498	or return [];
1337		1499
1338	my @logins;	1500	my @logins;
1339		1501
1340	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") {
1341	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1507	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342	aio_read $fh, 0, 512, my $buf, 0 or next;	1508	aio_read $fh, 0, 512, my $buf, 0 or next;
1343	$buf !~ /^password -------------$/m or next; # official not-valid tag	1509	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1510	}
1344		1511
1345	utf8::decode $login;	1512	utf8::decode $login;
1346	push @logins, $login;	1513	push @logins, $login;
1347	}	1514	}
1348		1515
…		…
1381		1548
1382	Expand crossfire pod fragments into protocol xml.	1549	Expand crossfire pod fragments into protocol xml.
1383		1550
1384	=cut	1551	=cut
1385		1552
		1553	use re 'eval';
		1554
		1555	my $group;
		1556	my $interior; $interior = qr{
		1557	(?:
		1558	\ (.*?)\ (?{ $group = $^N })
		1559	| < (??{$interior}) >
		1560	)
		1561	}x;
		1562
1386	sub expand_cfpod {	1563	sub expand_cfpod {
1387	((my $self), (local $_)) = @_;	1564	my ($self, $pod) = @_;
1388		1565
1389	# escape & and <	1566	my $xml;
1390	s/&/&amp;/g;
1391	s/(?<![BIUGH])</&lt;/g;
1392		1567
1393	# this is buggy, it needs to properly take care of nested <'s	1568	while () {
		1569	if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?=[^<]) )+ )/xgcs) {
		1570	$group = $1;
1394		1571
1395	1 while	1572	$group =~ s/&/&amp;/g;
1396	# replace B<>, I<>, U<> etc.	1573	$group =~ s/</&lt;/g;
1397	s/B<([^\>]*)>/<b>$1<\/b>/	1574
1398	|| s/I<([^\>]*)>/<i>$1<\/i>/	1575	$xml .= $group;
1399	|| s/U<([^\>]*)>/<u>$1<\/u>/	1576	} elsif ($pod =~ m%\G
1400	# replace G<male|female> tags	1577	([BCGHITU])
1401	|| s{G<([^>|]*)\|([^>]*)>}{	1578	<
1402	$self->gender ? $2 : $1	1579	(?:
1403	}ge	1580	([^<>]*) (?{ $group = $^N })
1404	# replace H<hint text>	1581	| < $interior >
1405	|| s{H<([^\>]*)>}	1582	)
		1583	>
		1584	%gcsx
1406	{	1585	) {
		1586	my ($code, $data) = ($1, $group);
		1587
		1588	if ($code eq "B") {
		1589	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
		1590	} elsif ($code eq "I") {
		1591	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
		1592	} elsif ($code eq "U") {
		1593	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
		1594	} elsif ($code eq "C") {
		1595	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
		1596	} elsif ($code eq "T") {
		1597	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
		1598	} elsif ($code eq "G") {
		1599	my ($male, $female) = split /\|/, $data;
		1600	$data = $self->gender ? $female : $male;
		1601	$xml .= expand_cfpod ($self, $data);
		1602	} elsif ($code eq "H") {
1407	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",	1603	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1408	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",	1604	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1409	"")	1605	"")
1410	[$self->{hintmode}]	1606	[$self->{hintmode}];
		1607	} else {
		1608	$xml .= "error processing '$code($data)' directive";
1411	}ge;	1609	}
		1610	} else {
		1611	if ($pod =~ /\G(.+)/) {
		1612	warn "parse error while expanding $pod (at $1)";
		1613	}
		1614	last;
		1615	}
		1616	}
1412		1617
		1618	for ($xml) {
1413	# create single paragraphs (very hackish)	1619	# create single paragraphs (very hackish)
1414	s/(?<=\S)\n(?=\w)/ /g;	1620	s/(?<=\S)\n(?=\w)/ /g;
1415		1621
1416	# compress some whitespace	1622	# compress some whitespace
1417	1 while s/\s*\n\s*\n\s*/\n/;	1623	s/\s+\n/\n/g; # ws line-ends
		1624	s/\n\n+/\n/g; # double lines
		1625	s/^\n+//; # beginning lines
		1626	s/\n+$//; # ending lines
		1627	}
1418		1628
1419	s/^\s+//;	1629	$xml
1420	s/\s+$//;
1421
1422	$_
1423	}	1630	}
1424		1631
1425	sub hintmode {	1632	sub hintmode {
1426	$_[0]{hintmode} = $_[1] if @_ > 1;	1633	$_[0]{hintmode} = $_[1] if @_ > 1;
1427	$_[0]{hintmode}	1634	$_[0]{hintmode}
1428	}	1635	}
1429		1636
1430	=item $player->ext_reply ($msgid, %msg)	1637	=item $player->ext_reply ($msgid, @msg)
1431		1638
1432	Sends an ext reply to the player.	1639	Sends an ext reply to the player.
1433		1640
1434	=cut	1641	=cut
1435		1642
1436	sub ext_reply($$%) {	1643	sub ext_reply($$@) {
1437	my ($self, $id, %msg) = @_;	1644	my ($self, $id, @msg) = @_;
1438		1645
1439	$msg{msgid} = $id;	1646	$self->ns->ext_reply ($id, @msg)
1440	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1441	}	1647	}
1442		1648
1443	=item $player->ext_event ($type, %msg)	1649	=item $player->ext_msg ($type, @msg)
1444		1650
1445	Sends an ext event to the client.	1651	Sends an ext event to the client.
1446		1652
1447	=cut	1653	=cut
1448		1654
1449	sub ext_event($$%) {	1655	sub ext_msg($$@) {
1450	my ($self, $type, %msg) = @_;	1656	my ($self, $type, @msg) = @_;
1451		1657
1452	$self->ns->ext_event ($type, %msg);	1658	$self->ns->ext_msg ($type, @msg);
1453	}	1659	}
1454		1660
1455	=head3 cf::region	1661	=head3 cf::region
1456		1662
1457	=over 4	1663	=over 4
…		…
1470	my ($path) = @_;	1676	my ($path) = @_;
1471		1677
1472	my ($match, $specificity);	1678	my ($match, $specificity);
1473		1679
1474	for my $region (list) {	1680	for my $region (list) {
1475	if ($region->match && $path =~ $region->match) {	1681	if ($region->{match} && $path =~ $region->{match}) {
1476	($match, $specificity) = ($region, $region->specificity)	1682	($match, $specificity) = ($region, $region->specificity)
1477	if $region->specificity > $specificity;	1683	if $region->specificity > $specificity;
1478	}	1684	}
1479	}	1685	}
1480		1686
…		…
1600	$self->init; # pass $1 etc.	1806	$self->init; # pass $1 etc.
1601	return $self;	1807	return $self;
1602	}	1808	}
1603	}	1809	}
1604		1810
1605	Carp::carp "unable to resolve path '$path' (base '$base').";	1811	Carp::cluck "unable to resolve path '$path' (base '$base').";
1606	()	1812	()
1607	}	1813	}
1608		1814
1609	sub init {	1815	sub init {
1610	my ($self) = @_;	1816	my ($self) = @_;
…		…
1673		1879
1674	sub load_header_from($) {	1880	sub load_header_from($) {
1675	my ($self, $path) = @_;	1881	my ($self, $path) = @_;
1676		1882
1677	utf8::encode $path;	1883	utf8::encode $path;
1678	#aio_open $path, O_RDONLY, 0	1884	my $f = new_from_file cf::object::thawer $path
1679	# or return;
1680
1681	$self->_load_header ($path)
1682	or return;	1885	or return;
		1886
		1887	$self->_load_header ($f)
		1888	or return;
		1889
		1890	local $MAP_LOADING{$self->{path}} = $self;
		1891	$f->resolve_delayed_derefs;
1683		1892
1684	$self->{load_path} = $path;	1893	$self->{load_path} = $path;
1685		1894
1686	1	1895	1
1687	}	1896	}
…		…
1741	sub find {	1950	sub find {
1742	my ($path, $origin) = @_;	1951	my ($path, $origin) = @_;
1743		1952
1744	$path = normalise $path, $origin && $origin->path;	1953	$path = normalise $path, $origin && $origin->path;
1745		1954
		1955	cf::lock_wait "map_data:$path";#d#remove
1746	cf::lock_wait "map_find:$path";	1956	cf::lock_wait "map_find:$path";
1747		1957
1748	$cf::MAP{$path} || do {	1958	$cf::MAP{$path} || do {
1749	my $guard = cf::lock_acquire "map_find:$path";	1959	my $guard1 = cf::lock_acquire "map_find:$path";
		1960	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1961
1750	my $map = new_from_path cf::map $path	1962	my $map = new_from_path cf::map $path
1751	or return;	1963	or return;
1752		1964
1753	$map->{last_save} = $cf::RUNTIME;	1965	$map->{last_save} = $cf::RUNTIME;
1754		1966
…		…
1756	or return;	1968	or return;
1757		1969
1758	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1970	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1759	# doing this can freeze the server in a sync job, obviously	1971	# doing this can freeze the server in a sync job, obviously
1760	#$cf::WAIT_FOR_TICK->wait;	1972	#$cf::WAIT_FOR_TICK->wait;
		1973	undef $guard1;
		1974	undef $guard2;
1761	$map->reset;	1975	$map->reset;
1762	undef $guard;
1763	return find $path;	1976	return find $path;
1764	}	1977	}
1765		1978
1766	$cf::MAP{$path} = $map	1979	$cf::MAP{$path} = $map
1767	}	1980	}
…		…
1776	local $self->{deny_reset} = 1; # loading can take a long time	1989	local $self->{deny_reset} = 1; # loading can take a long time
1777		1990
1778	my $path = $self->{path};	1991	my $path = $self->{path};
1779		1992
1780	{	1993	{
1781	my $guard = cf::lock_acquire "map_load:$path";	1994	my $guard = cf::lock_acquire "map_data:$path";
1782		1995
		1996	return unless $self->valid;
1783	return if $self->in_memory != cf::MAP_SWAPPED;	1997	return unless $self->in_memory == cf::MAP_SWAPPED;
1784		1998
1785	$self->in_memory (cf::MAP_LOADING);	1999	$self->in_memory (cf::MAP_LOADING);
1786		2000
1787	$self->alloc;	2001	$self->alloc;
1788		2002
1789	$self->pre_load;	2003	$self->pre_load;
1790	Coro::cede;	2004	cf::cede_to_tick;
1791		2005
		2006	my $f = new_from_file cf::object::thawer $self->{load_path};
		2007	$f->skip_block;
1792	$self->_load_objects ($self->{load_path}, 1)	2008	$self->_load_objects ($f)
1793	or return;	2009	or return;
1794		2010
1795	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2011	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1796	if delete $self->{load_original};	2012	if delete $self->{load_original};
1797		2013
1798	if (my $uniq = $self->uniq_path) {	2014	if (my $uniq = $self->uniq_path) {
1799	utf8::encode $uniq;	2015	utf8::encode $uniq;
1800	if (aio_open $uniq, O_RDONLY, 0) {	2016	unless (aio_stat $uniq) {
		2017	if (my $f = new_from_file cf::object::thawer $uniq) {
1801	$self->clear_unique_items;	2018	$self->clear_unique_items;
1802	$self->_load_objects ($uniq, 0);	2019	$self->_load_objects ($f);
		2020	$f->resolve_delayed_derefs;
		2021	}
1803	}	2022	}
1804	}	2023	}
1805		2024
1806	Coro::cede;	2025	$f->resolve_delayed_derefs;
		2026
		2027	cf::cede_to_tick;
1807	# now do the right thing for maps	2028	# now do the right thing for maps
1808	$self->link_multipart_objects;	2029	$self->link_multipart_objects;
1809	$self->difficulty ($self->estimate_difficulty)	2030	$self->difficulty ($self->estimate_difficulty)
1810	unless $self->difficulty;	2031	unless $self->difficulty;
1811	Coro::cede;	2032	cf::cede_to_tick;
1812		2033
1813	unless ($self->{deny_activate}) {	2034	unless ($self->{deny_activate}) {
1814	$self->decay_objects;	2035	$self->decay_objects;
1815	$self->fix_auto_apply;	2036	$self->fix_auto_apply;
1816	$self->update_buttons;	2037	$self->update_buttons;
1817	Coro::cede;	2038	cf::cede_to_tick;
1818	$self->set_darkness_map;	2039	$self->set_darkness_map;
1819	Coro::cede;	2040	cf::cede_to_tick;
1820	$self->activate;	2041	$self->activate;
1821	}	2042	}
		2043
		2044	$self->{last_save} = $cf::RUNTIME;
		2045	$self->last_access ($cf::RUNTIME);
1822		2046
1823	$self->in_memory (cf::MAP_IN_MEMORY);	2047	$self->in_memory (cf::MAP_IN_MEMORY);
1824	}	2048	}
1825		2049
1826	$self->post_load;	2050	$self->post_load;
…		…
1837		2061
1838	$self	2062	$self
1839	}	2063	}
1840		2064
1841	# find and load all maps in the 3x3 area around a map	2065	# find and load all maps in the 3x3 area around a map
1842	sub load_diag {	2066	sub load_neighbours {
1843	my ($map) = @_;	2067	my ($map) = @_;
1844		2068
1845	my @diag; # diagonal neighbours	2069	my @neigh; # diagonal neighbours
1846		2070
1847	for (0 .. 3) {	2071	for (0 .. 3) {
1848	my $neigh = $map->tile_path ($_)	2072	my $neigh = $map->tile_path ($_)
1849	or next;	2073	or next;
1850	$neigh = find $neigh, $map	2074	$neigh = find $neigh, $map
1851	or next;	2075	or next;
1852	$neigh->load;	2076	$neigh->load;
1853		2077
		2078	push @neigh,
1854	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2079	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1855	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2080	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1856	}	2081	}
1857		2082
1858	for (@diag) {	2083	for (grep defined $_->[0], @neigh) {
		2084	my ($path, $origin) = @$_;
1859	my $neigh = find @$_	2085	my $neigh = find $path, $origin
1860	or next;	2086	or next;
1861	$neigh->load;	2087	$neigh->load;
1862	}	2088	}
1863	}	2089	}
1864		2090
…		…
1869	}	2095	}
1870		2096
1871	sub do_load_sync {	2097	sub do_load_sync {
1872	my ($map) = @_;	2098	my ($map) = @_;
1873		2099
		2100	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2101	if $Coro::current == $Coro::main;
		2102
1874	cf::sync_job { $map->load };	2103	cf::sync_job { $map->load };
1875	}	2104	}
1876		2105
1877	our %MAP_PREFETCH;	2106	our %MAP_PREFETCH;
1878	our $MAP_PREFETCHER = undef;	2107	our $MAP_PREFETCHER = undef;
1879		2108
1880	sub find_async {	2109	sub find_async {
1881	my ($path, $origin) = @_;	2110	my ($path, $origin, $load) = @_;
1882		2111
1883	$path = normalise $path, $origin && $origin->{path};	2112	$path = normalise $path, $origin && $origin->{path};
1884		2113
1885	if (my $map = $cf::MAP{$path}) {	2114	if (my $map = $cf::MAP{$path}) {
1886	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2115	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1887	}	2116	}
1888		2117
1889	undef $MAP_PREFETCH{$path};	2118	$MAP_PREFETCH{$path} |= $load;
		2119
1890	$MAP_PREFETCHER ||= cf::async {	2120	$MAP_PREFETCHER ||= cf::async {
		2121	$Coro::current->{desc} = "map prefetcher";
		2122
1891	while (%MAP_PREFETCH) {	2123	while (%MAP_PREFETCH) {
1892	for my $path (keys %MAP_PREFETCH) {	2124	while (my ($k, $v) = each %MAP_PREFETCH) {
1893	my $map = find $path	2125	if (my $map = find $k) {
1894	or next;
1895	$map->load;	2126	$map->load if $v;
		2127	}
1896		2128
1897	delete $MAP_PREFETCH{$path};	2129	delete $MAP_PREFETCH{$k};
1898	}	2130	}
1899	}	2131	}
1900	undef $MAP_PREFETCHER;	2132	undef $MAP_PREFETCHER;
1901	};	2133	};
1902	$MAP_PREFETCHER->prio (6);	2134	$MAP_PREFETCHER->prio (6);
…		…
1905	}	2137	}
1906		2138
1907	sub save {	2139	sub save {
1908	my ($self) = @_;	2140	my ($self) = @_;
1909		2141
1910	my $lock = cf::lock_acquire "map_data:" . $self->path;	2142	my $lock = cf::lock_acquire "map_data:$self->{path}";
1911		2143
1912	$self->{last_save} = $cf::RUNTIME;	2144	$self->{last_save} = $cf::RUNTIME;
1913		2145
1914	return unless $self->dirty;	2146	return unless $self->dirty;
1915		2147
…		…
1921	return if $self->{deny_save};	2153	return if $self->{deny_save};
1922		2154
1923	local $self->{last_access} = $self->last_access;#d#	2155	local $self->{last_access} = $self->last_access;#d#
1924		2156
1925	cf::async {	2157	cf::async {
		2158	$Coro::current->{desc} = "map player save";
1926	$_->contr->save for $self->players;	2159	$_->contr->save for $self->players;
1927	};	2160	};
1928		2161
1929	if ($uniq) {	2162	if ($uniq) {
1930	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2163	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
1938	my ($self) = @_;	2171	my ($self) = @_;
1939		2172
1940	# save first because save cedes	2173	# save first because save cedes
1941	$self->save;	2174	$self->save;
1942		2175
1943	my $lock = cf::lock_acquire "map_data:" . $self->path;	2176	my $lock = cf::lock_acquire "map_data:$self->{path}";
1944		2177
1945	return if $self->players;	2178	return if $self->players;
1946	return if $self->in_memory != cf::MAP_IN_MEMORY;	2179	return if $self->in_memory != cf::MAP_IN_MEMORY;
1947	return if $self->{deny_save};	2180	return if $self->{deny_save};
1948		2181
		2182	$self->in_memory (cf::MAP_SWAPPED);
		2183
		2184	$self->deactivate;
		2185	$_->clear_links_to ($self) for values %cf::MAP;
1949	$self->clear;	2186	$self->clear;
1950	$self->in_memory (cf::MAP_SWAPPED);
1951	}	2187	}
1952		2188
1953	sub reset_at {	2189	sub reset_at {
1954	my ($self) = @_;	2190	my ($self) = @_;
1955		2191
…		…
1987	if $uniq;	2223	if $uniq;
1988	}	2224	}
1989		2225
1990	delete $cf::MAP{$self->path};	2226	delete $cf::MAP{$self->path};
1991		2227
		2228	$self->deactivate;
		2229	$_->clear_links_to ($self) for values %cf::MAP;
1992	$self->clear;	2230	$self->clear;
1993
1994	$_->clear_links_to ($self) for values %cf::MAP;
1995		2231
1996	$self->unlink_save;	2232	$self->unlink_save;
1997	$self->destroy;	2233	$self->destroy;
1998	}	2234	}
1999		2235
2000	my $nuke_counter = "aaaa";	2236	my $nuke_counter = "aaaa";
2001		2237
2002	sub nuke {	2238	sub nuke {
2003	my ($self) = @_;	2239	my ($self) = @_;
2004		2240
		2241	{
		2242	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2243
2005	delete $cf::MAP{$self->path};	2244	delete $cf::MAP{$self->path};
2006		2245
2007	$self->unlink_save;	2246	$self->unlink_save;
2008		2247
2009	bless $self, "cf::map";	2248	bless $self, "cf::map";
2010	delete $self->{deny_reset};	2249	delete $self->{deny_reset};
2011	$self->{deny_save} = 1;	2250	$self->{deny_save} = 1;
2012	$self->reset_timeout (1);	2251	$self->reset_timeout (1);
2013	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2252	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2014		2253
2015	$cf::MAP{$self->path} = $self;	2254	$cf::MAP{$self->path} = $self;
		2255	}
2016		2256
2017	$self->reset; # polite request, might not happen	2257	$self->reset; # polite request, might not happen
2018	}	2258	}
2019		2259
2020	=item $maps = cf::map::tmp_maps	2260	=item $maps = cf::map::tmp_maps
…		…
2096		2336
2097	sub inv_recursive {	2337	sub inv_recursive {
2098	inv_recursive_ inv $_[0]	2338	inv_recursive_ inv $_[0]
2099	}	2339	}
2100		2340
		2341	=item $ref = $ob->ref
		2342
		2343	creates and returns a persistent reference to an objetc that can be stored as a string.
		2344
		2345	=item $ob = cf::object::deref ($refstring)
		2346
		2347	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2348	even if the object actually exists. May block.
		2349
		2350	=cut
		2351
		2352	sub deref {
		2353	my ($ref) = @_;
		2354
		2355	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2356	my ($uuid, $name) = ($1, $2);
		2357	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2358	or return;
		2359	$pl->ob->uuid eq $uuid
		2360	or return;
		2361
		2362	$pl->ob
		2363	} else {
		2364	warn "$ref: cannot resolve object reference\n";
		2365	undef
		2366	}
		2367	}
		2368
2101	package cf;	2369	package cf;
2102		2370
2103	=back	2371	=back
2104		2372
2105	=head3 cf::object::player	2373	=head3 cf::object::player
…		…
2127		2395
2128	} else {	2396	} else {
2129	my $pl = $self->contr;	2397	my $pl = $self->contr;
2130		2398
2131	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2399	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2132	my $diag = $pl->{npc_dialog};	2400	my $dialog = $pl->{npc_dialog};
2133	$diag->{pl}->ext_reply (	2401	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2134	$diag->{id},
2135	msgtype => "reply",
2136	msg => $diag->{pl}->expand_cfpod ($msg),
2137	add_topics => []
2138	);
2139		2402
2140	} else {	2403	} else {
2141	$msg = $npc->name . " says: $msg" if $npc;	2404	$msg = $npc->name . " says: $msg" if $npc;
2142	$self->message ($msg, $flags);	2405	$self->message ($msg, $flags);
2143	}	2406	}
2144	}	2407	}
		2408	}
		2409
		2410	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2411
		2412	=cut
		2413
		2414	sub cf::object::send_msg {
		2415	my $pl = shift->contr
		2416	or return;
		2417	$pl->send_msg (@_);
2145	}	2418	}
2146		2419
2147	=item $player_object->may ("access")	2420	=item $player_object->may ("access")
2148		2421
2149	Returns wether the given player is authorized to access resource "access"	2422	Returns wether the given player is authorized to access resource "access"
…		…
2228	# use -1 or undef as default coordinates, not 0, 0	2501	# use -1 or undef as default coordinates, not 0, 0
2229	($x, $y) = ($map->enter_x, $map->enter_y)	2502	($x, $y) = ($map->enter_x, $map->enter_y)
2230	if $x <=0 && $y <= 0;	2503	if $x <=0 && $y <= 0;
2231		2504
2232	$map->load;	2505	$map->load;
2233	$map->load_diag;	2506	$map->load_neighbours;
2234		2507
2235	return unless $self->contr->active;	2508	return unless $self->contr->active;
2236	$self->activate_recursive;	2509	$self->activate_recursive;
2237		2510
2238	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2511	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2239	$self->enter_map ($map, $x, $y);	2512	$self->enter_map ($map, $x, $y);
2240	}	2513	}
2241		2514
2242	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2515	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2243		2516
2244	Moves the player to the given map-path and coordinates by first freezing	2517	Moves the player to the given map-path and coordinates by first freezing
2245	her, loading and preparing them map, calling the provided $check callback	2518	her, loading and preparing them map, calling the provided $check callback
2246	that has to return the map if sucecssful, and then unfreezes the player on	2519	that has to return the map if sucecssful, and then unfreezes the player on
2247	the new (success) or old (failed) map position.	2520	the new (success) or old (failed) map position. In either case, $done will
		2521	be called at the end of this process.
2248		2522
2249	=cut	2523	=cut
2250		2524
2251	our $GOTOGEN;	2525	our $GOTOGEN;
2252		2526
2253	sub cf::object::player::goto {	2527	sub cf::object::player::goto {
2254	my ($self, $path, $x, $y, $check) = @_;	2528	my ($self, $path, $x, $y, $check, $done) = @_;
2255		2529
2256	# do generation counting so two concurrent goto's will be executed in-order	2530	# do generation counting so two concurrent goto's will be executed in-order
2257	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2531	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2258		2532
2259	$self->enter_link;	2533	$self->enter_link;
2260		2534
2261	(async {	2535	(async {
		2536	$Coro::current->{desc} = "player::goto $path $x $y";
		2537
		2538	# *tag paths override both path and x|y
		2539	if ($path =~ /^\*(.*)$/) {
		2540	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2541	my $ob = $obs[rand @obs];
		2542
		2543	# see if we actually can go there
		2544	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2545	$ob = $obs[rand @obs];
		2546	} else {
		2547	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2548	}
		2549	# else put us there anyways for now #d#
		2550
		2551	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2552	} else {
		2553	($path, $x, $y) = (undef, undef, undef);
		2554	}
		2555	}
		2556
2262	my $map = eval {	2557	my $map = eval {
2263	my $map = cf::map::find $path;	2558	my $map = defined $path ? cf::map::find $path : undef;
2264		2559
2265	if ($map) {	2560	if ($map) {
2266	$map = $map->customise_for ($self);	2561	$map = $map->customise_for ($self);
2267	$map = $check->($map) if $check && $map;	2562	$map = $check->($map) if $check && $map;
2268	} else {	2563	} else {
2269	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2564	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2270	}	2565	}
2271		2566
2272	$map	2567	$map
2273	};	2568	};
2274		2569
…		…
2279		2574
2280	if ($gen == $self->{_goto_generation}) {	2575	if ($gen == $self->{_goto_generation}) {
2281	delete $self->{_goto_generation};	2576	delete $self->{_goto_generation};
2282	$self->leave_link ($map, $x, $y);	2577	$self->leave_link ($map, $x, $y);
2283	}	2578	}
		2579
		2580	$done->() if $done;
2284	})->prio (1);	2581	})->prio (1);
2285	}	2582	}
2286		2583
2287	=item $player_object->enter_exit ($exit_object)	2584	=item $player_object->enter_exit ($exit_object)
2288		2585
…		…
2357	my $hp = $exit->stats->hp;	2654	my $hp = $exit->stats->hp;
2358	my $sp = $exit->stats->sp;	2655	my $sp = $exit->stats->sp;
2359		2656
2360	$self->enter_link;	2657	$self->enter_link;
2361		2658
		2659	# if exit is damned, update players death & WoR home-position
		2660	$self->contr->savebed ($slaying, $hp, $sp)
		2661	if $exit->flag (FLAG_DAMNED);
		2662
2362	(async {	2663	(async {
		2664	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2665
2363	$self->deactivate_recursive; # just to be sure	2666	$self->deactivate_recursive; # just to be sure
2364	unless (eval {	2667	unless (eval {
2365	$self->goto ($slaying, $hp, $sp);	2668	$self->goto ($slaying, $hp, $sp);
2366		2669
2367	1;	2670	1;
…		…
2393		2696
2394	utf8::encode $text;	2697	utf8::encode $text;
2395	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2698	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2396	}	2699	}
2397		2700
2398	=item $client->send_msg ($color, $type, $msg, [extra...])	2701	=item $client->send_msg ($channel, $msg, $color, [extra...])
2399		2702
2400	Send a drawinfo or msg packet to the client, formatting the msg for the	2703	Send a drawinfo or msg packet to the client, formatting the msg for the
2401	client if neccessary. C<$type> should be a string identifying the type of	2704	client if neccessary. C<$type> should be a string identifying the type of
2402	the message, with C<log> being the default. If C<$color> is negative, suppress	2705	the message, with C<log> being the default. If C<$color> is negative, suppress
2403	the message unless the client supports the msg packet.	2706	the message unless the client supports the msg packet.
2404		2707
2405	=cut	2708	=cut
2406		2709
		2710	# non-persistent channels (usually the info channel)
		2711	our %CHANNEL = (
		2712	"c/identify" => {
		2713	id => "infobox",
		2714	title => "Identify",
		2715	reply => undef,
		2716	tooltip => "Items recently identified",
		2717	},
		2718	"c/examine" => {
		2719	id => "infobox",
		2720	title => "Examine",
		2721	reply => undef,
		2722	tooltip => "Signs and other items you examined",
		2723	},
		2724	"c/book" => {
		2725	id => "infobox",
		2726	title => "Book",
		2727	reply => undef,
		2728	tooltip => "The contents of a note or book",
		2729	},
		2730	"c/lookat" => {
		2731	id => "infobox",
		2732	title => "Look",
		2733	reply => undef,
		2734	tooltip => "What you saw there",
		2735	},
		2736	"c/who" => {
		2737	id => "infobox",
		2738	title => "Players",
		2739	reply => undef,
		2740	tooltip => "Shows players who are currently online",
		2741	},
		2742	"c/body" => {
		2743	id => "infobox",
		2744	title => "Body Parts",
		2745	reply => undef,
		2746	tooltip => "Shows which body parts you posess and are available",
		2747	},
		2748	"c/uptime" => {
		2749	id => "infobox",
		2750	title => "Uptime",
		2751	reply => undef,
		2752	tooltip => "How long the server has been running since last restart",
		2753	},
		2754	"c/mapinfo" => {
		2755	id => "infobox",
		2756	title => "Map Info",
		2757	reply => undef,
		2758	tooltip => "Information related to the maps",
		2759	},
		2760	);
		2761
2407	sub cf::client::send_msg {	2762	sub cf::client::send_msg {
2408	my ($self, $color, $type, $msg, @extra) = @_;	2763	my ($self, $channel, $msg, $color, @extra) = @_;
2409		2764
2410	$msg = $self->pl->expand_cfpod ($msg);	2765	$msg = $self->pl->expand_cfpod ($msg);
2411		2766
		2767	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2768
		2769	# check predefined channels, for the benefit of C
		2770	if ($CHANNEL{$channel}) {
		2771	$channel = $CHANNEL{$channel};
		2772
		2773	$self->ext_msg (channel_info => $channel)
		2774	if $self->can_msg;
		2775
		2776	$channel = $channel->{id};
		2777
		2778	} elsif (ref $channel) {
		2779	# send meta info to client, if not yet sent
		2780	unless (exists $self->{channel}{$channel->{id}}) {
		2781	$self->{channel}{$channel->{id}} = $channel;
		2782	$self->ext_msg (channel_info => $channel)
		2783	if $self->can_msg;
		2784	}
		2785
		2786	$channel = $channel->{id};
		2787	}
		2788
2412	return unless @extra || length $msg;	2789	return unless @extra || length $msg;
2413		2790
2414	if ($self->can_msg) {	2791	if ($self->can_msg) {
		2792	# default colour, mask it out
		2793	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2794	if $color & cf::NDI_DEF;
		2795
2415	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));	2796	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2797	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2416	} else {	2798	} else {
2417	# replace some tags by gcfclient-compatible ones
2418	for ($msg) {
2419	1 while
2420	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2421	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2422	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2423	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2424	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2425	}
2426
2427	if ($color >= 0) {	2799	if ($color >= 0) {
		2800	# replace some tags by gcfclient-compatible ones
		2801	for ($msg) {
		2802	1 while
		2803	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2804	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2805	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2806	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2807	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2808	}
		2809
		2810	$color &= cf::NDI_COLOR_MASK;
		2811
		2812	utf8::encode $msg;
		2813
2428	if (0 && $msg =~ /\[/) {	2814	if (0 && $msg =~ /\[/) {
		2815	# COMMAND/INFO
2429	$self->send_packet ("drawextinfo $color 4 0 $msg")	2816	$self->send_packet ("drawextinfo $color 10 8 $msg")
2430	} else {	2817	} else {
2431	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	2818	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2432	$self->send_packet ("drawinfo $color $msg")	2819	$self->send_packet ("drawinfo $color $msg")
2433	}	2820	}
2434	}	2821	}
2435	}	2822	}
2436	}	2823	}
2437		2824
2438	=item $client->ext_event ($type, %msg)	2825	=item $client->ext_msg ($type, @msg)
2439		2826
2440	Sends an ext event to the client.	2827	Sends an ext event to the client.
2441		2828
2442	=cut	2829	=cut
2443		2830
2444	sub cf::client::ext_event($$%) {	2831	sub cf::client::ext_msg($$@) {
2445	my ($self, $type, %msg) = @_;	2832	my ($self, $type, @msg) = @_;
2446		2833
		2834	if ($self->extcmd == 2) {
		2835	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2836	} elsif ($self->extcmd == 1) { # TODO: remove
2447	$msg{msgtype} = "event_$type";	2837	push @msg, msgtype => "event_$type";
2448	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2838	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2839	}
		2840	}
		2841
		2842	=item $client->ext_reply ($msgid, @msg)
		2843
		2844	Sends an ext reply to the client.
		2845
		2846	=cut
		2847
		2848	sub cf::client::ext_reply($$@) {
		2849	my ($self, $id, @msg) = @_;
		2850
		2851	if ($self->extcmd == 2) {
		2852	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2853	} elsif ($self->extcmd == 1) {
		2854	#TODO: version 1, remove
		2855	unshift @msg, msgtype => "reply", msgid => $id;
		2856	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2857	}
2449	}	2858	}
2450		2859
2451	=item $success = $client->query ($flags, "text", \&cb)	2860	=item $success = $client->query ($flags, "text", \&cb)
2452		2861
2453	Queues a query to the client, calling the given callback with	2862	Queues a query to the client, calling the given callback with
…		…
2508	my ($ns, $buf) = @_;	2917	my ($ns, $buf) = @_;
2509		2918
2510	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2919	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2511		2920
2512	if (ref $msg) {	2921	if (ref $msg) {
		2922	my ($type, $reply, @payload) =
		2923	"ARRAY" eq ref $msg
		2924	? @$msg
		2925	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2926
		2927	my @reply;
		2928
2513	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2929	if (my $cb = $EXTICMD{$type}) {
2514	if (my %reply = $cb->($ns, $msg)) {	2930	@reply = $cb->($ns, @payload);
2515	$reply{msgid} = $msg->{msgid};
2516	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2517	}
2518	}	2931	}
		2932
		2933	$ns->ext_reply ($reply, @reply)
		2934	if $reply;
		2935
2519	} else {	2936	} else {
2520	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2937	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2521	}	2938	}
2522		2939
2523	cf::override;	2940	cf::override;
…		…
2570	our $safe = new Safe "safe";	2987	our $safe = new Safe "safe";
2571	our $safe_hole = new Safe::Hole;	2988	our $safe_hole = new Safe::Hole;
2572		2989
2573	$SIG{FPE} = 'IGNORE';	2990	$SIG{FPE} = 'IGNORE';
2574		2991
2575	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2992	$safe->permit_only (Opcode::opset qw(
		2993	:base_core :base_mem :base_orig :base_math
		2994	grepstart grepwhile mapstart mapwhile
		2995	sort time
		2996	));
2576		2997
2577	# here we export the classes and methods available to script code	2998	# here we export the classes and methods available to script code
2578		2999
2579	=pod	3000	=pod
2580		3001
2581	The following functions and methods are available within a safe environment:	3002	The following functions and methods are available within a safe environment:
2582		3003
2583	cf::object contr pay_amount pay_player map	3004	cf::object
		3005	contr pay_amount pay_player map x y force_find force_add destroy
		3006	insert remove name archname title slaying race decrease_ob_nr
		3007
2584	cf::object::player player	3008	cf::object::player
2585	cf::player peaceful	3009	player
2586	cf::map trigger	3010
		3011	cf::player
		3012	peaceful
		3013
		3014	cf::map
		3015	trigger
2587		3016
2588	=cut	3017	=cut
2589		3018
2590	for (	3019	for (
2591	["cf::object" => qw(contr pay_amount pay_player map)],	3020	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		3021	insert remove inv name archname title slaying race
		3022	decrease_ob_nr destroy)],
2592	["cf::object::player" => qw(player)],	3023	["cf::object::player" => qw(player)],
2593	["cf::player" => qw(peaceful)],	3024	["cf::player" => qw(peaceful)],
2594	["cf::map" => qw(trigger)],	3025	["cf::map" => qw(trigger)],
2595	) {	3026	) {
2596	no strict 'refs';	3027	no strict 'refs';
…		…
2672	# the server's init and main functions	3103	# the server's init and main functions
2673		3104
2674	sub load_facedata($) {	3105	sub load_facedata($) {
2675	my ($path) = @_;	3106	my ($path) = @_;
2676		3107
		3108	# HACK to clear player env face cache, we need some signal framework
		3109	# for this (global event?)
		3110	%ext::player_env::MUSIC_FACE_CACHE = ();
		3111
		3112	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3113
2677	warn "loading facedata from $path\n";	3114	warn "loading facedata from $path\n";
2678		3115
2679	my $facedata;	3116	my $facedata;
2680	0 < aio_load $path, $facedata	3117	0 < aio_load $path, $facedata
2681	or die "$path: $!";	3118	or die "$path: $!";
…		…
2683	$facedata = Coro::Storable::thaw $facedata;	3120	$facedata = Coro::Storable::thaw $facedata;
2684		3121
2685	$facedata->{version} == 2	3122	$facedata->{version} == 2
2686	or cf::cleanup "$path: version mismatch, cannot proceed.";	3123	or cf::cleanup "$path: version mismatch, cannot proceed.";
2687		3124
		3125	# patch in the exptable
		3126	$facedata->{resource}{"res/exp_table"} = {
		3127	type => FT_RSRC,
		3128	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3129	};
		3130	cf::cede_to_tick;
		3131
2688	{	3132	{
2689	my $faces = $facedata->{faceinfo};	3133	my $faces = $facedata->{faceinfo};
2690		3134
2691	while (my ($face, $info) = each %$faces) {	3135	while (my ($face, $info) = each %$faces) {
2692	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3136	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2693	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3137	cf::face::set_visibility $idx, $info->{visibility};
		3138	cf::face::set_magicmap $idx, $info->{magicmap};
2694	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3139	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2695	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3140	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2696	Coro::cede;	3141
		3142	cf::cede_to_tick;
2697	}	3143	}
2698		3144
2699	while (my ($face, $info) = each %$faces) {	3145	while (my ($face, $info) = each %$faces) {
2700	next unless $info->{smooth};	3146	next unless $info->{smooth};
2701	my $idx = cf::face::find $face	3147	my $idx = cf::face::find $face
2702	or next;	3148	or next;
2703	if (my $smooth = cf::face::find $info->{smooth}) {	3149	if (my $smooth = cf::face::find $info->{smooth}) {
		3150	cf::face::set_smooth $idx, $smooth;
2704	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3151	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2705	} else {	3152	} else {
2706	warn "smooth face '$info->{smooth}' not found for face '$face'";	3153	warn "smooth face '$info->{smooth}' not found for face '$face'";
2707	}	3154	}
2708	Coro::cede;	3155
		3156	cf::cede_to_tick;
2709	}	3157	}
2710	}	3158	}
2711		3159
2712	{	3160	{
2713	my $anims = $facedata->{animinfo};	3161	my $anims = $facedata->{animinfo};
2714		3162
2715	while (my ($anim, $info) = each %$anims) {	3163	while (my ($anim, $info) = each %$anims) {
2716	cf::anim::set $anim, $info->{frames}, $info->{facings};	3164	cf::anim::set $anim, $info->{frames}, $info->{facings};
2717	Coro::cede;	3165	cf::cede_to_tick;
2718	}	3166	}
2719		3167
2720	cf::anim::invalidate_all; # d'oh	3168	cf::anim::invalidate_all; # d'oh
2721	}	3169	}
2722		3170
		3171	{
		3172	# TODO: for gcfclient pleasure, we should give resources
		3173	# that gcfclient doesn't grok a >10000 face index.
		3174	my $res = $facedata->{resource};
		3175
		3176	my $soundconf = delete $res->{"res/sound.conf"};
		3177
		3178	while (my ($name, $info) = each %$res) {
		3179	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3180	my $data;
		3181
		3182	if ($info->{type} & 1) {
		3183	# prepend meta info
		3184
		3185	my $meta = $enc->encode ({
		3186	name => $name,
		3187	%{ $info->{meta} || {} },
		3188	});
		3189
		3190	$data = pack "(w/a*)*", $meta, $info->{data};
		3191	} else {
		3192	$data = $info->{data};
		3193	}
		3194
		3195	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3196	cf::face::set_type $idx, $info->{type};
		3197
		3198	cf::cede_to_tick;
		3199	}
		3200
		3201	if ($soundconf) {
		3202	$soundconf = $enc->decode (delete $soundconf->{data});
		3203
		3204	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3205	my $sound = $soundconf->{compat}[$_]
		3206	or next;
		3207
		3208	my $face = cf::face::find "sound/$sound->[1]";
		3209	cf::sound::set $sound->[0] => $face;
		3210	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3211	}
		3212
		3213	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3214	my $face = cf::face::find "sound/$v";
		3215	cf::sound::set $k => $face;
		3216	}
		3217	}
		3218	}
		3219
2723	1	3220	1
2724	}	3221	}
2725		3222
		3223	register_exticmd fx_want => sub {
		3224	my ($ns, $want) = @_;
		3225
		3226	while (my ($k, $v) = each %$want) {
		3227	$ns->fx_want ($k, $v);
		3228	}
		3229	};
		3230
2726	sub reload_regions {	3231	sub reload_regions {
		3232	# HACK to clear player env face cache, we need some signal framework
		3233	# for this (global event?)
		3234	%ext::player_env::MUSIC_FACE_CACHE = ();
		3235
2727	load_resource_file "$MAPDIR/regions"	3236	load_resource_file "$MAPDIR/regions"
2728	or die "unable to load regions file\n";	3237	or die "unable to load regions file\n";
		3238
		3239	for (cf::region::list) {
		3240	$_->{match} = qr/$_->{match}/
		3241	if exists $_->{match};
		3242	}
2729	}	3243	}
2730		3244
2731	sub reload_facedata {	3245	sub reload_facedata {
2732	load_facedata "$DATADIR/facedata"	3246	load_facedata "$DATADIR/facedata"
2733	or die "unable to load facedata\n";	3247	or die "unable to load facedata\n";
…		…
2762		3276
2763	sub init {	3277	sub init {
2764	reload_resources;	3278	reload_resources;
2765	}	3279	}
2766		3280
2767	sub cfg_load {	3281	sub reload_config {
2768	open my $fh, "<:utf8", "$CONFDIR/config"	3282	open my $fh, "<:utf8", "$CONFDIR/config"
2769	or return;	3283	or return;
2770		3284
2771	local $/;	3285	local $/;
2772	*CFG = YAML::Syck::Load <$fh>;	3286	*CFG = YAML::Syck::Load <$fh>;
…		…
2788	sub main {	3302	sub main {
2789	# we must not ever block the main coroutine	3303	# we must not ever block the main coroutine
2790	local $Coro::idle = sub {	3304	local $Coro::idle = sub {
2791	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3305	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2792	(async {	3306	(async {
		3307	$Coro::current->{desc} = "IDLE BUG HANDLER";
2793	Event::one_event;	3308	Event::one_event;
2794	})->prio (Coro::PRIO_MAX);	3309	})->prio (Coro::PRIO_MAX);
2795	};	3310	};
2796		3311
2797	cfg_load;	3312	reload_config;
2798	db_init;	3313	db_init;
2799	load_extensions;	3314	load_extensions;
2800		3315
2801	$TICK_WATCHER->start;	3316	$TICK_WATCHER->start;
2802	Event::loop;	3317	Event::loop;
…		…
2869	# and maps saved/destroyed asynchronously.	3384	# and maps saved/destroyed asynchronously.
2870	warn "begin emergency player save\n";	3385	warn "begin emergency player save\n";
2871	for my $login (keys %cf::PLAYER) {	3386	for my $login (keys %cf::PLAYER) {
2872	my $pl = $cf::PLAYER{$login} or next;	3387	my $pl = $cf::PLAYER{$login} or next;
2873	$pl->valid or next;	3388	$pl->valid or next;
		3389	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2874	$pl->save;	3390	$pl->save;
2875	}	3391	}
2876	warn "end emergency player save\n";	3392	warn "end emergency player save\n";
2877		3393
2878	warn "begin emergency map save\n";	3394	warn "begin emergency map save\n";
…		…
2926		3442
2927	warn "flushing outstanding aio requests";	3443	warn "flushing outstanding aio requests";
2928	for (;;) {	3444	for (;;) {
2929	BDB::flush;	3445	BDB::flush;
2930	IO::AIO::flush;	3446	IO::AIO::flush;
2931	Coro::cede;	3447	Coro::cede_notself;
2932	last unless IO::AIO::nreqs || BDB::nreqs;	3448	last unless IO::AIO::nreqs || BDB::nreqs;
2933	warn "iterate...";	3449	warn "iterate...";
2934	}	3450	}
2935		3451
2936	++$RELOAD;	3452	++$RELOAD;
…		…
2995	warn "reloading cf.pm";	3511	warn "reloading cf.pm";
2996	require cf;	3512	require cf;
2997	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3513	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2998		3514
2999	warn "loading config and database again";	3515	warn "loading config and database again";
3000	cf::cfg_load;	3516	cf::reload_config;
3001		3517
3002	warn "loading extensions";	3518	warn "loading extensions";
3003	cf::load_extensions;	3519	cf::load_extensions;
3004		3520
3005	warn "reattaching attachments to objects/players";	3521	warn "reattaching attachments to objects/players";
…		…
3041	register_command "reload" => sub {	3557	register_command "reload" => sub {
3042	my ($who, $arg) = @_;	3558	my ($who, $arg) = @_;
3043		3559
3044	if ($who->flag (FLAG_WIZ)) {	3560	if ($who->flag (FLAG_WIZ)) {
3045	$who->message ("reloading server.");	3561	$who->message ("reloading server.");
		3562	async {
		3563	$Coro::current->{desc} = "perl_reload";
3046	async { reload_perl };	3564	reload_perl;
		3565	};
3047	}	3566	}
3048	};	3567	};
3049		3568
3050	unshift @INC, $LIBDIR;	3569	unshift @INC, $LIBDIR;
3051		3570
…		…
3070	my $signal = new Coro::Signal;	3589	my $signal = new Coro::Signal;
3071	push @WAIT_FOR_TICK_BEGIN, $signal;	3590	push @WAIT_FOR_TICK_BEGIN, $signal;
3072	$signal->wait;	3591	$signal->wait;
3073	}	3592	}
3074		3593
3075	my $min = 1e6;#d#
3076	my $avg = 10;
3077	$TICK_WATCHER = Event->timer (	3594	$TICK_WATCHER = Event->timer (
3078	reentrant => 0,	3595	reentrant => 0,
3079	parked => 1,	3596	parked => 1,
3080	prio => 0,	3597	prio => 0,
3081	at => $NEXT_TICK || $TICK,	3598	at => $NEXT_TICK || $TICK,
…		…
3089		3606
3090	$NOW = $tick_start = Event::time;	3607	$NOW = $tick_start = Event::time;
3091		3608
3092	cf::server_tick; # one server iteration	3609	cf::server_tick; # one server iteration
3093		3610
3094	0 && sync_job {#d#
3095	for(1..10) {
3096	my $t = Event::time;
3097	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3098	or die;
3099
3100	$map->width (50);
3101	$map->height (50);
3102	$map->alloc;
3103	$map->_load_objects ("/tmp/x.map", 1);
3104	my $t = Event::time - $t;
3105
3106	#next unless $t < 0.0013;#d#
3107	if ($t < $min) {
3108	$min = $t;
3109	}
3110	$avg = $avg * 0.99 + $t * 0.01;
3111	}
3112	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3113	exit 0;
3114	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3115	};
3116
3117	$RUNTIME += $TICK;	3611	$RUNTIME += $TICK;
3118	$NEXT_TICK += $TICK;	3612	$NEXT_TICK += $TICK;
3119		3613
3120	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3614	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3121	$NEXT_RUNTIME_WRITE = $NOW + 10;	3615	$NEXT_RUNTIME_WRITE = $NOW + 10;
3122	Coro::async_pool {	3616	Coro::async_pool {
		3617	$Coro::current->{desc} = "runtime saver";
3123	write_runtime	3618	write_runtime
3124	or warn "ERROR: unable to write runtime file: $!";	3619	or warn "ERROR: unable to write runtime file: $!";
3125	};	3620	};
3126	}	3621	}
3127		3622
3128	# my $AFTER = Event::time;
3129	# warn $AFTER - $NOW;#d#
3130
3131	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3623	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3132	$sig->send;	3624	$sig->send;
3133	}	3625	}
3134	while (my $sig = shift @WAIT_FOR_TICK) {	3626	while (my $sig = shift @WAIT_FOR_TICK) {
3135	$sig->send;	3627	$sig->send;
…		…
3145		3637
3146	$LOAD = ($NOW - $tick_start) / $TICK;	3638	$LOAD = ($NOW - $tick_start) / $TICK;
3147	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3639	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3148		3640
3149	_post_tick;	3641	_post_tick;
3150
3151
3152	},	3642	},
3153	);	3643	);
3154		3644
3155	{	3645	{
		3646	BDB::min_parallel 8;
3156	BDB::max_poll_time $TICK * 0.1;	3647	BDB::max_poll_time $TICK * 0.1;
3157	$BDB_POLL_WATCHER = Event->io (	3648	$BDB_POLL_WATCHER = Event->io (
3158	reentrant => 0,	3649	reentrant => 0,
3159	fd => BDB::poll_fileno,	3650	fd => BDB::poll_fileno,
3160	poll => 'r',	3651	poll => 'r',
3161	prio => 0,	3652	prio => 0,
3162	data => WF_AUTOCANCEL,	3653	data => WF_AUTOCANCEL,
3163	cb => \&BDB::poll_cb,	3654	cb => \&BDB::poll_cb,
3164	);	3655	);
3165	BDB::min_parallel 8;
3166		3656
3167	BDB::set_sync_prepare {	3657	BDB::set_sync_prepare {
3168	my $status;	3658	my $status;
3169	my $current = $Coro::current;	3659	my $current = $Coro::current;
3170	(	3660	(
…		…
3179	)	3669	)
3180	};	3670	};
3181		3671
3182	unless ($DB_ENV) {	3672	unless ($DB_ENV) {
3183	$DB_ENV = BDB::db_env_create;	3673	$DB_ENV = BDB::db_env_create;
		3674	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3675	| BDB::LOG_AUTOREMOVE, 1);
		3676	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3677	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3184		3678
3185	cf::sync_job {	3679	cf::sync_job {
3186	eval {	3680	eval {
3187	BDB::db_env_open	3681	BDB::db_env_open
3188	$DB_ENV,	3682	$DB_ENV,
…		…
3190	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3684	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3191	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3685	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3192	0666;	3686	0666;
3193		3687
3194	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3688	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3195
3196	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3197	$DB_ENV->set_lk_detect;
3198	};	3689	};
3199		3690
3200	cf::cleanup "db_env_open(db): $@" if $@;	3691	cf::cleanup "db_env_open(db): $@" if $@;
3201	};	3692	};
3202	}	3693	}
		3694
		3695	$BDB_DEADLOCK_WATCHER = Event->timer (
		3696	after => 3,
		3697	interval => 1,
		3698	hard => 1,
		3699	prio => 0,
		3700	data => WF_AUTOCANCEL,
		3701	cb => sub {
		3702	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3703	},
		3704	);
		3705	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3706	after => 11,
		3707	interval => 60,
		3708	hard => 1,
		3709	prio => 0,
		3710	data => WF_AUTOCANCEL,
		3711	cb => sub {
		3712	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3713	},
		3714	);
		3715	$BDB_TRICKLE_WATCHER = Event->timer (
		3716	after => 5,
		3717	interval => 10,
		3718	hard => 1,
		3719	prio => 0,
		3720	data => WF_AUTOCANCEL,
		3721	cb => sub {
		3722	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3723	},
		3724	);
3203	}	3725	}
3204		3726
3205	{	3727	{
3206	IO::AIO::min_parallel 8;	3728	IO::AIO::min_parallel 8;
3207		3729
…		…
3210	$AIO_POLL_WATCHER = Event->io (	3732	$AIO_POLL_WATCHER = Event->io (
3211	reentrant => 0,	3733	reentrant => 0,
3212	data => WF_AUTOCANCEL,	3734	data => WF_AUTOCANCEL,
3213	fd => IO::AIO::poll_fileno,	3735	fd => IO::AIO::poll_fileno,
3214	poll => 'r',	3736	poll => 'r',
3215	prio => 6,	3737	prio => 0,
3216	cb => \&IO::AIO::poll_cb,	3738	cb => \&IO::AIO::poll_cb,
3217	);	3739	);
3218	}	3740	}
3219		3741
3220	my $_log_backtrace;	3742	my $_log_backtrace;
…		…
3226		3748
3227	# limit the # of concurrent backtraces	3749	# limit the # of concurrent backtraces
3228	if ($_log_backtrace < 2) {	3750	if ($_log_backtrace < 2) {
3229	++$_log_backtrace;	3751	++$_log_backtrace;
3230	async {	3752	async {
		3753	$Coro::current->{desc} = "abt $msg";
		3754
3231	my @bt = fork_call {	3755	my @bt = fork_call {
3232	@addr = map { sprintf "%x", $_ } @addr;	3756	@addr = map { sprintf "%x", $_ } @addr;
3233	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3757	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3234	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	3758	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3235	or die "addr2line: $!";	3759	or die "addr2line: $!";

Diff Legend

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