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.282 by elmex, Tue Jun 19 18:15:34 2007 UTC vs.
Revision 1.386 by root, Mon Oct 15 17:50:27 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
…		…
49	our %COMMAND = ();	52	our %COMMAND = ();
50	our %COMMAND_TIME = ();	53	our %COMMAND_TIME = ();
51		54
52	our @EXTS = (); # list of extension package names	55	our @EXTS = (); # list of extension package names
53	our %EXTCMD = ();	56	our %EXTCMD = ();
		57	our %EXTICMD = ();
54	our %EXT_CORO = (); # coroutines bound to extensions	58	our %EXT_CORO = (); # coroutines bound to extensions
55	our %EXT_MAP = (); # pluggable maps	59	our %EXT_MAP = (); # pluggable maps
56		60
57	our $RELOAD; # number of reloads so far	61	our $RELOAD; # number of reloads so far
58	our @EVENT;	62	our @EVENT;
…		…
76	our $NEXT_TICK;	80	our $NEXT_TICK;
77	our $NOW;	81	our $NOW;
78	our $USE_FSYNC = 1; # use fsync to write maps - default off	82	our $USE_FSYNC = 1; # use fsync to write maps - default off
79		83
80	our $BDB_POLL_WATCHER;	84	our $BDB_POLL_WATCHER;
		85	our $BDB_DEADLOCK_WATCHER;
		86	our $BDB_CHECKPOINT_WATCHER;
		87	our $BDB_TRICKLE_WATCHER;
81	our $DB_ENV;	88	our $DB_ENV;
82		89
83	our %CFG;	90	our %CFG;
84		91
85	our $UPTIME; $UPTIME ||= time;	92	our $UPTIME; $UPTIME ||= time;
86	our $RUNTIME;	93	our $RUNTIME;
87		94
88	our %PLAYER; # all users	95	our (%PLAYER, %PLAYER_LOADING); # all users
89	our %MAP; # all maps	96	our (%MAP, %MAP_LOADING ); # all maps
90	our $LINK_MAP; # the special {link} map, which is always available	97	our $LINK_MAP; # the special {link} map, which is always available
91		98
92	# used to convert map paths into valid unix filenames by replacing / by ∕	99	# used to convert map paths into valid unix filenames by replacing / by ∕
93	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	100	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94		101
…		…
164		171
165	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	172	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166	returns directly I<after> the tick processing (and consequently, can only wake one process	173	returns directly I<after> the tick processing (and consequently, can only wake one process
167	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	174	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168		175
		176	=item @cf::INVOKE_RESULTS
		177
		178	This array contains the results of the last C<invoke ()> call. When
		179	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		180	that call.
		181
169	=back	182	=back
170		183
171	=cut	184	=cut
172		185
173	BEGIN {	186	BEGIN {
…		…
177	$msg .= "\n"	190	$msg .= "\n"
178	unless $msg =~ /\n$/;	191	unless $msg =~ /\n$/;
179		192
180	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	193	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181		194
182	utf8::encode $msg;
183	LOG llevError, $msg;	195	LOG llevError, $msg;
184	};	196	};
185	}	197	}
186		198
187	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	199	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
236	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	248	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237	$d	249	$d
238	} || "[unable to dump $_[0]: '$@']";	250	} || "[unable to dump $_[0]: '$@']";
239	}	251	}
240		252
241	use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243	=item $ref = cf::from_json $json	253	=item $ref = cf::from_json $json
244		254
245	Converts a JSON string into the corresponding perl data structure.	255	Converts a JSON string into the corresponding perl data structure.
246		256
247	=item $json = cf::to_json $ref	257	=item $json = cf::to_json $ref
248		258
249	Converts a perl data structure into its JSON representation.	259	Converts a perl data structure into its JSON representation.
		260
		261	=cut
		262
		263	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
		264
		265	sub to_json ($) { $json_coder->encode ($_[0]) }
		266	sub from_json ($) { $json_coder->decode ($_[0]) }
250		267
251	=item cf::lock_wait $string	268	=item cf::lock_wait $string
252		269
253	Wait until the given lock is available. See cf::lock_acquire.	270	Wait until the given lock is available. See cf::lock_acquire.
254		271
…		…
257	Wait until the given lock is available and then acquires it and returns	274	Wait until the given lock is available and then acquires it and returns
258	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	275	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
259	for example when the coroutine gets canceled), the lock is automatically	276	for example when the coroutine gets canceled), the lock is automatically
260	returned.	277	returned.
261		278
		279	Locks are *not* recursive, locking from the same coro twice results in a
		280	deadlocked coro.
		281
262	Lock names should begin with a unique identifier (for example, cf::map::find	282	Lock names should begin with a unique identifier (for example, cf::map::find
263	uses map_find and cf::map::load uses map_load).	283	uses map_find and cf::map::load uses map_load).
264		284
265	=item $locked = cf::lock_active $string	285	=item $locked = cf::lock_active $string
266		286
267	Return true if the lock is currently active, i.e. somebody has locked it.	287	Return true if the lock is currently active, i.e. somebody has locked it.
268		288
269	=cut	289	=cut
270		290
271	our %LOCK;	291	our %LOCK;
		292	our %LOCKER;#d#
272		293
273	sub lock_wait($) {	294	sub lock_wait($) {
274	my ($key) = @_;	295	my ($key) = @_;
		296
		297	if ($LOCKER{$key} == $Coro::current) {#d#
		298	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		299	return;#d#
		300	}#d#
275		301
276	# wait for lock, if any	302	# wait for lock, if any
277	while ($LOCK{$key}) {	303	while ($LOCK{$key}) {
278	push @{ $LOCK{$key} }, $Coro::current;	304	push @{ $LOCK{$key} }, $Coro::current;
279	Coro::schedule;	305	Coro::schedule;
…		…
285		311
286	# wait, to be sure we are not locked	312	# wait, to be sure we are not locked
287	lock_wait $key;	313	lock_wait $key;
288		314
289	$LOCK{$key} = [];	315	$LOCK{$key} = [];
		316	$LOCKER{$key} = $Coro::current;#d#
290		317
291	Coro::guard {	318	Coro::guard {
		319	delete $LOCKER{$key};#d#
292	# wake up all waiters, to be on the safe side	320	# wake up all waiters, to be on the safe side
293	$_->ready for @{ delete $LOCK{$key} };	321	$_->ready for @{ delete $LOCK{$key} };
294	}	322	}
295	}	323	}
296		324
…		…
308	};	336	};
309	$TICK_WATCHER->stop;	337	$TICK_WATCHER->stop;
310	$guard	338	$guard
311	}	339	}
312		340
		341	=item cf::get_slot $time[, $priority[, $name]]
		342
		343	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		344	This call blocks and returns only when you have at least C<$time> seconds
		345	of cpu time till the next tick. The slot is only valid till the next cede.
		346
		347	The optional C<$name> can be used to identify the job to run. It might be
		348	used for statistical purposes and should identify the same time-class.
		349
		350	Useful for short background jobs.
		351
		352	=cut
		353
		354	our @SLOT_QUEUE;
		355	our $SLOT_QUEUE;
		356
		357	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		358	$SLOT_QUEUE = Coro::async {
		359	$Coro::current->desc ("timeslot manager");
		360
		361	my $signal = new Coro::Signal;
		362
		363	while () {
		364	next_job:
		365	my $avail = cf::till_tick;
		366	if ($avail > 0.01) {
		367	for (0 .. $#SLOT_QUEUE) {
		368	if ($SLOT_QUEUE[$_][0] < $avail) {
		369	my $job = splice @SLOT_QUEUE, $_, 1, ();
		370	$job->[2]->send;
		371	Coro::cede;
		372	goto next_job;
		373	}
		374	}
		375	}
		376
		377	if (@SLOT_QUEUE) {
		378	# we do not use wait_for_tick() as it returns immediately when tick is inactive
		379	push @cf::WAIT_FOR_TICK, $signal;
		380	$signal->wait;
		381	} else {
		382	Coro::schedule;
		383	}
		384	}
		385	};
		386
		387	sub get_slot($;$$) {
		388	my ($time, $pri, $name) = @_;
		389
		390	$time = $TICK * .6 if $time > $TICK * .6;
		391	my $sig = new Coro::Signal;
		392
		393	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		394	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		395	$SLOT_QUEUE->ready;
		396	$sig->wait;
		397	}
		398
313	=item cf::async { BLOCK }	399	=item cf::async { BLOCK }
314		400
315	Currently the same as Coro::async_pool, meaning you cannot use	401	Currently the same as Coro::async_pool, meaning you cannot use
316	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only	402	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
317	thing you are allowed to do is call C<prio> on it.	403	thing you are allowed to do is call C<prio> on it.
…		…
341	my $time = Event::time;	427	my $time = Event::time;
342		428
343	# this is the main coro, too bad, we have to block	429	# this is the main coro, too bad, we have to block
344	# till the operation succeeds, freezing the server :/	430	# till the operation succeeds, freezing the server :/
345		431
		432	LOG llevError, Carp::longmess "sync job";#d#
		433
