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.292 by root, Tue Jul 3 00:54:57 2007 UTC vs.
Revision 1.395 by root, Sat Nov 10 22:41:59 2007 UTC

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

Diff Legend

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