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.284 by root, Sun Jun 24 04:15:42 2007 UTC vs.
Revision 1.389 by root, Sat Oct 20 04:39:57 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
359	while ($busy) {	448	while ($busy) {
		449	if (Coro::nready) {
		450	Coro::cede_notself;
		451	} else {
360	Coro::cede or Event::one_event;	452	Event::one_event;
		453	}
361	}	454	}
362		455
363	$time = Event::time - $time;	456	$time = Event::time - $time;
364		457
365	LOG llevError | logBacktrace, Carp::longmess "long sync job"	458	LOG llevError | logBacktrace, Carp::longmess "long sync job"
…		…
405	=cut	498	=cut
406		499
407	sub fork_call(&@) {	500	sub fork_call(&@) {
408	my ($cb, @args) = @_;	501	my ($cb, @args) = @_;
409		502
410	# 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,
411	# or die "socketpair: $!";	504	# otherwise perl prematurely frees the stuff :/
412	pipe my $fh1, my $fh2	505	# TODO: investigate and fix (likely this will be rather laborious)
413	or die "pipe: $!";
414		506
415	if (my $pid = fork) {	507	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;	508	reset_signals;
428	local $SIG{__WARN__};	509	&$cb
429	local $SIG{__DIE__};	510	}, @args;
430	eval {
431	close $fh1;
432		511
433	my @res = eval { $cb->(@args) };	512	wantarray ? @res : $res[-1]
434	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435	};
436
437	warn $@ if $@;
438	_exit 0;
439	}
440	}	513	}
441		514
442	=item $value = cf::db_get $family => $key	515	=item $value = cf::db_get $family => $key
443		516
444	Returns a single value from the environment database.	517	Returns a single value from the environment database.
…		…
446	=item cf::db_put $family => $key => $value	519	=item cf::db_put $family => $key => $value
447		520
448	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
449	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).
450		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
451	=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	}
452		547
453	our $DB;	548	our $DB;
454		549
455	sub db_init {	550	sub db_init {
456	unless ($DB) {
457	$DB = BDB::db_create $DB_ENV;
458
459	cf::sync_job {	551	cf::sync_job {
460	eval {	552	$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	}	553	};
470	}	554	}
471		555
472	sub db_get($$) {	556	sub db_get($$) {
473	my $key = "$_[0]/$_[1]";	557	my $key = "$_[0]/$_[1]";
474		558
…		…
524	if (1) {	608	if (1) {
525	$md5 =	609	$md5 =
526	join "\x00",	610	join "\x00",
527	$processversion,	611	$processversion,
528	map {	612	map {
529	Coro::cede;	613	cf::cede_to_tick;
530	($src->[$_], Digest::MD5::md5_hex $data[$_])	614	($src->[$_], Digest::MD5::md5_hex $data[$_])
531	} 0.. $#$src;	615	} 0.. $#$src;
532		616
533		617
534	my $dbmd5 = db_get cache => "$id/md5";	618	my $dbmd5 = db_get cache => "$id/md5";
…		…
840	";	924	";
841	die if $@;	925	die if $@;
842	}	926	}
843		927
844	our $override;	928	our $override;
845	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?
846		930
847	sub override {	931	sub override {
848	$override = 1;	932	$override = 1;
849	@invoke_results = ();	933	@INVOKE_RESULTS = (@_);
850	}	934	}
851		935
852	sub do_invoke {	936	sub do_invoke {
853	my $event = shift;	937	my $event = shift;
854	my $callbacks = shift;	938	my $callbacks = shift;
855		939
856	@invoke_results = ();	940	@INVOKE_RESULTS = ();
857		941
858	local $override;	942	local $override;
859		943
860	for (@$callbacks) {	944	for (@$callbacks) {
861	eval { &{$_->[1]} };	945	eval { &{$_->[1]} };
…		…
878		962
879	Generate an object-specific event with the given arguments.	963	Generate an object-specific event with the given arguments.
880		964
881	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
882	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
883	results (if you must, access C<@cf::invoke_results> directly).	967	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884		968
885	=back	969	=back
886		970
887	=cut	971	=cut
888		972
889	#############################################################################	973	#############################################################################
890	# 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	}
891		1017
892	sub reattach {	1018	sub reattach {
893	# basically do the same as instantiate, without calling instantiate	1019	# basically do the same as instantiate, without calling instantiate
894	my ($obj) = @_;	1020	my ($obj) = @_;
895		1021
…		…
942	sub object_freezer_save {	1068	sub object_freezer_save {
943	my ($filename, $rdata, $objs) = @_;	1069	my ($filename, $rdata, $objs) = @_;
944		1070
945	sync_job {	1071	sync_job {
946	if (length $$rdata) {	1072	if (length $$rdata) {
		1073	utf8::decode (my $decname = $filename);
947	warn sprintf "saving %s (%d,%d)\n",	1074	warn sprintf "saving %s (%d,%d)\n",
948	$filename, length $$rdata, scalar @$objs;	1075	$decname, length $$rdata, scalar @$objs;
949		1076
950	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1077	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951	chmod SAVE_MODE, $fh;	1078	chmod SAVE_MODE, $fh;
952	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1079	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953	aio_fsync $fh if $cf::USE_FSYNC;	1080	aio_fsync $fh if $cf::USE_FSYNC;
954	close $fh;	1081	close $fh;
955		1082
956	if (@$objs) {	1083	if (@$objs) {
957	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) {
958	chmod SAVE_MODE, $fh;	1085	chmod SAVE_MODE, $fh;
959	my $data = Storable::nfreeze { version => 1, objs => $objs };	1086	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
960	aio_write $fh, 0, (length $data), $data, 0;	1087	aio_write $fh, 0, (length $data), $data, 0;
961	aio_fsync $fh if $cf::USE_FSYNC;	1088	aio_fsync $fh if $cf::USE_FSYNC;
962	close $fh;	1089	close $fh;
963	aio_rename "$filename.pst~", "$filename.pst";	1090	aio_rename "$filename.pst~", "$filename.pst";
964	}	1091	}
…		…
972	}	1099	}
973	} else {	1100	} else {
974	aio_unlink $filename;	1101	aio_unlink $filename;
975	aio_unlink "$filename.pst";	1102	aio_unlink "$filename.pst";
976	}	1103	}
977	}	1104	};
978	}	1105	}
979		1106
980	sub object_freezer_as_string {	1107	sub object_freezer_as_string {
981	my ($rdata, $objs) = @_;	1108	my ($rdata, $objs) = @_;
982		1109
…		…
994	or return;	1121	or return;
995		1122
996	unless (aio_stat "$filename.pst") {	1123	unless (aio_stat "$filename.pst") {
997	(aio_load "$filename.pst", $av) >= 0	1124	(aio_load "$filename.pst", $av) >= 0
998	or return;	1125	or return;
		1126
999	$av = eval { (Storable::thaw $av)->{objs} };	1127	my $st = eval { Coro::Storable::thaw $av };
		1128	$av = $st->{objs};
1000	}	1129	}
1001		1130
		1131	utf8::decode (my $decname = $filename);
1002	warn sprintf "loading %s (%d)\n",	1132	warn sprintf "loading %s (%d,%d)\n",
1003	$filename, length $data, scalar @{$av || []};	1133	$decname, length $data, scalar @{$av || []};
		1134
1004	return ($data, $av);	1135	($data, $av)
1005	}	1136	}
1006		1137
1007	=head2 COMMAND CALLBACKS	1138	=head2 COMMAND CALLBACKS
1008		1139
1009	=over 4	1140	=over 4
…		…
1029	push @{ $COMMAND{$name} }, [$caller, $cb];	1160	push @{ $COMMAND{$name} }, [$caller, $cb];
1030	}	1161	}
1031		1162
1032	=item cf::register_extcmd $name => \&callback($pl,$packet);	1163	=item cf::register_extcmd $name => \&callback($pl,$packet);
1033		1164
1034	Register a callback fro execution when the client sends an extcmd packet.	1165	Register a callback for execution when the client sends an (synchronous)
		1166	extcmd packet. Ext commands will be processed in the order they are
		1167	received by the server, like other user commands. The first argument is
		1168	the logged-in player. Ext commands can only be processed after a player
		1169	has logged in successfully.
1035		1170
1036	If the callback returns something, it is sent back as if reply was being	1171	If the callback returns something, it is sent back as if reply was being
1037	called.	1172	called.
1038		1173
		1174	=item cf::register_exticmd $name => \&callback($ns,$packet);
		1175
		1176	Register a callback for execution when the client sends an (asynchronous)
		1177	exticmd packet. Exti commands are processed by the server as soon as they
		1178	are received, i.e. out of order w.r.t. other commands. The first argument
		1179	is a client socket. Exti commands can be received anytime, even before
		1180	log-in.
		1181
		1182	If the callback returns something, it is sent back as if reply was being
		1183	called.
		1184
1039	=cut	1185	=cut
1040		1186
1041	sub register_extcmd {	1187	sub register_extcmd {
1042	my ($name, $cb) = @_;	1188	my ($name, $cb) = @_;
1043		1189
1044	$EXTCMD{$name} = $cb;	1190	$EXTCMD{$name} = $cb;
		1191	}
		1192
		1193	sub register_exticmd {
		1194	my ($name, $cb) = @_;
		1195
		1196	$EXTICMD{$name} = $cb;
1045	}	1197	}
1046		1198
1047	cf::player->attach (	1199	cf::player->attach (
1048	on_command => sub {	1200	on_command => sub {
1049	my ($pl, $name, $params) = @_;	1201	my ($pl, $name, $params) = @_;
…		…
1058	cf::override;	1210	cf::override;
1059	},	1211	},
1060	on_extcmd => sub {	1212	on_extcmd => sub {
1061	my ($pl, $buf) = @_;	1213	my ($pl, $buf) = @_;
1062		1214
1063	my $msg = eval { from_json $buf };	1215	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064		1216
1065	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
1066	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1225	if (my $cb = $EXTCMD{$type}) {
1067	if (my %reply = $cb->($pl, $msg)) {	1226	@reply = $cb->($pl, @payload);
1068	$pl->ext_reply ($msg->{msgid}, %reply);
1069	}
1070	}	1227	}
		1228
		1229	$pl->ext_reply ($reply, @reply)
		1230	if $reply;
		1231
1071	} else {	1232	} else {
1072	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1233	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073	}	1234	}
1074		1235
1075	cf::override;	1236	cf::override;
…		…
1165		1326
1166	=head3 cf::player	1327	=head3 cf::player
1167		1328
1168	=over 4	1329	=over 4
1169		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
1170	=item cf::player::find $login	1345	=item cf::player::find $login
1171		1346
1172	Returns the given player object, loading it if necessary (might block).	1347	Returns the given player object, loading it if necessary (might block).
1173		1348
1174	=cut	1349	=cut
…		…
1209	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1384	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1385	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1386	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212	aio_unlink +(playerdir $login) . "/$login.pl";	1387	aio_unlink +(playerdir $login) . "/$login.pl";
1213		1388
1214	my $pl = load_pl path $login	1389	my $f = new_from_file cf::object::thawer path $login
1215	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;
1216	$cf::PLAYER{$login} = $pl	1396	$cf::PLAYER{$login} = $pl
1217	}	1397	}
1218	}	1398	}
1219	}	1399	}
1220		1400
…		…
1230		1410
1231	aio_mkdir playerdir $pl, 0770;	1411	aio_mkdir playerdir $pl, 0770;
1232	$pl->{last_save} = $cf::RUNTIME;	1412	$pl->{last_save} = $cf::RUNTIME;
1233		1413
1234	$pl->save_pl ($path);	1414	$pl->save_pl ($path);
1235	Coro::cede;	1415	cf::cede_to_tick;
1236	}	1416	}
1237		1417
1238	sub new($) {	1418	sub new($) {
1239	my ($login) = @_;	1419	my ($login) = @_;
1240		1420
…		…
1244	$self->{deny_save} = 1;	1424	$self->{deny_save} = 1;
1245		1425
1246	$cf::PLAYER{$login} = $self;	1426	$cf::PLAYER{$login} = $self;
1247		1427
1248	$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 (@_);
1249	}	1439	}
1250		1440
1251	=item $pl->quit_character	1441	=item $pl->quit_character
1252		1442
1253	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
…		…
1308	or return [];	1498	or return [];
1309		1499
1310	my @logins;	1500	my @logins;
1311		1501
1312	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") {
1313	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1507	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314	aio_read $fh, 0, 512, my $buf, 0 or next;	1508	aio_read $fh, 0, 512, my $buf, 0 or next;
1315	$buf !~ /^password -------------$/m or next; # official not-valid tag	1509	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1510	}
1316		1511
1317	utf8::decode $login;	1512	utf8::decode $login;
1318	push @logins, $login;	1513	push @logins, $login;
1319	}	1514	}
1320		1515
…		…
1358	sub expand_cfpod {	1553	sub expand_cfpod {
1359	((my $self), (local $_)) = @_;	1554	((my $self), (local $_)) = @_;
1360		1555
1361	# escape & and <	1556	# escape & and <
1362	s/&/&amp;/g;	1557	s/&/&amp;/g;
1363	s/(?<![BIUGH])</&lt;/g;	1558	s/(?<![BIUGHT])</&lt;/g;
1364		1559
1365	# this is buggy, it needs to properly take care of nested <'s	1560	# this is buggy, it needs to properly take care of nested <'s
1366		1561
1367	1 while	1562	1 while
1368	# replace B<>, I<>, U<> etc.	1563	# replace B<>, I<>, U<> etc.
1369	s/B<([^\>]*)>/<b>$1<\/b>/	1564	s/B<([^\>]*)>/<b>$1<\/b>/
1370	|| s/I<([^\>]*)>/<i>$1<\/i>/	1565	|| s/I<([^\>]*)>/<i>$1<\/i>/
1371	|| s/U<([^\>]*)>/<u>$1<\/u>/	1566	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1567	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1372	# replace G<male|female> tags	1568	# replace G<male|female> tags
1373	|| s{G<([^>|]*)\|([^>]*)>}{	1569	|| s{G<([^>|]*)\|([^>]*)>}{
1374	$self->gender ? $2 : $1	1570	$self->gender ? $2 : $1
1375	}ge	1571	}ge
1376	# replace H<hint text>	1572	# replace H<hint text>
1377	|| s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;	1573	|| s{H<([^\>]*)>}
		1574	{
		1575	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1576	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1577	"")
		1578	[$self->{hintmode}]
		1579	}ge;
1378		1580
1379	# create single paragraphs (very hackish)	1581	# create single paragraphs (very hackish)
1380	s/(?<=\S)\n(?=\w)/ /g;	1582	s/(?<=\S)\n(?=\w)/ /g;
1381		1583
		1584	# compress some whitespace
		1585	s/\s+\n/\n/g; # ws line-ends
		1586	s/\n\n+/\n/g; # double lines
		1587	s/^\n+//; # beginning lines
		1588	s/\n+$//; # ending lines
		1589
1382	$_	1590	$_
1383	}	1591	}
1384		1592
		1593	sub hintmode {
		1594	$_[0]{hintmode} = $_[1] if @_ > 1;
		1595	$_[0]{hintmode}
		1596	}
		1597