346	# TODO: use suspend/resume instead	434	# TODO: use suspend/resume instead
347	# (but this is cancel-safe)	435	# (but this is cancel-safe)
348	my $freeze_guard = freeze_mainloop;	436	my $freeze_guard = freeze_mainloop;
349		437
350	my $busy = 1;	438	my $busy = 1;
351	my @res;	439	my @res;
352		440
353	(async {	441	(async {
		442	$Coro::current->desc ("sync job coro");
354	@res = eval { $job->() };	443	@res = eval { $job->() };
355	warn $@ if $@;	444	warn $@ if $@;
356	undef $busy;	445	undef $busy;
357	})->prio (Coro::PRIO_MAX);	446	})->prio (Coro::PRIO_MAX);
358		447
…		…
405	=cut	494	=cut
406		495
407	sub fork_call(&@) {	496	sub fork_call(&@) {
408	my ($cb, @args) = @_;	497	my ($cb, @args) = @_;
409		498
410	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	499	# we seemingly have to make a local copy of the whole thing,
411	# or die "socketpair: $!";	500	# otherwise perl prematurely frees the stuff :/
412	pipe my $fh1, my $fh2	501	# TODO: investigate and fix (likely this will be rather laborious)
413	or die "pipe: $!";
414		502
415	if (my $pid = fork) {	503	my @res = Coro::Util::fork_eval {
416	close $fh2;
417
418	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419	$res = Coro::Storable::thaw $res;
420
421	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423	die $$res unless "ARRAY" eq ref $res;
424
425	return wantarray ? @$res : $res->[-1];
426	} else {
427	reset_signals;	504	reset_signals;
428	local $SIG{__WARN__};	505	&$cb
429	local $SIG{__DIE__};	506	}, @args;
430	eval {
431	close $fh1;
432		507
433	my @res = eval { $cb->(@args) };	508	wantarray ? @res : $res[-1]
434	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435	};
436
437	warn $@ if $@;
438	_exit 0;
439	}
440	}	509	}
441		510
442	=item $value = cf::db_get $family => $key	511	=item $value = cf::db_get $family => $key
443		512
444	Returns a single value from the environment database.	513	Returns a single value from the environment database.
…		…
446	=item cf::db_put $family => $key => $value	515	=item cf::db_put $family => $key => $value
447		516
448	Stores the given C<$value> in the family. It can currently store binary	517	Stores the given C<$value> in the family. It can currently store binary
449	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).	518	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
450		519
		520	=item $db = cf::db_table "name"
		521
		522	Create and/or open a new database table. The string must not be "db" and must be unique
		523	within each server.
		524
451	=cut	525	=cut
		526
		527	sub db_table($) {
		528	my ($name) = @_;
		529	my $db = BDB::db_create $DB_ENV;
		530
		531	eval {
		532	$db->set_flags (BDB::CHKSUM);
		533
		534	utf8::encode $name;
		535	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		536	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		537	cf::cleanup "db_open(db): $!" if $!;
		538	};
		539	cf::cleanup "db_open(db): $@" if $@;
		540
		541	$db
		542	}