1385	=item $player->ext_reply ($msgid, %msg)	1598	=item $player->ext_reply ($msgid, @msg)
1386		1599
1387	Sends an ext reply to the player.	1600	Sends an ext reply to the player.
1388		1601
1389	=cut	1602	=cut
1390		1603
1391	sub ext_reply($$%) {	1604	sub ext_reply($$@) {
1392	my ($self, $id, %msg) = @_;	1605	my ($self, $id, @msg) = @_;
1393		1606
1394	$msg{msgid} = $id;	1607	$self->ns->ext_reply ($id, @msg)
1395
1396	$self->send ("ext " . cf::to_json \%msg);
1397	}	1608	}
1398		1609
1399	=item $player->ext_event ($type, %msg)	1610	=item $player->ext_msg ($type, @msg)
1400		1611
1401	Sends an ext event to the client.	1612	Sends an ext event to the client.
1402		1613
1403	=cut	1614	=cut
1404		1615
1405	sub ext_event($$%) {	1616	sub ext_msg($$@) {
1406	my ($self, $type, %msg) = @_;	1617	my ($self, $type, @msg) = @_;
1407		1618
1408	$self->ns->ext_event ($type, %msg);	1619	$self->ns->ext_msg ($type, @msg);
1409	}	1620	}
1410		1621
1411	=head3 cf::region	1622	=head3 cf::region
1412		1623
1413	=over 4	1624	=over 4
…		…
1426	my ($path) = @_;	1637	my ($path) = @_;
1427		1638
1428	my ($match, $specificity);	1639	my ($match, $specificity);
1429		1640
1430	for my $region (list) {	1641	for my $region (list) {
1431	if ($region->match && $path =~ $region->match) {	1642	if ($region->{match} && $path =~ $region->{match}) {
1432	($match, $specificity) = ($region, $region->specificity)	1643	($match, $specificity) = ($region, $region->specificity)
1433	if $region->specificity > $specificity;	1644	if $region->specificity > $specificity;
1434	}	1645	}
1435	}	1646	}
1436		1647
…		…
1556	$self->init; # pass $1 etc.	1767	$self->init; # pass $1 etc.
1557	return $self;	1768	return $self;
1558	}	1769	}
1559	}	1770	}
1560		1771
1561	Carp::carp "unable to resolve path '$path' (base '$base').";	1772	Carp::cluck "unable to resolve path '$path' (base '$base').";
1562	()	1773	()
1563	}	1774	}
1564		1775
1565	sub init {	1776	sub init {
1566	my ($self) = @_;	1777	my ($self) = @_;
…		…
1629		1840
1630	sub load_header_from($) {	1841	sub load_header_from($) {
1631	my ($self, $path) = @_;	1842	my ($self, $path) = @_;
1632		1843
1633	utf8::encode $path;	1844	utf8::encode $path;
1634	#aio_open $path, O_RDONLY, 0	1845	my $f = new_from_file cf::object::thawer $path
1635	# or return;
1636
1637	$self->_load_header ($path)
1638	or return;	1846	or return;
		1847
		1848	$self->_load_header ($f)
		1849	or return;
		1850
		1851	local $MAP_LOADING{$self->{path}} = $self;
		1852	$f->resolve_delayed_derefs;
1639		1853
1640	$self->{load_path} = $path;	1854	$self->{load_path} = $path;
1641		1855
1642	1	1856	1
1643	}	1857	}
…		…
1697	sub find {	1911	sub find {
1698	my ($path, $origin) = @_;	1912	my ($path, $origin) = @_;
1699		1913
1700	$path = normalise $path, $origin && $origin->path;	1914	$path = normalise $path, $origin && $origin->path;
1701		1915
		1916	cf::lock_wait "map_data:$path";#d#remove
1702	cf::lock_wait "map_find:$path";	1917	cf::lock_wait "map_find:$path";
1703		1918
1704	$cf::MAP{$path} || do {	1919	$cf::MAP{$path} || do {
1705	my $guard = cf::lock_acquire "map_find:$path";	1920	my $guard1 = cf::lock_acquire "map_find:$path";
		1921	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1922
1706	my $map = new_from_path cf::map $path	1923	my $map = new_from_path cf::map $path
1707	or return;	1924	or return;
1708		1925
1709	$map->{last_save} = $cf::RUNTIME;	1926	$map->{last_save} = $cf::RUNTIME;
1710		1927
…		…
1712	or return;	1929	or return;
1713		1930
1714	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1931	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1715	# doing this can freeze the server in a sync job, obviously	1932	# doing this can freeze the server in a sync job, obviously
1716	#$cf::WAIT_FOR_TICK->wait;	1933	#$cf::WAIT_FOR_TICK->wait;
		1934	undef $guard1;
		1935	undef $guard2;
1717	$map->reset;	1936	$map->reset;
1718	undef $guard;
1719	return find $path;	1937	return find $path;
1720	}	1938	}
1721		1939
1722	$cf::MAP{$path} = $map	1940	$cf::MAP{$path} = $map
1723	}	1941	}
…		…
1732	local $self->{deny_reset} = 1; # loading can take a long time	1950	local $self->{deny_reset} = 1; # loading can take a long time
1733		1951
1734	my $path = $self->{path};	1952	my $path = $self->{path};
1735		1953
1736	{	1954	{
1737	my $guard = cf::lock_acquire "map_load:$path";	1955	my $guard = cf::lock_acquire "map_data:$path";
1738		1956
		1957	return unless $self->valid;
1739	return if $self->in_memory != cf::MAP_SWAPPED;	1958	return unless $self->in_memory == cf::MAP_SWAPPED;
1740		1959
1741	$self->in_memory (cf::MAP_LOADING);	1960	$self->in_memory (cf::MAP_LOADING);
1742		1961
1743	$self->alloc;	1962	$self->alloc;
1744		1963
1745	$self->pre_load;	1964	$self->pre_load;
1746	Coro::cede;	1965	cf::cede_to_tick;
1747		1966
		1967	my $f = new_from_file cf::object::thawer $self->{load_path};
		1968	$f->skip_block;
1748	$self->_load_objects ($self->{load_path}, 1)	1969	$self->_load_objects ($f)
1749	or return;	1970	or return;
1750		1971
1751	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1972	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1752	if delete $self->{load_original};	1973	if delete $self->{load_original};
1753		1974
1754	if (my $uniq = $self->uniq_path) {	1975	if (my $uniq = $self->uniq_path) {
1755	utf8::encode $uniq;	1976	utf8::encode $uniq;
1756	if (aio_open $uniq, O_RDONLY, 0) {	1977	unless (aio_stat $uniq) {
		1978	if (my $f = new_from_file cf::object::thawer $uniq) {
1757	$self->clear_unique_items;	1979	$self->clear_unique_items;
1758	$self->_load_objects ($uniq, 0);	1980	$self->_load_objects ($f);
		1981	$f->resolve_delayed_derefs;
		1982	}
1759	}	1983	}
1760	}	1984	}
1761		1985
1762	Coro::cede;	1986	$f->resolve_delayed_derefs;
		1987
		1988	cf::cede_to_tick;
1763	# now do the right thing for maps	1989	# now do the right thing for maps
1764	$self->link_multipart_objects;	1990	$self->link_multipart_objects;
1765	$self->difficulty ($self->estimate_difficulty)	1991	$self->difficulty ($self->estimate_difficulty)
1766	unless $self->difficulty;	1992	unless $self->difficulty;
1767	Coro::cede;	1993	cf::cede_to_tick;
1768		1994
1769	unless ($self->{deny_activate}) {	1995	unless ($self->{deny_activate}) {
1770	$self->decay_objects;	1996	$self->decay_objects;
1771	$self->fix_auto_apply;	1997	$self->fix_auto_apply;
1772	$self->update_buttons;	1998	$self->update_buttons;
1773	Coro::cede;	1999	cf::cede_to_tick;
1774	$self->set_darkness_map;	2000	$self->set_darkness_map;
1775	Coro::cede;	2001	cf::cede_to_tick;
1776	$self->activate;	2002	$self->activate;
1777	}	2003	}
		2004
		2005	$self->{last_save} = $cf::RUNTIME;
		2006	$self->last_access ($cf::RUNTIME);
1778		2007
1779	$self->in_memory (cf::MAP_IN_MEMORY);	2008	$self->in_memory (cf::MAP_IN_MEMORY);
1780	}	2009	}
1781		2010
1782	$self->post_load;	2011	$self->post_load;
…		…
1793		2022
1794	$self	2023	$self
1795	}	2024	}
1796		2025
1797	# find and load all maps in the 3x3 area around a map	2026	# find and load all maps in the 3x3 area around a map
1798	sub load_diag {	2027	sub load_neighbours {
1799	my ($map) = @_;	2028	my ($map) = @_;
1800		2029
1801	my @diag; # diagonal neighbours	2030	my @neigh; # diagonal neighbours
1802		2031
1803	for (0 .. 3) {	2032	for (0 .. 3) {
1804	my $neigh = $map->tile_path ($_)	2033	my $neigh = $map->tile_path ($_)
1805	or next;	2034	or next;
1806	$neigh = find $neigh, $map	2035	$neigh = find $neigh, $map
1807	or next;	2036	or next;
1808	$neigh->load;	2037	$neigh->load;
1809		2038
		2039	push @neigh,
1810	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2040	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1811	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2041	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1812	}	2042	}
1813		2043
1814	for (@diag) {	2044	for (grep defined $_->[0], @neigh) {
		2045	my ($path, $origin) = @$_;
1815	my $neigh = find @$_	2046	my $neigh = find $path, $origin
1816	or next;	2047	or next;
1817	$neigh->load;	2048	$neigh->load;
1818	}	2049	}
1819	}	2050	}
1820		2051
…		…
1825	}	2056	}
1826		2057
1827	sub do_load_sync {	2058	sub do_load_sync {
1828	my ($map) = @_;	2059	my ($map) = @_;
1829		2060
		2061	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2062	if $Coro::current == $Coro::main;
		2063
1830	cf::sync_job { $map->load };	2064	cf::sync_job { $map->load };
1831	}	2065	}
1832		2066
1833	our %MAP_PREFETCH;	2067	our %MAP_PREFETCH;
1834	our $MAP_PREFETCHER = undef;	2068	our $MAP_PREFETCHER = undef;
1835		2069
1836	sub find_async {	2070	sub find_async {
1837	my ($path, $origin) = @_;	2071	my ($path, $origin, $load) = @_;
1838		2072
1839	$path = normalise $path, $origin && $origin->{path};	2073	$path = normalise $path, $origin && $origin->{path};
1840		2074
1841	if (my $map = $cf::MAP{$path}) {	2075	if (my $map = $cf::MAP{$path}) {
1842	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2076	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1843	}	2077	}
1844		2078
1845	undef $MAP_PREFETCH{$path};	2079	$MAP_PREFETCH{$path} |= $load;
		2080
1846	$MAP_PREFETCHER ||= cf::async {	2081	$MAP_PREFETCHER ||= cf::async {
		2082	$Coro::current->{desc} = "map prefetcher";
		2083
1847	while (%MAP_PREFETCH) {	2084	while (%MAP_PREFETCH) {
1848	for my $path (keys %MAP_PREFETCH) {	2085	while (my ($k, $v) = each %MAP_PREFETCH) {
1849	my $map = find $path	2086	if (my $map = find $k) {
1850	or next;
1851	$map->load;	2087	$map->load if $v;
		2088	}
1852		2089
1853	delete $MAP_PREFETCH{$path};	2090	delete $MAP_PREFETCH{$k};
1854	}	2091	}
1855	}	2092	}
1856	undef $MAP_PREFETCHER;	2093	undef $MAP_PREFETCHER;
1857	};	2094	};
1858	$MAP_PREFETCHER->prio (6);	2095	$MAP_PREFETCHER->prio (6);
…		…
1861	}	2098	}
1862		2099
1863	sub save {	2100	sub save {
1864	my ($self) = @_;	2101	my ($self) = @_;
1865		2102
1866	my $lock = cf::lock_acquire "map_data:" . $self->path;	2103	my $lock = cf::lock_acquire "map_data:$self->{path}";
1867		2104
1868	$self->{last_save} = $cf::RUNTIME;	2105	$self->{last_save} = $cf::RUNTIME;
1869		2106
1870	return unless $self->dirty;	2107	return unless $self->dirty;
1871		2108
…		…
1877	return if $self->{deny_save};	2114	return if $self->{deny_save};
1878		2115
1879	local $self->{last_access} = $self->last_access;#d#	2116	local $self->{last_access} = $self->last_access;#d#
1880		2117
1881	cf::async {	2118	cf::async {
		2119	$Coro::current->{desc} = "map player save";
1882	$_->contr->save for $self->players;	2120	$_->contr->save for $self->players;
1883	};	2121	};
1884		2122
1885	if ($uniq) {	2123	if ($uniq) {
1886	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2124	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
1894	my ($self) = @_;	2132	my ($self) = @_;
1895		2133
1896	# save first because save cedes	2134	# save first because save cedes
1897	$self->save;	2135	$self->save;
1898		2136
1899	my $lock = cf::lock_acquire "map_data:" . $self->path;	2137	my $lock = cf::lock_acquire "map_data:$self->{path}";
1900		2138
1901	return if $self->players;	2139	return if $self->players;
1902	return if $self->in_memory != cf::MAP_IN_MEMORY;	2140	return if $self->in_memory != cf::MAP_IN_MEMORY;
1903	return if $self->{deny_save};	2141	return if $self->{deny_save};
1904		2142
		2143	$self->in_memory (cf::MAP_SWAPPED);
		2144
		2145	$self->deactivate;
		2146	$_->clear_links_to ($self) for values %cf::MAP;
1905	$self->clear;	2147	$self->clear;
1906	$self->in_memory (cf::MAP_SWAPPED);
1907	}	2148	}
1908		2149
1909	sub reset_at {	2150	sub reset_at {
1910	my ($self) = @_;	2151	my ($self) = @_;
1911		2152
…		…
1943	if $uniq;	2184	if $uniq;
1944	}	2185	}
1945		2186
1946	delete $cf::MAP{$self->path};	2187	delete $cf::MAP{$self->path};
1947		2188
		2189	$self->deactivate;
		2190	$_->clear_links_to ($self) for values %cf::MAP;
1948	$self->clear;	2191	$self->clear;
1949
1950	$_->clear_links_to ($self) for values %cf::MAP;
1951		2192
1952	$self->unlink_save;	2193	$self->unlink_save;
1953	$self->destroy;	2194	$self->destroy;
1954	}	2195	}
1955		2196
1956	my $nuke_counter = "aaaa";	2197	my $nuke_counter = "aaaa";
1957		2198
1958	sub nuke {	2199	sub nuke {
1959	my ($self) = @_;	2200	my ($self) = @_;
1960		2201
		2202	{
		2203	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2204
1961	delete $cf::MAP{$self->path};	2205	delete $cf::MAP{$self->path};
1962		2206
1963	$self->unlink_save;	2207	$self->unlink_save;
1964		2208
1965	bless $self, "cf::map";	2209	bless $self, "cf::map";
1966	delete $self->{deny_reset};	2210	delete $self->{deny_reset};
1967	$self->{deny_save} = 1;	2211	$self->{deny_save} = 1;
1968	$self->reset_timeout (1);	2212	$self->reset_timeout (1);
1969	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2213	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1970		2214
1971	$cf::MAP{$self->path} = $self;	2215	$cf::MAP{$self->path} = $self;
		2216	}
1972		2217
1973	$self->reset; # polite request, might not happen	2218	$self->reset; # polite request, might not happen
1974	}	2219	}
1975		2220
1976	=item $maps = cf::map::tmp_maps	2221	=item $maps = cf::map::tmp_maps
…		…
2052		2297
2053	sub inv_recursive {	2298	sub inv_recursive {
2054	inv_recursive_ inv $_[0]	2299	inv_recursive_ inv $_[0]
2055	}	2300	}
2056		2301
		2302	=item $ref = $ob->ref
		2303
		2304	creates and returns a persistent reference to an objetc that can be stored as a string.
		2305
		2306	=item $ob = cf::object::deref ($refstring)
		2307
		2308	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2309	even if the object actually exists. May block.
		2310
		2311	=cut
		2312
		2313	sub deref {
		2314	my ($ref) = @_;
		2315
		2316	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2317	my ($uuid, $name) = ($1, $2);
		2318	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2319	or return;
		2320	$pl->ob->uuid eq $uuid
		2321	or return;
		2322
		2323	$pl->ob
		2324	} else {
		2325	warn "$ref: cannot resolve object reference\n";
		2326	undef
		2327	}
		2328	}
		2329