452		543
453	our $DB;	544	our $DB;
454		545
455	sub db_init {	546	sub db_init {
456	unless ($DB) {
457	$DB = BDB::db_create $DB_ENV;
458
459	cf::sync_job {	547	cf::sync_job {
460	eval {	548	$DB ||= db_table "db";
461	$DB->set_flags (BDB::CHKSUM);
462
463	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465	cf::cleanup "db_open(db): $!" if $!;
466	};
467	cf::cleanup "db_open(db): $@" if $@;
468	};
469	}	549	};
470	}	550	}
471		551
472	sub db_get($$) {	552	sub db_get($$) {
473	my $key = "$_[0]/$_[1]";	553	my $key = "$_[0]/$_[1]";
474		554
…		…
524	if (1) {	604	if (1) {
525	$md5 =	605	$md5 =
526	join "\x00",	606	join "\x00",
527	$processversion,	607	$processversion,
528	map {	608	map {
529	Coro::cede;	609	cf::cede_to_tick;
530	($src->[$_], Digest::MD5::md5_hex $data[$_])	610	($src->[$_], Digest::MD5::md5_hex $data[$_])
531	} 0.. $#$src;	611	} 0.. $#$src;
532		612
533		613
534	my $dbmd5 = db_get cache => "$id/md5";	614	my $dbmd5 = db_get cache => "$id/md5";
…		…
840	";	920	";
841	die if $@;	921	die if $@;
842	}	922	}
843		923
844	our $override;	924	our $override;
845	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	925	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846		926
847	sub override {	927	sub override {
848	$override = 1;	928	$override = 1;
849	@invoke_results = ();	929	@INVOKE_RESULTS = (@_);
850	}	930	}
851		931
852	sub do_invoke {	932	sub do_invoke {
853	my $event = shift;	933	my $event = shift;
854	my $callbacks = shift;	934	my $callbacks = shift;
855		935
856	@invoke_results = ();	936	@INVOKE_RESULTS = ();
857		937
858	local $override;	938	local $override;
859		939
860	for (@$callbacks) {	940	for (@$callbacks) {
861	eval { &{$_->[1]} };	941	eval { &{$_->[1]} };
…		…
878		958
879	Generate an object-specific event with the given arguments.	959	Generate an object-specific event with the given arguments.
880		960
881	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	961	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
882	removed in future versions), and there is no public API to access override	962	removed in future versions), and there is no public API to access override
883	results (if you must, access C<@cf::invoke_results> directly).	963	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884		964
885	=back	965	=back
886		966
887	=cut	967	=cut
888		968
889	#############################################################################	969	#############################################################################
890	# object support	970	# object support
		971
		972	sub _object_equal($$);
		973	sub _object_equal($$) {
		974	my ($a, $b) = @_;
		975
		976	return 0 unless (ref $a) eq (ref $b);
		977
		978	if ("HASH" eq ref $a) {
		979	my @ka = keys %$a;
		980	my @kb = keys %$b;
		981
		982	return 0 if @ka != @kb;
		983
		984	for (0 .. $#ka) {
		985	return 0 unless $ka[$_] eq $kb[$_];
		986	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		987	}
		988
		989	} elsif ("ARRAY" eq ref $a) {
		990
		991	return 0 if @$a != @$b;
		992
		993	for (0 .. $#$a) {
		994	return 0 unless _object_equal $a->[$_], $b->[$_];
		995	}
		996
		997	} elsif ($a ne $b) {
		998	return 0;
		999	}
		1000
		1001	1
		1002	}
		1003
		1004	our $SLOW_MERGES;#d#
		1005	sub _can_merge {
		1006	my ($ob1, $ob2) = @_;
		1007
		1008	++$SLOW_MERGES;#d#
		1009
		1010	# we do the slow way here
		1011	return _object_equal $ob1, $ob2
		1012	}
891		1013
892	sub reattach {	1014	sub reattach {
893	# basically do the same as instantiate, without calling instantiate	1015	# basically do the same as instantiate, without calling instantiate
894	my ($obj) = @_;	1016	my ($obj) = @_;
895		1017
…		…
942	sub object_freezer_save {	1064	sub object_freezer_save {
943	my ($filename, $rdata, $objs) = @_;	1065	my ($filename, $rdata, $objs) = @_;
944		1066
945	sync_job {	1067	sync_job {
946	if (length $$rdata) {	1068	if (length $$rdata) {
		1069	utf8::decode (my $decname = $filename);
947	warn sprintf "saving %s (%d,%d)\n",	1070	warn sprintf "saving %s (%d,%d)\n",
948	$filename, length $$rdata, scalar @$objs;	1071	$decname, length $$rdata, scalar @$objs;
949		1072
950	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1073	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951	chmod SAVE_MODE, $fh;	1074	chmod SAVE_MODE, $fh;
952	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1075	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953	aio_fsync $fh if $cf::USE_FSYNC;	1076	aio_fsync $fh if $cf::USE_FSYNC;
954	close $fh;	1077	close $fh;
955		1078
956	if (@$objs) {	1079	if (@$objs) {
957	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1080	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
958	chmod SAVE_MODE, $fh;	1081	chmod SAVE_MODE, $fh;
959	my $data = Storable::nfreeze { version => 1, objs => $objs };	1082	my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
960	aio_write $fh, 0, (length $data), $data, 0;	1083	aio_write $fh, 0, (length $data), $data, 0;
961	aio_fsync $fh if $cf::USE_FSYNC;	1084	aio_fsync $fh if $cf::USE_FSYNC;
962	close $fh;	1085	close $fh;
963	aio_rename "$filename.pst~", "$filename.pst";	1086	aio_rename "$filename.pst~", "$filename.pst";
964	}	1087	}
…		…
972	}	1095	}
973	} else {	1096	} else {
974	aio_unlink $filename;	1097	aio_unlink $filename;
975	aio_unlink "$filename.pst";	1098	aio_unlink "$filename.pst";
976	}	1099	}
977	}	1100	};
978	}	1101	}
979		1102
980	sub object_freezer_as_string {	1103	sub object_freezer_as_string {
981	my ($rdata, $objs) = @_;	1104	my ($rdata, $objs) = @_;
982		1105
…		…
994	or return;	1117	or return;
995		1118
996	unless (aio_stat "$filename.pst") {	1119	unless (aio_stat "$filename.pst") {
997	(aio_load "$filename.pst", $av) >= 0	1120	(aio_load "$filename.pst", $av) >= 0
998	or return;	1121	or return;
999	$av = eval { (Storable::thaw $av)->{objs} };
1000	}
1001		1122
		1123	my $st = eval { Coro::Storable::thaw $av }
		1124	|| eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
		1125	$av = $st->{objs};
		1126	}
		1127
		1128	utf8::decode (my $decname = $filename);
1002	warn sprintf "loading %s (%d)\n",	1129	warn sprintf "loading %s (%d,%d)\n",
1003	$filename, length $data, scalar @{$av || []};	1130	$decname, length $data, scalar @{$av || []};
		1131
1004	return ($data, $av);	1132	($data, $av)
1005	}	1133	}
1006		1134
1007	=head2 COMMAND CALLBACKS	1135	=head2 COMMAND CALLBACKS
1008		1136
1009	=over 4	1137	=over 4
…		…
1029	push @{ $COMMAND{$name} }, [$caller, $cb];	1157	push @{ $COMMAND{$name} }, [$caller, $cb];
1030	}	1158	}
1031		1159
1032	=item cf::register_extcmd $name => \&callback($pl,$packet);	1160	=item cf::register_extcmd $name => \&callback($pl,$packet);
1033		1161
1034	Register a callback fro execution when the client sends an extcmd packet.	1162	Register a callback for execution when the client sends an (synchronous)
		1163	extcmd packet. Ext commands will be processed in the order they are
		1164	received by the server, like other user commands. The first argument is
		1165	the logged-in player. Ext commands can only be processed after a player
		1166	has logged in successfully.
1035		1167
1036	If the callback returns something, it is sent back as if reply was being	1168	If the callback returns something, it is sent back as if reply was being
1037	called.	1169	called.
1038		1170
		1171	=item cf::register_exticmd $name => \&callback($ns,$packet);
		1172
		1173	Register a callback for execution when the client sends an (asynchronous)
		1174	exticmd packet. Exti commands are processed by the server as soon as they
		1175	are received, i.e. out of order w.r.t. other commands. The first argument
		1176	is a client socket. Exti commands can be received anytime, even before
		1177	log-in.
		1178
		1179	If the callback returns something, it is sent back as if reply was being
		1180	called.
		1181
1039	=cut	1182	=cut
1040		1183
1041	sub register_extcmd {	1184	sub register_extcmd {
1042	my ($name, $cb) = @_;	1185	my ($name, $cb) = @_;
1043		1186
1044	$EXTCMD{$name} = $cb;	1187	$EXTCMD{$name} = $cb;
		1188	}
		1189
		1190	sub register_exticmd {
		1191	my ($name, $cb) = @_;
		1192
		1193	$EXTICMD{$name} = $cb;
1045	}	1194	}
1046		1195
1047	cf::player->attach (	1196	cf::player->attach (
1048	on_command => sub {	1197	on_command => sub {
1049	my ($pl, $name, $params) = @_;	1198	my ($pl, $name, $params) = @_;
…		…
1058	cf::override;	1207	cf::override;
1059	},	1208	},
1060	on_extcmd => sub {	1209	on_extcmd => sub {
1061	my ($pl, $buf) = @_;	1210	my ($pl, $buf) = @_;
1062		1211
1063	my $msg = eval { from_json $buf };	1212	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064		1213
1065	if (ref $msg) {	1214	if (ref $msg) {
		1215	my ($type, $reply, @payload) =
		1216	"ARRAY" eq ref $msg
		1217	? @$msg
		1218	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1219
		1220	my @reply;
		1221
1066	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1222	if (my $cb = $EXTCMD{$type}) {
1067	if (my %reply = $cb->($pl, $msg)) {	1223	@reply = $cb->($pl, @payload);
1068	$pl->ext_reply ($msg->{msgid}, %reply);
1069	}
1070	}	1224	}
		1225
		1226	$pl->ext_reply ($reply, @reply)
		1227	if $reply;
		1228
1071	} else {	1229	} else {
1072	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1230	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073	}	1231	}
1074		1232
1075	cf::override;	1233	cf::override;
…		…
1165		1323
1166	=head3 cf::player	1324	=head3 cf::player
1167		1325
1168	=over 4	1326	=over 4
1169		1327
		1328	=item cf::player::num_playing
		1329
		1330	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1331
		1332	=cut
		1333
		1334	sub num_playing {
		1335	scalar grep
		1336	$_->ob->map
		1337	&& !$_->hidden
		1338	&& !$_->ob->flag (cf::FLAG_WIZ),
		1339	cf::player::list
		1340	}
		1341
1170	=item cf::player::find $login	1342	=item cf::player::find $login
1171		1343
1172	Returns the given player object, loading it if necessary (might block).	1344	Returns the given player object, loading it if necessary (might block).
1173		1345
1174	=cut	1346	=cut
…		…
1209	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1381	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1382	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1383	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212	aio_unlink +(playerdir $login) . "/$login.pl";	1384	aio_unlink +(playerdir $login) . "/$login.pl";
1213		1385
1214	my $pl = load_pl path $login	1386	my $f = new_from_file cf::object::thawer path $login
1215	or return;	1387	or return;
		1388
		1389	my $pl = cf::player::load_pl $f
		1390	or return;
		1391	local $cf::PLAYER_LOADING{$login} = $pl;
		1392	$f->resolve_delayed_derefs;
1216	$cf::PLAYER{$login} = $pl	1393	$cf::PLAYER{$login} = $pl
1217	}	1394	}
1218	}	1395	}
1219	}	1396	}
1220		1397
…		…
1230		1407
1231	aio_mkdir playerdir $pl, 0770;	1408	aio_mkdir playerdir $pl, 0770;
1232	$pl->{last_save} = $cf::RUNTIME;	1409	$pl->{last_save} = $cf::RUNTIME;
1233		1410
1234	$pl->save_pl ($path);	1411	$pl->save_pl ($path);
1235	Coro::cede;	1412	cf::cede_to_tick;
1236	}	1413	}
1237		1414
1238	sub new($) {	1415	sub new($) {
1239	my ($login) = @_;	1416	my ($login) = @_;
1240		1417
…		…
1244	$self->{deny_save} = 1;	1421	$self->{deny_save} = 1;
1245		1422
1246	$cf::PLAYER{$login} = $self;	1423	$cf::PLAYER{$login} = $self;
1247		1424
1248	$self	1425	$self
		1426	}
		1427
		1428	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1429
		1430	=cut
		1431
		1432	sub send_msg {
		1433	my $ns = shift->ns
		1434	or return;
		1435	$ns->send_msg (@_);
1249	}	1436	}
1250		1437
1251	=item $pl->quit_character	1438	=item $pl->quit_character
1252		1439
1253	Nukes the player without looking back. If logged in, the connection will	1440	Nukes the player without looking back. If logged in, the connection will
…		…
1308	or return [];	1495	or return [];
1309		1496
1310	my @logins;	1497	my @logins;
1311		1498
1312	for my $login (@$dirs) {	1499	for my $login (@$dirs) {
		1500	my $path = path $login;
		1501
		1502	# a .pst is a dead give-away for a valid player
		1503	unless (-e "$path.pst") {
1313	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1504	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314	aio_read $fh, 0, 512, my $buf, 0 or next;	1505	aio_read $fh, 0, 512, my $buf, 0 or next;
1315	$buf !~ /^password -------------$/m or next; # official not-valid tag	1506	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1507	}
1316		1508
1317	utf8::decode $login;	1509	utf8::decode $login;
1318	push @logins, $login;	1510	push @logins, $login;
1319	}	1511	}
1320		1512
…		…
1347	}	1539	}
1348		1540
1349	\@paths	1541	\@paths
1350	}	1542	}
1351		1543
		1544	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
		1545
		1546	Expand crossfire pod fragments into protocol xml.
		1547
		1548	=cut
		1549
		1550	sub expand_cfpod {
		1551	((my $self), (local $_)) = @_;
		1552
		1553	# escape & and <
		1554	s/&/&amp;/g;
		1555	s/(?<![BIUGHT])</&lt;/g;
		1556
		1557	# this is buggy, it needs to properly take care of nested <'s
		1558
		1559	1 while
		1560	# replace B<>, I<>, U<> etc.
		1561	s/B<([^\>]*)>/<b>$1<\/b>/
		1562	|| s/I<([^\>]*)>/<i>$1<\/i>/
		1563	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1564	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
		1565	# replace G<male|female> tags
		1566	|| s{G<([^>|]*)\|([^>]*)>}{
		1567	$self->gender ? $2 : $1
		1568	}ge
		1569	# replace H<hint text>
		1570	|| s{H<([^\>]*)>}
		1571	{
		1572	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1573	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1574	"")
		1575	[$self->{hintmode}]
		1576	}ge;
		1577
		1578	# create single paragraphs (very hackish)
		1579	s/(?<=\S)\n(?=\w)/ /g;
		1580
		1581	# compress some whitespace
		1582	s/\s+\n/\n/g; # ws line-ends
		1583	s/\n\n+/\n/g; # double lines
		1584	s/^\n+//; # beginning lines
		1585	s/\n+$//; # ending lines
		1586
		1587	$_
		1588	}
		1589
		1590	sub hintmode {
		1591	$_[0]{hintmode} = $_[1] if @_ > 1;
		1592	$_[0]{hintmode}
		1593	}
		1594