2057	package cf;	2330	package cf;
2058		2331
2059	=back	2332	=back
2060		2333
2061	=head3 cf::object::player	2334	=head3 cf::object::player
…		…
2083		2356
2084	} else {	2357	} else {
2085	my $pl = $self->contr;	2358	my $pl = $self->contr;
2086		2359
2087	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2360	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088	my $diag = $pl->{npc_dialog};	2361	my $dialog = $pl->{npc_dialog};
2089	$diag->{pl}->ext_reply (	2362	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2090	$diag->{id},
2091	msgtype => "reply",
2092	msg => $diag->{pl}->expand_cfpod ($msg),
2093	add_topics => []
2094	);
2095		2363
2096	} else {	2364	} else {
2097	$msg = $npc->name . " says: $msg" if $npc;	2365	$msg = $npc->name . " says: $msg" if $npc;
2098	$self->message ($msg, $flags);	2366	$self->message ($msg, $flags);
2099	}	2367	}
2100	}	2368	}
		2369	}
		2370
		2371	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2372
		2373	=cut
		2374
		2375	sub cf::object::send_msg {
		2376	my $pl = shift->contr
		2377	or return;
		2378	$pl->send_msg (@_);
2101	}	2379	}
2102		2380
2103	=item $player_object->may ("access")	2381	=item $player_object->may ("access")
2104		2382
2105	Returns wether the given player is authorized to access resource "access"	2383	Returns wether the given player is authorized to access resource "access"
…		…
2184	# use -1 or undef as default coordinates, not 0, 0	2462	# use -1 or undef as default coordinates, not 0, 0
2185	($x, $y) = ($map->enter_x, $map->enter_y)	2463	($x, $y) = ($map->enter_x, $map->enter_y)
2186	if $x <=0 && $y <= 0;	2464	if $x <=0 && $y <= 0;
2187		2465
2188	$map->load;	2466	$map->load;
2189	$map->load_diag;	2467	$map->load_neighbours;
2190		2468
2191	return unless $self->contr->active;	2469	return unless $self->contr->active;
2192	$self->activate_recursive;	2470	$self->activate_recursive;
2193		2471
2194	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2472	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195	$self->enter_map ($map, $x, $y);	2473	$self->enter_map ($map, $x, $y);
2196	}	2474	}
2197		2475
2198	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2476	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199		2477
2200	Moves the player to the given map-path and coordinates by first freezing	2478	Moves the player to the given map-path and coordinates by first freezing
2201	her, loading and preparing them map, calling the provided $check callback	2479	her, loading and preparing them map, calling the provided $check callback
2202	that has to return the map if sucecssful, and then unfreezes the player on	2480	that has to return the map if sucecssful, and then unfreezes the player on
2203	the new (success) or old (failed) map position.	2481	the new (success) or old (failed) map position. In either case, $done will
		2482	be called at the end of this process.
2204		2483
2205	=cut	2484	=cut
2206		2485
2207	our $GOTOGEN;	2486	our $GOTOGEN;
2208		2487
2209	sub cf::object::player::goto {	2488	sub cf::object::player::goto {
2210	my ($self, $path, $x, $y, $check) = @_;	2489	my ($self, $path, $x, $y, $check, $done) = @_;
2211		2490
2212	# do generation counting so two concurrent goto's will be executed in-order	2491	# do generation counting so two concurrent goto's will be executed in-order
2213	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2492	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214		2493
2215	$self->enter_link;	2494	$self->enter_link;
2216		2495
2217	(async {	2496	(async {
		2497	$Coro::current->{desc} = "player::goto $path $x $y";
		2498
		2499	# *tag paths override both path and x|y
		2500	if ($path =~ /^\*(.*)$/) {
		2501	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2502	my $ob = $obs[rand @obs];
		2503
		2504	# see if we actually can go there
		2505	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2506	$ob = $obs[rand @obs];
		2507	} else {
		2508	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2509	}
		2510	# else put us there anyways for now #d#
		2511
		2512	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2513	} else {
		2514	($path, $x, $y) = (undef, undef, undef);
		2515	}
		2516	}
		2517
2218	my $map = eval {	2518	my $map = eval {
2219	my $map = cf::map::find $path;	2519	my $map = defined $path ? cf::map::find $path : undef;
2220		2520
2221	if ($map) {	2521	if ($map) {
2222	$map = $map->customise_for ($self);	2522	$map = $map->customise_for ($self);
2223	$map = $check->($map) if $check && $map;	2523	$map = $check->($map) if $check && $map;
2224	} else {	2524	} else {
2225	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2525	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2226	}	2526	}
2227		2527
2228	$map	2528	$map
2229	};	2529	};
2230		2530
…		…
2235		2535
2236	if ($gen == $self->{_goto_generation}) {	2536	if ($gen == $self->{_goto_generation}) {
2237	delete $self->{_goto_generation};	2537	delete $self->{_goto_generation};
2238	$self->leave_link ($map, $x, $y);	2538	$self->leave_link ($map, $x, $y);
2239	}	2539	}
		2540
		2541	$done->() if $done;
2240	})->prio (1);	2542	})->prio (1);
2241	}	2543	}
2242		2544
2243	=item $player_object->enter_exit ($exit_object)	2545	=item $player_object->enter_exit ($exit_object)
2244		2546
…		…
2313	my $hp = $exit->stats->hp;	2615	my $hp = $exit->stats->hp;
2314	my $sp = $exit->stats->sp;	2616	my $sp = $exit->stats->sp;
2315		2617
2316	$self->enter_link;	2618	$self->enter_link;
2317		2619
		2620	# if exit is damned, update players death & WoR home-position
		2621	$self->contr->savebed ($slaying, $hp, $sp)
		2622	if $exit->flag (FLAG_DAMNED);
		2623