1352	=item $player->ext_reply ($msgid, %msg)	1595	=item $player->ext_reply ($msgid, @msg)
1353		1596
1354	Sends an ext reply to the player.	1597	Sends an ext reply to the player.
1355		1598
1356	=cut	1599	=cut
1357		1600
1358	sub ext_reply($$%) {	1601	sub ext_reply($$@) {
1359	my ($self, $id, %msg) = @_;	1602	my ($self, $id, @msg) = @_;
1360		1603
1361	$msg{msgid} = $id;	1604	$self->ns->ext_reply ($id, @msg)
1362
1363	$self->send ("ext " . cf::to_json \%msg);
1364	}	1605	}
1365		1606
1366	=item $player->ext_event ($type, %msg)	1607	=item $player->ext_msg ($type, @msg)
1367		1608
1368	Sends an ext event to the client.	1609	Sends an ext event to the client.
1369		1610
1370	=cut	1611	=cut
1371		1612
1372	sub ext_event($$%) {	1613	sub ext_msg($$@) {
1373	my ($self, $type, %msg) = @_;	1614	my ($self, $type, @msg) = @_;
1374		1615
1375	$self->ns->ext_event ($type, %msg);	1616	$self->ns->ext_msg ($type, @msg);
1376	}	1617	}
1377		1618
1378	=head3 cf::region	1619	=head3 cf::region
1379		1620
1380	=over 4	1621	=over 4
…		…
1393	my ($path) = @_;	1634	my ($path) = @_;
1394		1635
1395	my ($match, $specificity);	1636	my ($match, $specificity);
1396		1637
1397	for my $region (list) {	1638	for my $region (list) {
1398	if ($region->match && $path =~ $region->match) {	1639	if ($region->{match} && $path =~ $region->{match}) {
1399	($match, $specificity) = ($region, $region->specificity)	1640	($match, $specificity) = ($region, $region->specificity)
1400	if $region->specificity > $specificity;	1641	if $region->specificity > $specificity;
1401	}	1642	}
1402	}	1643	}
1403		1644
…		…
1523	$self->init; # pass $1 etc.	1764	$self->init; # pass $1 etc.
1524	return $self;	1765	return $self;
1525	}	1766	}
1526	}	1767	}
1527		1768
1528	Carp::carp "unable to resolve path '$path' (base '$base').";	1769	Carp::cluck "unable to resolve path '$path' (base '$base').";
1529	()	1770	()
1530	}	1771	}
1531		1772
1532	sub init {	1773	sub init {
1533	my ($self) = @_;	1774	my ($self) = @_;
…		…
1596		1837
1597	sub load_header_from($) {	1838	sub load_header_from($) {
1598	my ($self, $path) = @_;	1839	my ($self, $path) = @_;
1599		1840
1600	utf8::encode $path;	1841	utf8::encode $path;
1601	#aio_open $path, O_RDONLY, 0	1842	my $f = new_from_file cf::object::thawer $path
1602	# or return;
1603
1604	$self->_load_header ($path)
1605	or return;	1843	or return;
		1844
		1845	$self->_load_header ($f)
		1846	or return;
		1847
		1848	local $MAP_LOADING{$self->{path}} = $self;
		1849	$f->resolve_delayed_derefs;
1606		1850
1607	$self->{load_path} = $path;	1851	$self->{load_path} = $path;
1608		1852
1609	1	1853	1
1610	}	1854	}
…		…
1664	sub find {	1908	sub find {
1665	my ($path, $origin) = @_;	1909	my ($path, $origin) = @_;
1666		1910
1667	$path = normalise $path, $origin && $origin->path;	1911	$path = normalise $path, $origin && $origin->path;
1668		1912
		1913	cf::lock_wait "map_data:$path";#d#remove
1669	cf::lock_wait "map_find:$path";	1914	cf::lock_wait "map_find:$path";
1670		1915
1671	$cf::MAP{$path} || do {	1916	$cf::MAP{$path} || do {
1672	my $guard = cf::lock_acquire "map_find:$path";	1917	my $guard1 = cf::lock_acquire "map_find:$path";
		1918	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1919
1673	my $map = new_from_path cf::map $path	1920	my $map = new_from_path cf::map $path
1674	or return;	1921	or return;
1675		1922
1676	$map->{last_save} = $cf::RUNTIME;	1923	$map->{last_save} = $cf::RUNTIME;
1677		1924
…		…
1679	or return;	1926	or return;
1680		1927
1681	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1928	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1682	# doing this can freeze the server in a sync job, obviously	1929	# doing this can freeze the server in a sync job, obviously
1683	#$cf::WAIT_FOR_TICK->wait;	1930	#$cf::WAIT_FOR_TICK->wait;
		1931	undef $guard1;
		1932	undef $guard2;
1684	$map->reset;	1933	$map->reset;
1685	undef $guard;
1686	return find $path;	1934	return find $path;
1687	}	1935	}
1688		1936
1689	$cf::MAP{$path} = $map	1937	$cf::MAP{$path} = $map
1690	}	1938	}
…		…
1699	local $self->{deny_reset} = 1; # loading can take a long time	1947	local $self->{deny_reset} = 1; # loading can take a long time
1700		1948
1701	my $path = $self->{path};	1949	my $path = $self->{path};
1702		1950
1703	{	1951	{
1704	my $guard = cf::lock_acquire "map_load:$path";	1952	my $guard = cf::lock_acquire "map_data:$path";
1705		1953
		1954	return unless $self->valid;
1706	return if $self->in_memory != cf::MAP_SWAPPED;	1955	return unless $self->in_memory == cf::MAP_SWAPPED;
1707		1956
1708	$self->in_memory (cf::MAP_LOADING);	1957	$self->in_memory (cf::MAP_LOADING);
1709		1958
1710	$self->alloc;	1959	$self->alloc;
1711		1960
1712	$self->pre_load;	1961	$self->pre_load;
1713	Coro::cede;	1962	cf::cede_to_tick;
1714		1963
		1964	my $f = new_from_file cf::object::thawer $self->{load_path};
		1965	$f->skip_block;
1715	$self->_load_objects ($self->{load_path}, 1)	1966	$self->_load_objects ($f)
1716	or return;	1967	or return;
1717		1968
1718	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1969	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1719	if delete $self->{load_original};	1970	if delete $self->{load_original};
1720		1971
1721	if (my $uniq = $self->uniq_path) {	1972	if (my $uniq = $self->uniq_path) {
1722	utf8::encode $uniq;	1973	utf8::encode $uniq;
1723	if (aio_open $uniq, O_RDONLY, 0) {	1974	unless (aio_stat $uniq) {
		1975	if (my $f = new_from_file cf::object::thawer $uniq) {
1724	$self->clear_unique_items;	1976	$self->clear_unique_items;
1725	$self->_load_objects ($uniq, 0);	1977	$self->_load_objects ($f);
		1978	$f->resolve_delayed_derefs;
		1979	}
1726	}	1980	}
1727	}	1981	}
1728		1982
1729	Coro::cede;	1983	$f->resolve_delayed_derefs;
		1984
		1985	cf::cede_to_tick;
1730	# now do the right thing for maps	1986	# now do the right thing for maps
1731	$self->link_multipart_objects;	1987	$self->link_multipart_objects;
1732	$self->difficulty ($self->estimate_difficulty)	1988	$self->difficulty ($self->estimate_difficulty)
1733	unless $self->difficulty;	1989	unless $self->difficulty;
1734	Coro::cede;	1990	cf::cede_to_tick;
1735		1991
1736	unless ($self->{deny_activate}) {	1992	unless ($self->{deny_activate}) {
1737	$self->decay_objects;	1993	$self->decay_objects;
1738	$self->fix_auto_apply;	1994	$self->fix_auto_apply;
1739	$self->update_buttons;	1995	$self->update_buttons;
1740	Coro::cede;	1996	cf::cede_to_tick;
1741	$self->set_darkness_map;	1997	$self->set_darkness_map;
1742	Coro::cede;	1998	cf::cede_to_tick;
1743	$self->activate;	1999	$self->activate;
1744	}	2000	}
		2001
		2002	$self->{last_save} = $cf::RUNTIME;
		2003	$self->last_access ($cf::RUNTIME);
1745		2004
1746	$self->in_memory (cf::MAP_IN_MEMORY);	2005	$self->in_memory (cf::MAP_IN_MEMORY);
1747	}	2006	}
1748		2007
1749	$self->post_load;	2008	$self->post_load;
…		…
1760		2019
1761	$self	2020	$self
1762	}	2021	}
1763		2022
1764	# find and load all maps in the 3x3 area around a map	2023	# find and load all maps in the 3x3 area around a map
1765	sub load_diag {	2024	sub load_neighbours {
1766	my ($map) = @_;	2025	my ($map) = @_;
1767		2026
1768	my @diag; # diagonal neighbours	2027	my @neigh; # diagonal neighbours
1769		2028
1770	for (0 .. 3) {	2029	for (0 .. 3) {
1771	my $neigh = $map->tile_path ($_)	2030	my $neigh = $map->tile_path ($_)
1772	or next;	2031	or next;
1773	$neigh = find $neigh, $map	2032	$neigh = find $neigh, $map
1774	or next;	2033	or next;
1775	$neigh->load;	2034	$neigh->load;
1776		2035
		2036	push @neigh,
1777	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2037	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1778	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2038	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1779	}	2039	}
1780		2040
1781	for (@diag) {	2041	for (grep defined $_->[0], @neigh) {
		2042	my ($path, $origin) = @$_;
1782	my $neigh = find @$_	2043	my $neigh = find $path, $origin
1783	or next;	2044	or next;
1784	$neigh->load;	2045	$neigh->load;
1785	}	2046	}
1786	}	2047	}
1787		2048
…		…
1792	}	2053	}
1793		2054
1794	sub do_load_sync {	2055	sub do_load_sync {
1795	my ($map) = @_;	2056	my ($map) = @_;
1796		2057
		2058	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2059	if $Coro::current == $Coro::main;
		2060
1797	cf::sync_job { $map->load };	2061	cf::sync_job { $map->load };
1798	}	2062	}
1799		2063
1800	our %MAP_PREFETCH;	2064	our %MAP_PREFETCH;
1801	our $MAP_PREFETCHER = undef;	2065	our $MAP_PREFETCHER = undef;
1802		2066
1803	sub find_async {	2067	sub find_async {
1804	my ($path, $origin) = @_;	2068	my ($path, $origin, $load) = @_;
1805		2069
1806	$path = normalise $path, $origin && $origin->{path};	2070	$path = normalise $path, $origin && $origin->{path};
1807		2071
1808	if (my $map = $cf::MAP{$path}) {	2072	if (my $map = $cf::MAP{$path}) {
1809	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2073	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1810	}	2074	}
1811		2075
1812	undef $MAP_PREFETCH{$path};	2076	$MAP_PREFETCH{$path} |= $load;
		2077
1813	$MAP_PREFETCHER ||= cf::async {	2078	$MAP_PREFETCHER ||= cf::async {
		2079	$Coro::current->{desc} = "map prefetcher";
		2080
1814	while (%MAP_PREFETCH) {	2081	while (%MAP_PREFETCH) {
1815	for my $path (keys %MAP_PREFETCH) {	2082	while (my ($k, $v) = each %MAP_PREFETCH) {
1816	my $map = find $path	2083	if (my $map = find $k) {
1817	or next;
1818	$map->load;	2084	$map->load if $v;
		2085	}
1819		2086
1820	delete $MAP_PREFETCH{$path};	2087	delete $MAP_PREFETCH{$k};
1821	}	2088	}
1822	}	2089	}
1823	undef $MAP_PREFETCHER;	2090	undef $MAP_PREFETCHER;
1824	};	2091	};
1825	$MAP_PREFETCHER->prio (6);	2092	$MAP_PREFETCHER->prio (6);
…		…
1828	}	2095	}
1829		2096
1830	sub save {	2097	sub save {
1831	my ($self) = @_;	2098	my ($self) = @_;
1832		2099
1833	my $lock = cf::lock_acquire "map_data:" . $self->path;	2100	my $lock = cf::lock_acquire "map_data:$self->{path}";
1834		2101
1835	$self->{last_save} = $cf::RUNTIME;	2102	$self->{last_save} = $cf::RUNTIME;
1836		2103
1837	return unless $self->dirty;	2104	return unless $self->dirty;
1838		2105
…		…
1844	return if $self->{deny_save};	2111	return if $self->{deny_save};
1845		2112
1846	local $self->{last_access} = $self->last_access;#d#	2113	local $self->{last_access} = $self->last_access;#d#
1847		2114
1848	cf::async {	2115	cf::async {
		2116	$Coro::current->{desc} = "map player save";
1849	$_->contr->save for $self->players;	2117	$_->contr->save for $self->players;
1850	};	2118	};
1851		2119
1852	if ($uniq) {	2120	if ($uniq) {
1853	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2121	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
1861	my ($self) = @_;	2129	my ($self) = @_;
1862		2130
1863	# save first because save cedes	2131	# save first because save cedes
1864	$self->save;	2132	$self->save;
1865		2133
1866	my $lock = cf::lock_acquire "map_data:" . $self->path;	2134	my $lock = cf::lock_acquire "map_data:$self->{path}";
1867		2135
1868	return if $self->players;	2136	return if $self->players;
1869	return if $self->in_memory != cf::MAP_IN_MEMORY;	2137	return if $self->in_memory != cf::MAP_IN_MEMORY;
1870	return if $self->{deny_save};	2138	return if $self->{deny_save};
1871		2139
		2140	$self->in_memory (cf::MAP_SWAPPED);
		2141
		2142	$self->deactivate;
		2143	$_->clear_links_to ($self) for values %cf::MAP;
1872	$self->clear;	2144	$self->clear;
1873	$self->in_memory (cf::MAP_SWAPPED);
1874	}	2145	}
1875		2146
1876	sub reset_at {	2147	sub reset_at {
1877	my ($self) = @_;	2148	my ($self) = @_;
1878		2149
…		…
1910	if $uniq;	2181	if $uniq;
1911	}	2182	}
1912		2183
1913	delete $cf::MAP{$self->path};	2184	delete $cf::MAP{$self->path};
1914		2185
		2186	$self->deactivate;
		2187	$_->clear_links_to ($self) for values %cf::MAP;
1915	$self->clear;	2188	$self->clear;
1916
1917	$_->clear_links_to ($self) for values %cf::MAP;
1918		2189
1919	$self->unlink_save;	2190	$self->unlink_save;
1920	$self->destroy;	2191	$self->destroy;
1921	}	2192	}
1922		2193
1923	my $nuke_counter = "aaaa";	2194	my $nuke_counter = "aaaa";
1924		2195
1925	sub nuke {	2196	sub nuke {
1926	my ($self) = @_;	2197	my ($self) = @_;
1927		2198
		2199	{
		2200	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2201
1928	delete $cf::MAP{$self->path};	2202	delete $cf::MAP{$self->path};
1929		2203
1930	$self->unlink_save;	2204	$self->unlink_save;
1931		2205
1932	bless $self, "cf::map";	2206	bless $self, "cf::map";
1933	delete $self->{deny_reset};	2207	delete $self->{deny_reset};
1934	$self->{deny_save} = 1;	2208	$self->{deny_save} = 1;
1935	$self->reset_timeout (1);	2209	$self->reset_timeout (1);
1936	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2210	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1937		2211
1938	$cf::MAP{$self->path} = $self;	2212	$cf::MAP{$self->path} = $self;
		2213	}
1939		2214
1940	$self->reset; # polite request, might not happen	2215	$self->reset; # polite request, might not happen
1941	}	2216	}
1942		2217
1943	=item $maps = cf::map::tmp_maps	2218	=item $maps = cf::map::tmp_maps
…		…
2019		2294
2020	sub inv_recursive {	2295	sub inv_recursive {
2021	inv_recursive_ inv $_[0]	2296	inv_recursive_ inv $_[0]
2022	}	2297	}
2023		2298
		2299	=item $ref = $ob->ref
		2300
		2301	creates and returns a persistent reference to an objetc that can be stored as a string.
		2302
		2303	=item $ob = cf::object::deref ($refstring)
		2304
		2305	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2306	even if the object actually exists. May block.
		2307
		2308	=cut
		2309
		2310	sub deref {
		2311	my ($ref) = @_;
		2312
		2313	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2314	my ($uuid, $name) = ($1, $2);
		2315	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2316	or return;
		2317	$pl->ob->uuid eq $uuid
		2318	or return;
		2319
		2320	$pl->ob
		2321	} else {
		2322	warn "$ref: cannot resolve object reference\n";
		2323	undef
		2324	}
		2325	}
		2326
2024	package cf;	2327	package cf;
2025		2328
2026	=back	2329	=back
2027		2330
2028	=head3 cf::object::player	2331	=head3 cf::object::player
…		…
2050		2353
2051	} else {	2354	} else {
2052	my $pl = $self->contr;	2355	my $pl = $self->contr;
2053		2356
2054	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2357	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2055	my $diag = $pl->{npc_dialog};	2358	my $dialog = $pl->{npc_dialog};
2056	$diag->{pl}->ext_reply (	2359	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2057	$diag->{id}, msgtype => "reply", msg => $msg, add_topics => []
2058	);
2059		2360
2060	} else {	2361	} else {
2061	$msg = $npc->name . " says: $msg" if $npc;	2362	$msg = $npc->name . " says: $msg" if $npc;
2062	$self->message ($msg, $flags);	2363	$self->message ($msg, $flags);
2063	}	2364	}
2064	}	2365	}
		2366	}
		2367
		2368	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2369
		2370	=cut
		2371
		2372	sub cf::object::send_msg {
		2373	my $pl = shift->contr
		2374	or return;
		2375	$pl->send_msg (@_);
2065	}	2376	}
2066		2377
2067	=item $player_object->may ("access")	2378	=item $player_object->may ("access")
2068		2379
2069	Returns wether the given player is authorized to access resource "access"	2380	Returns wether the given player is authorized to access resource "access"
…		…
2148	# use -1 or undef as default coordinates, not 0, 0	2459	# use -1 or undef as default coordinates, not 0, 0
2149	($x, $y) = ($map->enter_x, $map->enter_y)	2460	($x, $y) = ($map->enter_x, $map->enter_y)
2150	if $x <=0 && $y <= 0;	2461	if $x <=0 && $y <= 0;
2151		2462
2152	$map->load;	2463	$map->load;
2153	$map->load_diag;	2464	$map->load_neighbours;
2154		2465
2155	return unless $self->contr->active;	2466	return unless $self->contr->active;
2156	$self->activate_recursive;	2467	$self->activate_recursive;
2157		2468
2158	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2469	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2159	$self->enter_map ($map, $x, $y);	2470	$self->enter_map ($map, $x, $y);
2160	}	2471	}
2161		2472
2162	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2473	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2163		2474
2164	Moves the player to the given map-path and coordinates by first freezing	2475	Moves the player to the given map-path and coordinates by first freezing
2165	her, loading and preparing them map, calling the provided $check callback	2476	her, loading and preparing them map, calling the provided $check callback
2166	that has to return the map if sucecssful, and then unfreezes the player on	2477	that has to return the map if sucecssful, and then unfreezes the player on
2167	the new (success) or old (failed) map position.	2478	the new (success) or old (failed) map position. In either case, $done will
		2479	be called at the end of this process.
2168		2480
2169	=cut	2481	=cut
2170		2482
2171	our $GOTOGEN;	2483	our $GOTOGEN;
2172		2484
2173	sub cf::object::player::goto {	2485	sub cf::object::player::goto {
2174	my ($self, $path, $x, $y, $check) = @_;	2486	my ($self, $path, $x, $y, $check, $done) = @_;
2175		2487
2176	# do generation counting so two concurrent goto's will be executed in-order	2488	# do generation counting so two concurrent goto's will be executed in-order
2177	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2489	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2178		2490
2179	$self->enter_link;	2491	$self->enter_link;
2180		2492
2181	(async {	2493	(async {
		2494	$Coro::current->{desc} = "player::goto $path $x $y";
		2495
		2496	# *tag paths override both path and x|y
		2497	if ($path =~ /^\*(.*)$/) {
		2498	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2499	my $ob = $obs[rand @obs];
		2500
		2501	# see if we actually can go there
		2502	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2503	$ob = $obs[rand @obs];
		2504	} else {
		2505	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2506	}
		2507	# else put us there anyways for now #d#
		2508
		2509	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2510	} else {
		2511	($path, $x, $y) = (undef, undef, undef);
		2512	}
		2513	}
		2514
2182	my $map = eval {	2515	my $map = eval {
2183	my $map = cf::map::find $path;	2516	my $map = defined $path ? cf::map::find $path : undef;
2184		2517
2185	if ($map) {	2518	if ($map) {
2186	$map = $map->customise_for ($self);	2519	$map = $map->customise_for ($self);
2187	$map = $check->($map) if $check && $map;	2520	$map = $check->($map) if $check && $map;
2188	} else {	2521	} else {
2189	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2522	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2190	}	2523	}
2191		2524
2192	$map	2525	$map
2193	};	2526	};
2194		2527
…		…
2199		2532
2200	if ($gen == $self->{_goto_generation}) {	2533	if ($gen == $self->{_goto_generation}) {
2201	delete $self->{_goto_generation};	2534	delete $self->{_goto_generation};
2202	$self->leave_link ($map, $x, $y);	2535	$self->leave_link ($map, $x, $y);
2203	}	2536	}
		2537
		2538	$done->() if $done;
2204	})->prio (1);	2539	})->prio (1);
2205	}	2540	}
2206		2541
2207	=item $player_object->enter_exit ($exit_object)	2542	=item $player_object->enter_exit ($exit_object)
2208		2543
…		…
2277	my $hp = $exit->stats->hp;	2612	my $hp = $exit->stats->hp;
2278	my $sp = $exit->stats->sp;	2613	my $sp = $exit->stats->sp;
2279		2614
2280	$self->enter_link;	2615	$self->enter_link;
2281		2616
		2617	# if exit is damned, update players death & WoR home-position
		2618	$self->contr->savebed ($slaying, $hp, $sp)
		2619	if $exit->flag (FLAG_DAMNED);
		2620