2318	(async {	2624	(async {
		2625	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2626
2319	$self->deactivate_recursive; # just to be sure	2627	$self->deactivate_recursive; # just to be sure
2320	unless (eval {	2628	unless (eval {
2321	$self->goto ($slaying, $hp, $sp);	2629	$self->goto ($slaying, $hp, $sp);
2322		2630
2323	1;	2631	1;
…		…
2349		2657
2350	utf8::encode $text;	2658	utf8::encode $text;
2351	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2659	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2352	}	2660	}
2353		2661
2354	=item $client->send_msg ($color, $type, $msg, [extra...])	2662	=item $client->send_msg ($channel, $msg, $color, [extra...])
2355		2663
2356	Send a drawinfo or msg packet to the client, formatting the msg for the	2664	Send a drawinfo or msg packet to the client, formatting the msg for the
2357	client if neccessary. C<$type> should be a string identifying the type of	2665	client if neccessary. C<$type> should be a string identifying the type of
2358	the message, with C<log> being the default. If C<$color> is negative, suppress	2666	the message, with C<log> being the default. If C<$color> is negative, suppress
2359	the message unless the client supports the msg packet.	2667	the message unless the client supports the msg packet.
2360		2668
2361	=cut	2669	=cut
2362		2670
		2671	our %CHANNEL = (
		2672	"c/identify" => {
		2673	id => "infobox",
		2674	title => "Identify",
		2675	reply => undef,
		2676	tooltip => "Items recently identified",
		2677	},
		2678	"c/examine" => {
		2679	id => "infobox",
		2680	title => "Examine",
		2681	reply => undef,
		2682	tooltip => "Signs and other items you examined",
		2683	},
		2684	"c/book" => {
		2685	id => "infobox",
		2686	title => "Book",
		2687	reply => undef,
		2688	tooltip => "The contents of a note or book",
		2689	},
		2690	"c/lookat" => {
		2691	id => "infobox",
		2692	title => "Look",
		2693	reply => undef,
		2694	tooltip => "What you saw there",
		2695	},
		2696	);
		2697
2363	sub cf::client::send_msg {	2698	sub cf::client::send_msg {
2364	my ($self, $color, $type, $msg, @extra) = @_;	2699	my ($self, $channel, $msg, $color, @extra) = @_;
2365		2700
2366	$msg = $self->pl->expand_cfpod ($msg);	2701	$msg = $self->pl->expand_cfpod ($msg);
2367		2702
		2703	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2704
		2705	# check predefined channels, for the benefit of C
		2706	if ($CHANNEL{$channel}) {
		2707	$channel = $CHANNEL{$channel};
		2708
		2709	$self->ext_msg (channel_info => $channel)
		2710	if $self->can_msg;
		2711
		2712	$channel = $channel->{id};
		2713
		2714	} elsif (ref $channel) {
		2715	# send meta info to client, if not yet sent
		2716	unless (exists $self->{channel}{$channel->{id}}) {
		2717	$self->{channel}{$channel->{id}} = $channel;
		2718	$self->ext_msg (channel_info => $channel)
		2719	if $self->can_msg;
		2720	}
		2721
		2722	$channel = $channel->{id};
		2723	}
		2724
		2725	return unless @extra || length $msg;
		2726
2368	if ($self->can_msg) {	2727	if ($self->can_msg) {
2369	$self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);	2728	# default colour, mask it out
		2729	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2730	if $color & cf::NDI_DEF;
		2731
		2732	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2733	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2370	} else {	2734	} else {
2371	# replace some tags by gcfclient-compatible ones
2372	for ($msg) {
2373	1 while
2374	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${1}[\/color]/;
2379	}
2380
2381	if ($color >= 0) {	2735	if ($color >= 0) {
		2736	# replace some tags by gcfclient-compatible ones
		2737	for ($msg) {
		2738	1 while
		2739	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2740	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2741	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2742	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2743	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2744	}
		2745
		2746	$color &= cf::NDI_COLOR_MASK;
		2747
		2748	utf8::encode $msg;
		2749
2382	if (0 && $msg =~ /\[/) {	2750	if (0 && $msg =~ /\[/) {
		2751	# COMMAND/INFO
2383	$self->send_packet ("drawextinfo $color 4 0 $msg")	2752	$self->send_packet ("drawextinfo $color 10 8 $msg")
2384	} else {	2753	} else {
2385	s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	2754	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2386	$self->send_packet ("drawinfo $color $msg")	2755	$self->send_packet ("drawinfo $color $msg")
2387	}	2756	}
2388	}	2757	}
2389	}	2758	}
2390	}	2759	}
2391		2760
2392	=item $client->ext_event ($type, %msg)	2761	=item $client->ext_msg ($type, @msg)
2393		2762
2394	Sends an exti event to the client.	2763	Sends an ext event to the client.
2395		2764
2396	=cut	2765	=cut
2397		2766
2398	sub cf::client::ext_event($$%) {	2767	sub cf::client::ext_msg($$@) {
2399	my ($self, $type, %msg) = @_;	2768	my ($self, $type, @msg) = @_;
2400		2769
		2770	if ($self->extcmd == 2) {
		2771	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2772	} elsif ($self->extcmd == 1) { # TODO: remove
2401	$msg{msgtype} = "event_$type";	2773	push @msg, msgtype => "event_$type";
2402	$self->send_packet ("ext " . cf::to_json \%msg);	2774	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2775	}
		2776	}
		2777
		2778	=item $client->ext_reply ($msgid, @msg)
		2779
		2780	Sends an ext reply to the client.
		2781
		2782	=cut
		2783
		2784	sub cf::client::ext_reply($$@) {
		2785	my ($self, $id, @msg) = @_;
		2786
		2787	if ($self->extcmd == 2) {
		2788	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2789	} elsif ($self->extcmd == 1) {
		2790	#TODO: version 1, remove
		2791	unshift @msg, msgtype => "reply", msgid => $id;
		2792	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2793	}
2403	}	2794	}
2404		2795
2405	=item $success = $client->query ($flags, "text", \&cb)	2796	=item $success = $client->query ($flags, "text", \&cb)
2406		2797
2407	Queues a query to the client, calling the given callback with	2798	Queues a query to the client, calling the given callback with
2408	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2799	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2409	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.	2800	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2410		2801
2411	Queries can fail, so check the return code. Or don't, as queries will become	2802	Queries can fail, so check the return code. Or don't, as queries will
2412	reliable at some point in the future.	2803	become reliable at some point in the future.
2413		2804
2414	=cut	2805	=cut
2415		2806
2416	sub cf::client::query {	2807	sub cf::client::query {
2417	my ($self, $flags, $text, $cb) = @_;	2808	my ($self, $flags, $text, $cb) = @_;
…		…
2425	utf8::encode $text;	2816	utf8::encode $text;
2426	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2817	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2427		2818
2428	$self->send_packet ($self->{query_queue}[0][0])	2819	$self->send_packet ($self->{query_queue}[0][0])
2429	if @{ $self->{query_queue} } == 1;	2820	if @{ $self->{query_queue} } == 1;
		2821
		2822	1
2430	}	2823	}
2431		2824
2432	cf::client->attach (	2825	cf::client->attach (
		2826	on_connect => sub {
		2827	my ($ns) = @_;
		2828
		2829	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2830	},
2433	on_reply => sub {	2831	on_reply => sub {
2434	my ($ns, $msg) = @_;	2832	my ($ns, $msg) = @_;
2435		2833
2436	# this weird shuffling is so that direct followup queries	2834	# this weird shuffling is so that direct followup queries
2437	# get handled first	2835	# get handled first
…		…
2449	} else {	2847	} else {
2450	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2848	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2451	}	2849	}
2452	}	2850	}
2453	},	2851	},
		2852	on_exticmd => sub {
		2853	my ($ns, $buf) = @_;
		2854
		2855	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2856
		2857	if (ref $msg) {
		2858	my ($type, $reply, @payload) =
		2859	"ARRAY" eq ref $msg
		2860	? @$msg
		2861	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2862
		2863	my @reply;
		2864
		2865	if (my $cb = $EXTICMD{$type}) {
		2866	@reply = $cb->($ns, @payload);
		2867	}
		2868
		2869	$ns->ext_reply ($reply, @reply)
		2870	if $reply;
		2871
		2872	} else {
		2873	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		2874	}
		2875
		2876	cf::override;
		2877	},
2454	);	2878	);
2455		2879
2456	=item $client->async (\&cb)	2880	=item $client->async (\&cb)
2457		2881
2458	Create a new coroutine, running the specified callback. The coroutine will	2882	Create a new coroutine, running the specified callback. The coroutine will
…		…
2499	our $safe = new Safe "safe";	2923	our $safe = new Safe "safe";
2500	our $safe_hole = new Safe::Hole;	2924	our $safe_hole = new Safe::Hole;
2501		2925
2502	$SIG{FPE} = 'IGNORE';	2926	$SIG{FPE} = 'IGNORE';
2503		2927
2504	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2928	$safe->permit_only (Opcode::opset qw(
		2929	:base_core :base_mem :base_orig :base_math
		2930	grepstart grepwhile mapstart mapwhile
		2931	sort time
		2932	));
2505		2933
2506	# here we export the classes and methods available to script code	2934	# here we export the classes and methods available to script code
2507		2935
2508	=pod	2936	=pod
2509		2937
2510	The following functions and methods are available within a safe environment:	2938	The following functions and methods are available within a safe environment:
2511		2939
2512	cf::object contr pay_amount pay_player map	2940	cf::object
		2941	contr pay_amount pay_player map x y force_find force_add destroy
		2942	insert remove name archname title slaying race decrease_ob_nr
		2943
2513	cf::object::player player	2944	cf::object::player
2514	cf::player peaceful	2945	player
2515	cf::map trigger	2946
		2947	cf::player
		2948	peaceful
		2949
		2950	cf::map
		2951	trigger
2516		2952
2517	=cut	2953	=cut
2518		2954
2519	for (	2955	for (
2520	["cf::object" => qw(contr pay_amount pay_player map)],	2956	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2957	insert remove inv name archname title slaying race
		2958	decrease_ob_nr destroy)],
2521	["cf::object::player" => qw(player)],	2959	["cf::object::player" => qw(player)],
2522	["cf::player" => qw(peaceful)],	2960	["cf::player" => qw(peaceful)],
2523	["cf::map" => qw(trigger)],	2961	["cf::map" => qw(trigger)],
2524	) {	2962	) {
2525	no strict 'refs';	2963	no strict 'refs';
…		…
2601	# the server's init and main functions	3039	# the server's init and main functions
2602		3040
2603	sub load_facedata($) {	3041	sub load_facedata($) {
2604	my ($path) = @_;	3042	my ($path) = @_;
2605		3043
		3044	# HACK to clear player env face cache, we need some signal framework
		3045	# for this (global event?)
		3046	%ext::player_env::MUSIC_FACE_CACHE = ();
		3047
		3048	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3049
2606	warn "loading facedata from $path\n";	3050	warn "loading facedata from $path\n";
2607		3051
2608	my $facedata;	3052	my $facedata;
2609	0 < aio_load $path, $facedata	3053	0 < aio_load $path, $facedata
2610	or die "$path: $!";	3054	or die "$path: $!";
…		…
2612	$facedata = Coro::Storable::thaw $facedata;	3056	$facedata = Coro::Storable::thaw $facedata;
2613		3057
2614	$facedata->{version} == 2	3058	$facedata->{version} == 2
2615	or cf::cleanup "$path: version mismatch, cannot proceed.";	3059	or cf::cleanup "$path: version mismatch, cannot proceed.";
2616		3060
		3061	# patch in the exptable
		3062	$facedata->{resource}{"res/exp_table"} = {
		3063	type => FT_RSRC,
		3064	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3065	};
		3066	cf::cede_to_tick;
		3067
2617	{	3068	{
2618	my $faces = $facedata->{faceinfo};	3069	my $faces = $facedata->{faceinfo};
2619		3070
2620	while (my ($face, $info) = each %$faces) {	3071	while (my ($face, $info) = each %$faces) {
2621	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3072	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2622	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3073	cf::face::set_visibility $idx, $info->{visibility};
		3074	cf::face::set_magicmap $idx, $info->{magicmap};
2623	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3075	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2624	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3076	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2625	Coro::cede;	3077
		3078	cf::cede_to_tick;
2626	}	3079	}
2627		3080
2628	while (my ($face, $info) = each %$faces) {	3081	while (my ($face, $info) = each %$faces) {
2629	next unless $info->{smooth};	3082	next unless $info->{smooth};
2630	my $idx = cf::face::find $face	3083	my $idx = cf::face::find $face
2631	or next;	3084	or next;
2632	if (my $smooth = cf::face::find $info->{smooth}) {	3085	if (my $smooth = cf::face::find $info->{smooth}) {
		3086	cf::face::set_smooth $idx, $smooth;
2633	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3087	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2634	} else {	3088	} else {
2635	warn "smooth face '$info->{smooth}' not found for face '$face'";	3089	warn "smooth face '$info->{smooth}' not found for face '$face'";
2636	}	3090	}
2637	Coro::cede;	3091
		3092	cf::cede_to_tick;
2638	}	3093	}
2639	}	3094	}
2640		3095
2641	{	3096	{
2642	my $anims = $facedata->{animinfo};	3097	my $anims = $facedata->{animinfo};
2643		3098
2644	while (my ($anim, $info) = each %$anims) {	3099	while (my ($anim, $info) = each %$anims) {
2645	cf::anim::set $anim, $info->{frames}, $info->{facings};	3100	cf::anim::set $anim, $info->{frames}, $info->{facings};
2646	Coro::cede;	3101	cf::cede_to_tick;
2647	}	3102	}
2648		3103
2649	cf::anim::invalidate_all; # d'oh	3104	cf::anim::invalidate_all; # d'oh
2650	}	3105	}
2651		3106
		3107	{
		3108	# TODO: for gcfclient pleasure, we should give resources
		3109	# that gcfclient doesn't grok a >10000 face index.
		3110	my $res = $facedata->{resource};
		3111
		3112	my $soundconf = delete $res->{"res/sound.conf"};
		3113
		3114	while (my ($name, $info) = each %$res) {
		3115	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3116	my $data;
		3117
		3118	if ($info->{type} & 1) {
		3119	# prepend meta info
		3120
		3121	my $meta = $enc->encode ({
		3122	name => $name,
		3123	%{ $info->{meta} || {} },
		3124	});
		3125
		3126	$data = pack "(w/a*)*", $meta, $info->{data};
		3127	} else {
		3128	$data = $info->{data};
		3129	}
		3130
		3131	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3132	cf::face::set_type $idx, $info->{type};
		3133
		3134	cf::cede_to_tick;
		3135	}
		3136
		3137	if ($soundconf) {
		3138	$soundconf = $enc->decode (delete $soundconf->{data});
		3139
		3140	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3141	my $sound = $soundconf->{compat}[$_]
		3142	or next;
		3143
		3144	my $face = cf::face::find "sound/$sound->[1]";
		3145	cf::sound::set $sound->[0] => $face;
		3146	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3147	}
		3148
		3149	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3150	my $face = cf::face::find "sound/$v";
		3151	cf::sound::set $k => $face;
		3152	}
		3153	}
		3154	}
		3155
2652	1	3156	1
2653	}	3157	}
2654		3158
		3159	register_exticmd fx_want => sub {
		3160	my ($ns, $want) = @_;
		3161
		3162	while (my ($k, $v) = each %$want) {
		3163	$ns->fx_want ($k, $v);
		3164	}
		3165	};
		3166
2655	sub reload_regions {	3167	sub reload_regions {
		3168	# HACK to clear player env face cache, we need some signal framework
		3169	# for this (global event?)
		3170	%ext::player_env::MUSIC_FACE_CACHE = ();
		3171
2656	load_resource_file "$MAPDIR/regions"	3172	load_resource_file "$MAPDIR/regions"
2657	or die "unable to load regions file\n";	3173	or die "unable to load regions file\n";
		3174
		3175	for (cf::region::list) {
		3176	$_->{match} = qr/$_->{match}/
		3177	if exists $_->{match};
		3178	}
2658	}	3179	}
2659		3180
2660	sub reload_facedata {	3181	sub reload_facedata {
2661	load_facedata "$DATADIR/facedata"	3182	load_facedata "$DATADIR/facedata"
2662	or die "unable to load facedata\n";	3183	or die "unable to load facedata\n";
2663	}	3184	}
2664		3185
2665	sub reload_archetypes {	3186	sub reload_archetypes {
		3187	load_resource_file "$DATADIR/archetypes"
		3188	or die "unable to load archetypes\n";
		3189	#d# NEED to laod twice to resolve forward references
		3190	# this really needs to be done in an extra post-pass
		3191	# (which needs to be synchronous, so solve it differently)
2666	load_resource_file "$DATADIR/archetypes"	3192	load_resource_file "$DATADIR/archetypes"
2667	or die "unable to load archetypes\n";	3193	or die "unable to load archetypes\n";
2668	}	3194	}
2669		3195
2670	sub reload_treasures {	3196	sub reload_treasures {
…		…
2686		3212
2687	sub init {	3213	sub init {
2688	reload_resources;	3214	reload_resources;
2689	}	3215	}
2690		3216
2691	sub cfg_load {	3217	sub reload_config {
2692	open my $fh, "<:utf8", "$CONFDIR/config"	3218	open my $fh, "<:utf8", "$CONFDIR/config"
2693	or return;	3219	or return;
2694		3220
2695	local $/;	3221	local $/;
2696	*CFG = YAML::Syck::Load <$fh>;	3222	*CFG = YAML::Syck::Load <$fh>;
…		…
2712	sub main {	3238	sub main {
2713	# we must not ever block the main coroutine	3239	# we must not ever block the main coroutine
2714	local $Coro::idle = sub {	3240	local $Coro::idle = sub {
2715	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3241	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2716	(async {	3242	(async {
		3243	$Coro::current->{desc} = "IDLE BUG HANDLER";
2717	Event::one_event;	3244	Event::one_event;
2718	})->prio (Coro::PRIO_MAX);	3245	})->prio (Coro::PRIO_MAX);
2719	};	3246	};
2720		3247
2721	cfg_load;	3248	reload_config;
2722	db_init;	3249	db_init;
2723	load_extensions;	3250	load_extensions;
2724		3251
2725	$TICK_WATCHER->start;	3252	$TICK_WATCHER->start;
2726	Event::loop;	3253	Event::loop;
…		…
2793	# and maps saved/destroyed asynchronously.	3320	# and maps saved/destroyed asynchronously.
2794	warn "begin emergency player save\n";	3321	warn "begin emergency player save\n";
2795	for my $login (keys %cf::PLAYER) {	3322	for my $login (keys %cf::PLAYER) {
2796	my $pl = $cf::PLAYER{$login} or next;	3323	my $pl = $cf::PLAYER{$login} or next;
2797	$pl->valid or next;	3324	$pl->valid or next;
		3325	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2798	$pl->save;	3326	$pl->save;
2799	}	3327	}
2800	warn "end emergency player save\n";	3328	warn "end emergency player save\n";
2801		3329
2802	warn "begin emergency map save\n";	3330	warn "begin emergency map save\n";
…		…
2850		3378
2851	warn "flushing outstanding aio requests";	3379	warn "flushing outstanding aio requests";
2852	for (;;) {	3380	for (;;) {
2853	BDB::flush;	3381	BDB::flush;
2854	IO::AIO::flush;	3382	IO::AIO::flush;
2855	Coro::cede;	3383	Coro::cede_notself;
2856	last unless IO::AIO::nreqs || BDB::nreqs;	3384	last unless IO::AIO::nreqs || BDB::nreqs;
2857	warn "iterate...";	3385	warn "iterate...";
2858	}	3386	}
2859		3387
2860	++$RELOAD;	3388	++$RELOAD;
…		…
2864	%EXT_CORO = ();	3392	%EXT_CORO = ();
2865		3393
2866	warn "removing commands";	3394	warn "removing commands";
2867	%COMMAND = ();	3395	%COMMAND = ();
2868		3396
2869	warn "removing ext commands";	3397	warn "removing ext/exti commands";
2870	%EXTCMD = ();	3398	%EXTCMD = ();
		3399	%EXTICMD = ();
2871		3400
2872	warn "unloading/nuking all extensions";	3401	warn "unloading/nuking all extensions";
2873	for my $pkg (@EXTS) {	3402	for my $pkg (@EXTS) {
2874	warn "... unloading $pkg";	3403	warn "... unloading $pkg";
2875		3404
…		…
2918	warn "reloading cf.pm";	3447	warn "reloading cf.pm";
2919	require cf;	3448	require cf;
2920	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3449	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2921		3450
2922	warn "loading config and database again";	3451	warn "loading config and database again";
2923	cf::cfg_load;	3452	cf::reload_config;
2924		3453
2925	warn "loading extensions";	3454	warn "loading extensions";
2926	cf::load_extensions;	3455	cf::load_extensions;
2927		3456
2928	warn "reattaching attachments to objects/players";	3457	warn "reattaching attachments to objects/players";
…		…
2964	register_command "reload" => sub {	3493	register_command "reload" => sub {
2965	my ($who, $arg) = @_;	3494	my ($who, $arg) = @_;
2966		3495
2967	if ($who->flag (FLAG_WIZ)) {	3496	if ($who->flag (FLAG_WIZ)) {
2968	$who->message ("reloading server.");	3497	$who->message ("reloading server.");
		3498	async {
		3499	$Coro::current->{desc} = "perl_reload";
2969	async { reload_perl };	3500	reload_perl;
		3501	};
2970	}	3502	}
2971	};	3503	};
2972		3504
2973	unshift @INC, $LIBDIR;	3505	unshift @INC, $LIBDIR;
2974		3506
…		…
2993	my $signal = new Coro::Signal;	3525	my $signal = new Coro::Signal;
2994	push @WAIT_FOR_TICK_BEGIN, $signal;	3526	push @WAIT_FOR_TICK_BEGIN, $signal;
2995	$signal->wait;	3527	$signal->wait;
2996	}	3528	}
2997		3529
2998	my $min = 1e6;#d#
2999	my $avg = 10;
3000	$TICK_WATCHER = Event->timer (	3530	$TICK_WATCHER = Event->timer (
3001	reentrant => 0,	3531	reentrant => 0,
3002	parked => 1,	3532	parked => 1,
3003	prio => 0,	3533	prio => 0,
3004	at => $NEXT_TICK || $TICK,	3534	at => $NEXT_TICK || $TICK,
…		…
3012		3542
3013	$NOW = $tick_start = Event::time;	3543	$NOW = $tick_start = Event::time;
3014		3544
3015	cf::server_tick; # one server iteration	3545	cf::server_tick; # one server iteration
3016		3546
3017	0 && sync_job {#d#
3018	for(1..10) {
3019	my $t = Event::time;
3020	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3021	or die;
3022
3023	$map->width (50);
3024	$map->height (50);
3025	$map->alloc;
3026	$map->_load_objects ("/tmp/x.map", 1);
3027	my $t = Event::time - $t;
3028
3029	#next unless $t < 0.0013;#d#
3030	if ($t < $min) {
3031	$min = $t;
3032	}
3033	$avg = $avg * 0.99 + $t * 0.01;
3034	}
3035	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3036	exit 0;
3037	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3038	};
3039
3040	$RUNTIME += $TICK;	3547	$RUNTIME += $TICK;
3041	$NEXT_TICK += $TICK;	3548	$NEXT_TICK += $TICK;
3042		3549
3043	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3550	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3044	$NEXT_RUNTIME_WRITE = $NOW + 10;	3551	$NEXT_RUNTIME_WRITE = $NOW + 10;
3045	Coro::async_pool {	3552	Coro::async_pool {
		3553	$Coro::current->{desc} = "runtime saver";
3046	write_runtime	3554	write_runtime
3047	or warn "ERROR: unable to write runtime file: $!";	3555	or warn "ERROR: unable to write runtime file: $!";
3048	};	3556	};
3049	}	3557	}
3050		3558
3051	# my $AFTER = Event::time;
3052	# warn $AFTER - $NOW;#d#
3053
3054	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3559	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3055	$sig->send;	3560	$sig->send;
3056	}	3561	}
3057	while (my $sig = shift @WAIT_FOR_TICK) {	3562	while (my $sig = shift @WAIT_FOR_TICK) {
3058	$sig->send;	3563	$sig->send;
…		…
3068		3573
3069	$LOAD = ($NOW - $tick_start) / $TICK;	3574	$LOAD = ($NOW - $tick_start) / $TICK;
3070	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3575	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3071		3576
3072	_post_tick;	3577	_post_tick;
3073
3074
3075	},	3578	},
3076	);	3579	);
3077		3580
3078	{	3581	{
		3582	BDB::min_parallel 8;
3079	BDB::max_poll_time $TICK * 0.1;	3583	BDB::max_poll_time $TICK * 0.1;
3080	$BDB_POLL_WATCHER = Event->io (	3584	$BDB_POLL_WATCHER = Event->io (
3081	reentrant => 0,	3585	reentrant => 0,
3082	fd => BDB::poll_fileno,	3586	fd => BDB::poll_fileno,
3083	poll => 'r',	3587	poll => 'r',
3084	prio => 0,	3588	prio => 0,
3085	data => WF_AUTOCANCEL,	3589	data => WF_AUTOCANCEL,
3086	cb => \&BDB::poll_cb,	3590	cb => \&BDB::poll_cb,
3087	);	3591	);
3088	BDB::min_parallel 8;
3089		3592
3090	BDB::set_sync_prepare {	3593	BDB::set_sync_prepare {
3091	my $status;	3594	my $status;
3092	my $current = $Coro::current;	3595	my $current = $Coro::current;
3093	(	3596	(
…		…
3102	)	3605	)
3103	};	3606	};
3104		3607
3105	unless ($DB_ENV) {	3608	unless ($DB_ENV) {
3106	$DB_ENV = BDB::db_env_create;	3609	$DB_ENV = BDB::db_env_create;
		3610	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3611	| BDB::LOG_AUTOREMOVE, 1);
		3612	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3613	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3107		3614
3108	cf::sync_job {	3615	cf::sync_job {
3109	eval {	3616	eval {
3110	BDB::db_env_open	3617	BDB::db_env_open
3111	$DB_ENV,	3618	$DB_ENV,
…		…
3113	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3620	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3114	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3621	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3115	0666;	3622	0666;
3116		3623
3117	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3624	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3118
3119	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3120	$DB_ENV->set_lk_detect;
3121	};	3625	};
3122		3626
3123	cf::cleanup "db_env_open(db): $@" if $@;	3627	cf::cleanup "db_env_open(db): $@" if $@;
3124	};	3628	};
3125	}	3629	}
		3630
		3631	$BDB_DEADLOCK_WATCHER = Event->timer (
		3632	after => 3,
		3633	interval => 1,
		3634	hard => 1,
		3635	prio => 0,
		3636	data => WF_AUTOCANCEL,
		3637	cb => sub {
		3638	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3639	},
		3640	);
		3641	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3642	after => 11,
		3643	interval => 60,
		3644	hard => 1,
		3645	prio => 0,
		3646	data => WF_AUTOCANCEL,
		3647	cb => sub {
		3648	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3649	},
		3650	);
		3651	$BDB_TRICKLE_WATCHER = Event->timer (
		3652	after => 5,
		3653	interval => 10,
		3654	hard => 1,
		3655	prio => 0,
		3656	data => WF_AUTOCANCEL,
		3657	cb => sub {
		3658	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3659	},
		3660	);
3126	}	3661	}
3127		3662
3128	{	3663	{
3129	IO::AIO::min_parallel 8;	3664	IO::AIO::min_parallel 8;
3130		3665
…		…
3133	$AIO_POLL_WATCHER = Event->io (	3668	$AIO_POLL_WATCHER = Event->io (
3134	reentrant => 0,	3669	reentrant => 0,
3135	data => WF_AUTOCANCEL,	3670	data => WF_AUTOCANCEL,
3136	fd => IO::AIO::poll_fileno,	3671	fd => IO::AIO::poll_fileno,
3137	poll => 'r',	3672	poll => 'r',
3138	prio => 6,	3673	prio => 0,
3139	cb => \&IO::AIO::poll_cb,	3674	cb => \&IO::AIO::poll_cb,
3140	);	3675	);
3141	}	3676	}
3142		3677
3143	my $_log_backtrace;	3678	my $_log_backtrace;
…		…
3149		3684
3150	# limit the # of concurrent backtraces	3685	# limit the # of concurrent backtraces
3151	if ($_log_backtrace < 2) {	3686	if ($_log_backtrace < 2) {
3152	++$_log_backtrace;	3687	++$_log_backtrace;
3153	async {	3688	async {
		3689	$Coro::current->{desc} = "abt $msg";
		3690
3154	my @bt = fork_call {	3691	my @bt = fork_call {
3155	@addr = map { sprintf "%x", $_ } @addr;	3692	@addr = map { sprintf "%x", $_ } @addr;
3156	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3693	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3157	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	3694	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3158	or die "addr2line: $!";	3695	or die "addr2line: $!";

Diff Legend

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