2282	(async {	2621	(async {
		2622	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2623
2283	$self->deactivate_recursive; # just to be sure	2624	$self->deactivate_recursive; # just to be sure
2284	unless (eval {	2625	unless (eval {
2285	$self->goto ($slaying, $hp, $sp);	2626	$self->goto ($slaying, $hp, $sp);
2286		2627
2287	1;	2628	1;
…		…
2313		2654
2314	utf8::encode $text;	2655	utf8::encode $text;
2315	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2656	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2316	}	2657	}
2317		2658
		2659	=item $client->send_msg ($channel, $msg, $color, [extra...])
		2660
		2661	Send a drawinfo or msg packet to the client, formatting the msg for the
		2662	client if neccessary. C<$type> should be a string identifying the type of
		2663	the message, with C<log> being the default. If C<$color> is negative, suppress
		2664	the message unless the client supports the msg packet.
		2665
		2666	=cut
		2667
		2668	our %CHANNEL = (
		2669	"c/identify" => {
		2670	id => "infobox",
		2671	title => "Identify",
		2672	reply => undef,
		2673	tooltip => "Items recently identified",
		2674	},
		2675	"c/examine" => {
		2676	id => "infobox",
		2677	title => "Examine",
		2678	reply => undef,
		2679	tooltip => "Signs and other items you examined",
		2680	},
		2681	"c/lookat" => {
		2682	id => "infobox",
		2683	title => "Look",
		2684	reply => undef,
		2685	tooltip => "What you saw there",
		2686	},
		2687	);
		2688
		2689	sub cf::client::send_msg {
		2690	my ($self, $channel, $msg, $color, @extra) = @_;
		2691
		2692	$msg = $self->pl->expand_cfpod ($msg);
		2693
		2694	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2695
		2696	# check predefined channels, for the benefit of C
		2697	if ($CHANNEL{$channel}) {
		2698	$channel = $CHANNEL{$channel};
		2699
		2700	$self->ext_msg (channel_info => $channel)
		2701	if $self->can_msg;
		2702
		2703	$channel = $channel->{id};
		2704
		2705	} elsif (ref $channel) {
		2706	# send meta info to client, if not yet sent
		2707	unless (exists $self->{channel}{$channel->{id}}) {
		2708	$self->{channel}{$channel->{id}} = $channel;
		2709	$self->ext_msg (channel_info => $channel)
		2710	if $self->can_msg;
		2711	}
		2712
		2713	$channel = $channel->{id};
		2714	}
		2715
		2716	return unless @extra || length $msg;
		2717
		2718	if ($self->can_msg) {
		2719	# default colour, mask it out
		2720	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2721	if $color & cf::NDI_DEF;
		2722
		2723	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2724	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
		2725	} else {
		2726	if ($color >= 0) {
		2727	# replace some tags by gcfclient-compatible ones
		2728	for ($msg) {
		2729	1 while
		2730	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2731	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2732	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2733	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2734	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2735	}
		2736
		2737	$color &= cf::NDI_COLOR_MASK;
		2738
		2739	utf8::encode $msg;
		2740
		2741	if (0 && $msg =~ /\[/) {
		2742	# COMMAND/INFO
		2743	$self->send_packet ("drawextinfo $color 10 8 $msg")
		2744	} else {
		2745	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
		2746	$self->send_packet ("drawinfo $color $msg")
		2747	}
		2748	}
		2749	}
		2750	}
		2751
2318	=item $client->ext_event ($type, %msg)	2752	=item $client->ext_msg ($type, @msg)
2319		2753
2320	Sends an exti event to the client.	2754	Sends an ext event to the client.
2321		2755
2322	=cut	2756	=cut
2323		2757
2324	sub cf::client::ext_event($$%) {	2758	sub cf::client::ext_msg($$@) {
2325	my ($self, $type, %msg) = @_;	2759	my ($self, $type, @msg) = @_;
2326		2760
		2761	if ($self->extcmd == 2) {
		2762	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2763	} elsif ($self->extcmd == 1) { # TODO: remove
2327	$msg{msgtype} = "event_$type";	2764	push @msg, msgtype => "event_$type";
2328	$self->send_packet ("ext " . cf::to_json \%msg);	2765	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2766	}
		2767	}
		2768
		2769	=item $client->ext_reply ($msgid, @msg)
		2770
		2771	Sends an ext reply to the client.
		2772
		2773	=cut
		2774
		2775	sub cf::client::ext_reply($$@) {
		2776	my ($self, $id, @msg) = @_;
		2777
		2778	if ($self->extcmd == 2) {
		2779	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2780	} elsif ($self->extcmd == 1) {
		2781	#TODO: version 1, remove
		2782	unshift @msg, msgtype => "reply", msgid => $id;
		2783	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2784	}
2329	}	2785	}
2330		2786
2331	=item $success = $client->query ($flags, "text", \&cb)	2787	=item $success = $client->query ($flags, "text", \&cb)
2332		2788
2333	Queues a query to the client, calling the given callback with	2789	Queues a query to the client, calling the given callback with
2334	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2790	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2335	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.	2791	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2336		2792
2337	Queries can fail, so check the return code. Or don't, as queries will become	2793	Queries can fail, so check the return code. Or don't, as queries will
2338	reliable at some point in the future.	2794	become reliable at some point in the future.
2339		2795
2340	=cut	2796	=cut
2341		2797
2342	sub cf::client::query {	2798	sub cf::client::query {
2343	my ($self, $flags, $text, $cb) = @_;	2799	my ($self, $flags, $text, $cb) = @_;
…		…
2351	utf8::encode $text;	2807	utf8::encode $text;
2352	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2808	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2353		2809
2354	$self->send_packet ($self->{query_queue}[0][0])	2810	$self->send_packet ($self->{query_queue}[0][0])
2355	if @{ $self->{query_queue} } == 1;	2811	if @{ $self->{query_queue} } == 1;
		2812
		2813	1
2356	}	2814	}
2357		2815
2358	cf::client->attach (	2816	cf::client->attach (
		2817	on_connect => sub {
		2818	my ($ns) = @_;
		2819
		2820	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2821	},
2359	on_reply => sub {	2822	on_reply => sub {
2360	my ($ns, $msg) = @_;	2823	my ($ns, $msg) = @_;
2361		2824
2362	# this weird shuffling is so that direct followup queries	2825	# this weird shuffling is so that direct followup queries
2363	# get handled first	2826	# get handled first
…		…
2375	} else {	2838	} else {
2376	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2839	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2377	}	2840	}
2378	}	2841	}
2379	},	2842	},
		2843	on_exticmd => sub {
		2844	my ($ns, $buf) = @_;
		2845
		2846	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2847
		2848	if (ref $msg) {
		2849	my ($type, $reply, @payload) =
		2850	"ARRAY" eq ref $msg
		2851	? @$msg
		2852	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2853
		2854	my @reply;
		2855
		2856	if (my $cb = $EXTICMD{$type}) {
		2857	@reply = $cb->($ns, @payload);
		2858	}
		2859
		2860	$ns->ext_reply ($reply, @reply)
		2861	if $reply;
		2862
		2863	} else {
		2864	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		2865	}
		2866
		2867	cf::override;
		2868	},
2380	);	2869	);
2381		2870
2382	=item $client->async (\&cb)	2871	=item $client->async (\&cb)
2383		2872
2384	Create a new coroutine, running the specified callback. The coroutine will	2873	Create a new coroutine, running the specified callback. The coroutine will
…		…
2425	our $safe = new Safe "safe";	2914	our $safe = new Safe "safe";
2426	our $safe_hole = new Safe::Hole;	2915	our $safe_hole = new Safe::Hole;
2427		2916
2428	$SIG{FPE} = 'IGNORE';	2917	$SIG{FPE} = 'IGNORE';
2429		2918
2430	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2919	$safe->permit_only (Opcode::opset qw(
		2920	:base_core :base_mem :base_orig :base_math
		2921	grepstart grepwhile mapstart mapwhile
		2922	sort time
		2923	));
2431		2924
2432	# here we export the classes and methods available to script code	2925	# here we export the classes and methods available to script code
2433		2926
2434	=pod	2927	=pod
2435		2928
2436	The following functions and methods are available within a safe environment:	2929	The following functions and methods are available within a safe environment:
2437		2930
2438	cf::object contr pay_amount pay_player map	2931	cf::object
		2932	contr pay_amount pay_player map x y force_find force_add destroy
		2933	insert remove name archname title slaying race decrease_ob_nr
		2934
2439	cf::object::player player	2935	cf::object::player
2440	cf::player peaceful	2936	player
2441	cf::map trigger	2937
		2938	cf::player
		2939	peaceful
		2940
		2941	cf::map
		2942	trigger
2442		2943
2443	=cut	2944	=cut
2444		2945
2445	for (	2946	for (
2446	["cf::object" => qw(contr pay_amount pay_player map)],	2947	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2948	insert remove inv name archname title slaying race
		2949	decrease_ob_nr destroy)],
2447	["cf::object::player" => qw(player)],	2950	["cf::object::player" => qw(player)],
2448	["cf::player" => qw(peaceful)],	2951	["cf::player" => qw(peaceful)],
2449	["cf::map" => qw(trigger)],	2952	["cf::map" => qw(trigger)],
2450	) {	2953	) {
2451	no strict 'refs';	2954	no strict 'refs';
…		…
2527	# the server's init and main functions	3030	# the server's init and main functions
2528		3031
2529	sub load_facedata($) {	3032	sub load_facedata($) {
2530	my ($path) = @_;	3033	my ($path) = @_;
2531		3034
		3035	# HACK to clear player env face cache, we need some signal framework
		3036	# for this (global event?)
		3037	%ext::player_env::MUSIC_FACE_CACHE = ();
		3038
		3039	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3040
2532	warn "loading facedata from $path\n";	3041	warn "loading facedata from $path\n";
2533		3042
2534	my $facedata;	3043	my $facedata;
2535	0 < aio_load $path, $facedata	3044	0 < aio_load $path, $facedata
2536	or die "$path: $!";	3045	or die "$path: $!";
…		…
2538	$facedata = Coro::Storable::thaw $facedata;	3047	$facedata = Coro::Storable::thaw $facedata;
2539		3048
2540	$facedata->{version} == 2	3049	$facedata->{version} == 2
2541	or cf::cleanup "$path: version mismatch, cannot proceed.";	3050	or cf::cleanup "$path: version mismatch, cannot proceed.";
2542		3051
		3052	# patch in the exptable
		3053	$facedata->{resource}{"res/exp_table"} = {
		3054	type => FT_RSRC,
		3055	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3056	};
		3057	cf::cede_to_tick;
		3058
2543	{	3059	{
2544	my $faces = $facedata->{faceinfo};	3060	my $faces = $facedata->{faceinfo};
2545		3061
2546	while (my ($face, $info) = each %$faces) {	3062	while (my ($face, $info) = each %$faces) {
2547	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3063	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2548	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3064	cf::face::set_visibility $idx, $info->{visibility};
		3065	cf::face::set_magicmap $idx, $info->{magicmap};
2549	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3066	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2550	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3067	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2551	Coro::cede;	3068
		3069	cf::cede_to_tick;
2552	}	3070	}
2553		3071
2554	while (my ($face, $info) = each %$faces) {	3072	while (my ($face, $info) = each %$faces) {
2555	next unless $info->{smooth};	3073	next unless $info->{smooth};
2556	my $idx = cf::face::find $face	3074	my $idx = cf::face::find $face
2557	or next;	3075	or next;
2558	if (my $smooth = cf::face::find $info->{smooth}) {	3076	if (my $smooth = cf::face::find $info->{smooth}) {
		3077	cf::face::set_smooth $idx, $smooth;
2559	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3078	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2560	} else {	3079	} else {
2561	warn "smooth face '$info->{smooth}' not found for face '$face'";	3080	warn "smooth face '$info->{smooth}' not found for face '$face'";
2562	}	3081	}
2563	Coro::cede;	3082
		3083	cf::cede_to_tick;
2564	}	3084	}
2565	}	3085	}
2566		3086
2567	{	3087	{
2568	my $anims = $facedata->{animinfo};	3088	my $anims = $facedata->{animinfo};
2569		3089
2570	while (my ($anim, $info) = each %$anims) {	3090	while (my ($anim, $info) = each %$anims) {
2571	cf::anim::set $anim, $info->{frames}, $info->{facings};	3091	cf::anim::set $anim, $info->{frames}, $info->{facings};
2572	Coro::cede;	3092	cf::cede_to_tick;
2573	}	3093	}
2574		3094
2575	cf::anim::invalidate_all; # d'oh	3095	cf::anim::invalidate_all; # d'oh
2576	}	3096	}
2577		3097
		3098	{
		3099	# TODO: for gcfclient pleasure, we should give resources
		3100	# that gcfclient doesn't grok a >10000 face index.
		3101	my $res = $facedata->{resource};
		3102
		3103	my $soundconf = delete $res->{"res/sound.conf"};
		3104
		3105	while (my ($name, $info) = each %$res) {
		3106	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3107	my $data;
		3108
		3109	if ($info->{type} & 1) {
		3110	# prepend meta info
		3111
		3112	my $meta = $enc->encode ({
		3113	name => $name,
		3114	%{ $info->{meta} || {} },
		3115	});
		3116
		3117	$data = pack "(w/a*)*", $meta, $info->{data};
		3118	} else {
		3119	$data = $info->{data};
		3120	}
		3121
		3122	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3123	cf::face::set_type $idx, $info->{type};
		3124
		3125	cf::cede_to_tick;
		3126	}
		3127
		3128	if ($soundconf) {
		3129	$soundconf = $enc->decode (delete $soundconf->{data});
		3130
		3131	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3132	my $sound = $soundconf->{compat}[$_]
		3133	or next;
		3134
		3135	my $face = cf::face::find "sound/$sound->[1]";
		3136	cf::sound::set $sound->[0] => $face;
		3137	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3138	}
		3139
		3140	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3141	my $face = cf::face::find "sound/$v";
		3142	cf::sound::set $k => $face;
		3143	}
		3144	}
		3145	}
		3146
2578	1	3147	1
2579	}	3148	}
2580		3149
		3150	register_exticmd fx_want => sub {
		3151	my ($ns, $want) = @_;
		3152
		3153	while (my ($k, $v) = each %$want) {
		3154	$ns->fx_want ($k, $v);
		3155	}
		3156	};
		3157
2581	sub reload_regions {	3158	sub reload_regions {
		3159	# HACK to clear player env face cache, we need some signal framework
		3160	# for this (global event?)
		3161	%ext::player_env::MUSIC_FACE_CACHE = ();
		3162
2582	load_resource_file "$MAPDIR/regions"	3163	load_resource_file "$MAPDIR/regions"
2583	or die "unable to load regions file\n";	3164	or die "unable to load regions file\n";
		3165
		3166	for (cf::region::list) {
		3167	$_->{match} = qr/$_->{match}/
		3168	if exists $_->{match};
		3169	}
2584	}	3170	}
2585		3171
2586	sub reload_facedata {	3172	sub reload_facedata {
2587	load_facedata "$DATADIR/facedata"	3173	load_facedata "$DATADIR/facedata"
2588	or die "unable to load facedata\n";	3174	or die "unable to load facedata\n";
2589	}	3175	}
2590		3176
2591	sub reload_archetypes {	3177	sub reload_archetypes {
		3178	load_resource_file "$DATADIR/archetypes"
		3179	or die "unable to load archetypes\n";
		3180	#d# NEED to laod twice to resolve forward references
		3181	# this really needs to be done in an extra post-pass
		3182	# (which needs to be synchronous, so solve it differently)
2592	load_resource_file "$DATADIR/archetypes"	3183	load_resource_file "$DATADIR/archetypes"
2593	or die "unable to load archetypes\n";	3184	or die "unable to load archetypes\n";
2594	}	3185	}
2595		3186
2596	sub reload_treasures {	3187	sub reload_treasures {
…		…
2612		3203
2613	sub init {	3204	sub init {
2614	reload_resources;	3205	reload_resources;
2615	}	3206	}
2616		3207
2617	sub cfg_load {	3208	sub reload_config {
2618	open my $fh, "<:utf8", "$CONFDIR/config"	3209	open my $fh, "<:utf8", "$CONFDIR/config"
2619	or return;	3210	or return;
2620		3211
2621	local $/;	3212	local $/;
2622	*CFG = YAML::Syck::Load <$fh>;	3213	*CFG = YAML::Syck::Load <$fh>;
…		…
2638	sub main {	3229	sub main {
2639	# we must not ever block the main coroutine	3230	# we must not ever block the main coroutine
2640	local $Coro::idle = sub {	3231	local $Coro::idle = sub {
2641	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3232	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2642	(async {	3233	(async {
		3234	$Coro::current->{desc} = "IDLE BUG HANDLER";
2643	Event::one_event;	3235	Event::one_event;
2644	})->prio (Coro::PRIO_MAX);	3236	})->prio (Coro::PRIO_MAX);
2645	};	3237	};
2646		3238
2647	cfg_load;	3239	reload_config;
2648	db_init;	3240	db_init;
2649	load_extensions;	3241	load_extensions;
2650		3242
2651	$TICK_WATCHER->start;	3243	$TICK_WATCHER->start;
2652	Event::loop;	3244	Event::loop;
…		…
2719	# and maps saved/destroyed asynchronously.	3311	# and maps saved/destroyed asynchronously.
2720	warn "begin emergency player save\n";	3312	warn "begin emergency player save\n";
2721	for my $login (keys %cf::PLAYER) {	3313	for my $login (keys %cf::PLAYER) {
2722	my $pl = $cf::PLAYER{$login} or next;	3314	my $pl = $cf::PLAYER{$login} or next;
2723	$pl->valid or next;	3315	$pl->valid or next;
		3316	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2724	$pl->save;	3317	$pl->save;
2725	}	3318	}
2726	warn "end emergency player save\n";	3319	warn "end emergency player save\n";
2727		3320
2728	warn "begin emergency map save\n";	3321	warn "begin emergency map save\n";
…		…
2790	%EXT_CORO = ();	3383	%EXT_CORO = ();
2791		3384
2792	warn "removing commands";	3385	warn "removing commands";
2793	%COMMAND = ();	3386	%COMMAND = ();
2794		3387
2795	warn "removing ext commands";	3388	warn "removing ext/exti commands";
2796	%EXTCMD = ();	3389	%EXTCMD = ();
		3390	%EXTICMD = ();
2797		3391
2798	warn "unloading/nuking all extensions";	3392	warn "unloading/nuking all extensions";
2799	for my $pkg (@EXTS) {	3393	for my $pkg (@EXTS) {
2800	warn "... unloading $pkg";	3394	warn "... unloading $pkg";
2801		3395
…		…
2844	warn "reloading cf.pm";	3438	warn "reloading cf.pm";
2845	require cf;	3439	require cf;
2846	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3440	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2847		3441
2848	warn "loading config and database again";	3442	warn "loading config and database again";
2849	cf::cfg_load;	3443	cf::reload_config;
2850		3444
2851	warn "loading extensions";	3445	warn "loading extensions";
2852	cf::load_extensions;	3446	cf::load_extensions;
2853		3447
2854	warn "reattaching attachments to objects/players";	3448	warn "reattaching attachments to objects/players";
…		…
2890	register_command "reload" => sub {	3484	register_command "reload" => sub {
2891	my ($who, $arg) = @_;	3485	my ($who, $arg) = @_;
2892		3486
2893	if ($who->flag (FLAG_WIZ)) {	3487	if ($who->flag (FLAG_WIZ)) {
2894	$who->message ("reloading server.");	3488	$who->message ("reloading server.");
		3489	async {
		3490	$Coro::current->{desc} = "perl_reload";
2895	async { reload_perl };	3491	reload_perl;
		3492	};
2896	}	3493	}
2897	};	3494	};
2898		3495
2899	unshift @INC, $LIBDIR;	3496	unshift @INC, $LIBDIR;
2900		3497
…		…
2919	my $signal = new Coro::Signal;	3516	my $signal = new Coro::Signal;
2920	push @WAIT_FOR_TICK_BEGIN, $signal;	3517	push @WAIT_FOR_TICK_BEGIN, $signal;
2921	$signal->wait;	3518	$signal->wait;
2922	}	3519	}
2923		3520
2924	my $min = 1e6;#d#
2925	my $avg = 10;
2926	$TICK_WATCHER = Event->timer (	3521	$TICK_WATCHER = Event->timer (
2927	reentrant => 0,	3522	reentrant => 0,
2928	parked => 1,	3523	parked => 1,
2929	prio => 0,	3524	prio => 0,
2930	at => $NEXT_TICK || $TICK,	3525	at => $NEXT_TICK || $TICK,
…		…
2938		3533
2939	$NOW = $tick_start = Event::time;	3534	$NOW = $tick_start = Event::time;
2940		3535
2941	cf::server_tick; # one server iteration	3536	cf::server_tick; # one server iteration
2942		3537
2943	0 && sync_job {#d#
2944	for(1..10) {
2945	my $t = Event::time;
2946	my $map = my $map = new_from_path cf::map "/tmp/x.map"
2947	or die;
2948
2949	$map->width (50);
2950	$map->height (50);
2951	$map->alloc;
2952	$map->_load_objects ("/tmp/x.map", 1);
2953	my $t = Event::time - $t;
2954
2955	#next unless $t < 0.0013;#d#
2956	if ($t < $min) {
2957	$min = $t;
2958	}
2959	$avg = $avg * 0.99 + $t * 0.01;
2960	}
2961	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2962	exit 0;
2963	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2964	};
2965
2966	$RUNTIME += $TICK;	3538	$RUNTIME += $TICK;
2967	$NEXT_TICK += $TICK;	3539	$NEXT_TICK += $TICK;
2968		3540
2969	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3541	if ($NOW >= $NEXT_RUNTIME_WRITE) {
2970	$NEXT_RUNTIME_WRITE = $NOW + 10;	3542	$NEXT_RUNTIME_WRITE = $NOW + 10;
2971	Coro::async_pool {	3543	Coro::async_pool {
		3544	$Coro::current->{desc} = "runtime saver";
2972	write_runtime	3545	write_runtime
2973	or warn "ERROR: unable to write runtime file: $!";	3546	or warn "ERROR: unable to write runtime file: $!";
2974	};	3547	};
2975	}	3548	}
2976		3549
2977	# my $AFTER = Event::time;
2978	# warn $AFTER - $NOW;#d#
2979
2980	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3550	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2981	$sig->send;	3551	$sig->send;
2982	}	3552	}
2983	while (my $sig = shift @WAIT_FOR_TICK) {	3553	while (my $sig = shift @WAIT_FOR_TICK) {
2984	$sig->send;	3554	$sig->send;
…		…
2994		3564
2995	$LOAD = ($NOW - $tick_start) / $TICK;	3565	$LOAD = ($NOW - $tick_start) / $TICK;
2996	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3566	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2997		3567
2998	_post_tick;	3568	_post_tick;
2999
3000
3001	},	3569	},
3002	);	3570	);
3003		3571
3004	{	3572	{
		3573	BDB::min_parallel 8;
3005	BDB::max_poll_time $TICK * 0.1;	3574	BDB::max_poll_time $TICK * 0.1;
3006	$BDB_POLL_WATCHER = Event->io (	3575	$BDB_POLL_WATCHER = Event->io (
3007	reentrant => 0,	3576	reentrant => 0,
3008	fd => BDB::poll_fileno,	3577	fd => BDB::poll_fileno,
3009	poll => 'r',	3578	poll => 'r',
3010	prio => 0,	3579	prio => 0,
3011	data => WF_AUTOCANCEL,	3580	data => WF_AUTOCANCEL,
3012	cb => \&BDB::poll_cb,	3581	cb => \&BDB::poll_cb,
3013	);	3582	);
3014	BDB::min_parallel 8;
3015		3583
3016	BDB::set_sync_prepare {	3584	BDB::set_sync_prepare {
3017	my $status;	3585	my $status;
3018	my $current = $Coro::current;	3586	my $current = $Coro::current;
3019	(	3587	(
…		…
3028	)	3596	)
3029	};	3597	};
3030		3598
3031	unless ($DB_ENV) {	3599	unless ($DB_ENV) {
3032	$DB_ENV = BDB::db_env_create;	3600	$DB_ENV = BDB::db_env_create;
		3601	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3602	| BDB::LOG_AUTOREMOVE, 1);
		3603	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3604	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3033		3605
3034	cf::sync_job {	3606	cf::sync_job {
3035	eval {	3607	eval {
3036	BDB::db_env_open	3608	BDB::db_env_open
3037	$DB_ENV,	3609	$DB_ENV,
…		…
3039	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3611	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3040	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3612	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3041	0666;	3613	0666;
3042		3614
3043	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3615	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3044
3045	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3046	$DB_ENV->set_lk_detect;
3047	};	3616	};
3048		3617
3049	cf::cleanup "db_env_open(db): $@" if $@;	3618	cf::cleanup "db_env_open(db): $@" if $@;
3050	};	3619	};
3051	}	3620	}
		3621
		3622	$BDB_DEADLOCK_WATCHER = Event->timer (
		3623	after => 3,
		3624	interval => 1,
		3625	hard => 1,
		3626	prio => 0,
		3627	data => WF_AUTOCANCEL,
		3628	cb => sub {
		3629	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3630	},
		3631	);
		3632	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3633	after => 11,
		3634	interval => 60,
		3635	hard => 1,
		3636	prio => 0,
		3637	data => WF_AUTOCANCEL,
		3638	cb => sub {
		3639	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3640	},
		3641	);
		3642	$BDB_TRICKLE_WATCHER = Event->timer (
		3643	after => 5,
		3644	interval => 10,
		3645	hard => 1,
		3646	prio => 0,
		3647	data => WF_AUTOCANCEL,
		3648	cb => sub {
		3649	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3650	},
		3651	);
3052	}	3652	}
3053		3653
3054	{	3654	{
3055	IO::AIO::min_parallel 8;	3655	IO::AIO::min_parallel 8;
3056		3656
…		…
3059	$AIO_POLL_WATCHER = Event->io (	3659	$AIO_POLL_WATCHER = Event->io (
3060	reentrant => 0,	3660	reentrant => 0,
3061	data => WF_AUTOCANCEL,	3661	data => WF_AUTOCANCEL,
3062	fd => IO::AIO::poll_fileno,	3662	fd => IO::AIO::poll_fileno,
3063	poll => 'r',	3663	poll => 'r',
3064	prio => 6,	3664	prio => 0,
3065	cb => \&IO::AIO::poll_cb,	3665	cb => \&IO::AIO::poll_cb,
3066	);	3666	);
3067	}	3667	}
3068		3668
3069	my $_log_backtrace;	3669	my $_log_backtrace;
…		…
3075		3675
3076	# limit the # of concurrent backtraces	3676	# limit the # of concurrent backtraces
3077	if ($_log_backtrace < 2) {	3677	if ($_log_backtrace < 2) {
3078	++$_log_backtrace;	3678	++$_log_backtrace;
3079	async {	3679	async {
		3680	$Coro::current->{desc} = "abt $msg";
		3681
3080	my @bt = fork_call {	3682	my @bt = fork_call {
3081	@addr = map { sprintf "%x", $_ } @addr;	3683	@addr = map { sprintf "%x", $_ } @addr;
3082	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3684	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3083	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	3685	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3084	or die "addr2line: $!";	3686	or die "addr2line: $!";

Diff Legend

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