ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/cf.schmorp.de/server/lib/cf.pm

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.301 by root, Tue Jul 10 07:01:51 2007 UTC vs.
Revision 1.387 by root, Mon Oct 15 23:49:10 2007 UTC

…		…
4	use strict;	4	use strict;
5		5
6	use Symbol;	6	use Symbol;
7	use List::Util;	7	use List::Util;
8	use Socket;	8	use Socket;
9	use Storable;
10	use Event;	9	use Event;
11	use Opcode;	10	use Opcode;
12	use Safe;	11	use Safe;
13	use Safe::Hole;	12	use Safe::Hole;
		13	use Storable ();
14		14
15	use Coro 3.61 ();	15	use Coro 4.1 ();
16	use Coro::State;	16	use Coro::State;
17	use Coro::Handle;	17	use Coro::Handle;
18	use Coro::Event;	18	use Coro::Event;
19	use Coro::Timer;	19	use Coro::Timer;
20	use Coro::Signal;	20	use Coro::Signal;
21	use Coro::Semaphore;	21	use Coro::Semaphore;
22	use Coro::AIO;	22	use Coro::AIO;
23	use Coro::Storable;	23	use Coro::Storable;
		24	use Coro::Util ();
24		25
25	use JSON::XS 1.4 ();	26	use JSON::XS ();
26	use BDB ();	27	use BDB ();
27	use Data::Dumper;	28	use Data::Dumper;
28	use Digest::MD5;	29	use Digest::MD5;
29	use Fcntl;	30	use Fcntl;
30	use YAML::Syck ();	31	use YAML::Syck ();
31	use IO::AIO 2.32 ();	32	use IO::AIO 2.51 ();
32	use Time::HiRes;	33	use Time::HiRes;
33	use Compress::LZF;	34	use Compress::LZF;
		35	use Digest::MD5 ();
34		36
35	# configure various modules to our taste	37	# configure various modules to our taste
36	#	38	#
37	$Storable::canonical = 1; # reduce rsync transfers	39	$Storable::canonical = 1; # reduce rsync transfers
38	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	40	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
…		…
78	our $NEXT_TICK;	80	our $NEXT_TICK;
79	our $NOW;	81	our $NOW;
80	our $USE_FSYNC = 1; # use fsync to write maps - default off	82	our $USE_FSYNC = 1; # use fsync to write maps - default off
81		83
82	our $BDB_POLL_WATCHER;	84	our $BDB_POLL_WATCHER;
		85	our $BDB_DEADLOCK_WATCHER;
		86	our $BDB_CHECKPOINT_WATCHER;
		87	our $BDB_TRICKLE_WATCHER;
83	our $DB_ENV;	88	our $DB_ENV;
84		89
85	our %CFG;	90	our %CFG;
86		91
87	our $UPTIME; $UPTIME ||= time;	92	our $UPTIME; $UPTIME ||= time;
88	our $RUNTIME;	93	our $RUNTIME;
89		94
90	our %PLAYER; # all users	95	our (%PLAYER, %PLAYER_LOADING); # all users
91	our %MAP; # all maps	96	our (%MAP, %MAP_LOADING ); # all maps
92	our $LINK_MAP; # the special {link} map, which is always available	97	our $LINK_MAP; # the special {link} map, which is always available
93		98
94	# used to convert map paths into valid unix filenames by replacing / by ∕	99	# used to convert map paths into valid unix filenames by replacing / by ∕
95	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	100	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96		101
…		…
166		171
167	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	172	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168	returns directly I<after> the tick processing (and consequently, can only wake one process	173	returns directly I<after> the tick processing (and consequently, can only wake one process
169	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	174	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170		175
		176	=item @cf::INVOKE_RESULTS
		177
		178	This array contains the results of the last C<invoke ()> call. When
		179	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		180	that call.
		181
171	=back	182	=back
172		183
173	=cut	184	=cut
174		185
175	BEGIN {	186	BEGIN {
…		…
179	$msg .= "\n"	190	$msg .= "\n"
180	unless $msg =~ /\n$/;	191	unless $msg =~ /\n$/;
181		192
182	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	193	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183		194
184	utf8::encode $msg;
185	LOG llevError, $msg;	195	LOG llevError, $msg;
186	};	196	};
187	}	197	}
188		198
189	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	199	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
264	Wait until the given lock is available and then acquires it and returns	274	Wait until the given lock is available and then acquires it and returns
265	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	275	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
266	for example when the coroutine gets canceled), the lock is automatically	276	for example when the coroutine gets canceled), the lock is automatically
267	returned.	277	returned.
268		278
		279	Locks are *not* recursive, locking from the same coro twice results in a
		280	deadlocked coro.
		281
269	Lock names should begin with a unique identifier (for example, cf::map::find	282	Lock names should begin with a unique identifier (for example, cf::map::find
270	uses map_find and cf::map::load uses map_load).	283	uses map_find and cf::map::load uses map_load).
271		284
272	=item $locked = cf::lock_active $string	285	=item $locked = cf::lock_active $string
273		286
274	Return true if the lock is currently active, i.e. somebody has locked it.	287	Return true if the lock is currently active, i.e. somebody has locked it.
275		288
276	=cut	289	=cut
277		290
278	our %LOCK;	291	our %LOCK;
		292	our %LOCKER;#d#
279		293
280	sub lock_wait($) {	294	sub lock_wait($) {
281	my ($key) = @_;	295	my ($key) = @_;
		296
		297	if ($LOCKER{$key} == $Coro::current) {#d#
		298	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		299	return;#d#
		300	}#d#
282		301
283	# wait for lock, if any	302	# wait for lock, if any
284	while ($LOCK{$key}) {	303	while ($LOCK{$key}) {
285	push @{ $LOCK{$key} }, $Coro::current;	304	push @{ $LOCK{$key} }, $Coro::current;
286	Coro::schedule;	305	Coro::schedule;
…		…
292		311
293	# wait, to be sure we are not locked	312	# wait, to be sure we are not locked
294	lock_wait $key;	313	lock_wait $key;
295		314
296	$LOCK{$key} = [];	315	$LOCK{$key} = [];
		316	$LOCKER{$key} = $Coro::current;#d#
297		317
298	Coro::guard {	318	Coro::guard {
		319	delete $LOCKER{$key};#d#
299	# wake up all waiters, to be on the safe side	320	# wake up all waiters, to be on the safe side
300	$_->ready for @{ delete $LOCK{$key} };	321	$_->ready for @{ delete $LOCK{$key} };
301	}	322	}
302	}	323	}
303		324
…		…
315	};	336	};
316	$TICK_WATCHER->stop;	337	$TICK_WATCHER->stop;
317	$guard	338	$guard
318	}	339	}
319		340
		341	=item cf::get_slot $time[, $priority[, $name]]
		342
		343	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		344	This call blocks and returns only when you have at least C<$time> seconds
		345	of cpu time till the next tick. The slot is only valid till the next cede.
		346
		347	The optional C<$name> can be used to identify the job to run. It might be
		348	used for statistical purposes and should identify the same time-class.
		349
		350	Useful for short background jobs.
		351
		352	=cut
		353
		354	our @SLOT_QUEUE;
		355	our $SLOT_QUEUE;
		356
		357	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		358	$SLOT_QUEUE = Coro::async {
		359	$Coro::current->desc ("timeslot manager");
		360
		361	my $signal = new Coro::Signal;
		362
		363	while () {
		364	next_job:
		365	my $avail = cf::till_tick;
		366	if ($avail > 0.01) {
		367	for (0 .. $#SLOT_QUEUE) {
		368	if ($SLOT_QUEUE[$_][0] < $avail) {
		369	my $job = splice @SLOT_QUEUE, $_, 1, ();
		370	$job->[2]->send;
		371	Coro::cede;
		372	goto next_job;
		373	}
		374	}
		375	}
		376
		377	if (@SLOT_QUEUE) {
		378	# we do not use wait_for_tick() as it returns immediately when tick is inactive
		379	push @cf::WAIT_FOR_TICK, $signal;
		380	$signal->wait;
		381	} else {
		382	Coro::schedule;
		383	}
		384	}
		385	};
		386
		387	sub get_slot($;$$) {
		388	my ($time, $pri, $name) = @_;
		389
		390	$time = $TICK * .6 if $time > $TICK * .6;
		391	my $sig = new Coro::Signal;
		392
		393	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		394	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		395	$SLOT_QUEUE->ready;
		396	$sig->wait;
		397	}
		398
320	=item cf::async { BLOCK }	399	=item cf::async { BLOCK }
321		400
322	Currently the same as Coro::async_pool, meaning you cannot use	401	Currently the same as Coro::async_pool, meaning you cannot use
323	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only	402	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
324	thing you are allowed to do is call C<prio> on it.	403	thing you are allowed to do is call C<prio> on it.
…		…
348	my $time = Event::time;	427	my $time = Event::time;
349		428
350	# this is the main coro, too bad, we have to block	429	# this is the main coro, too bad, we have to block
351	# till the operation succeeds, freezing the server :/	430	# till the operation succeeds, freezing the server :/
352		431
		432	LOG llevError, Carp::longmess "sync job";#d#
		433
353	# TODO: use suspend/resume instead	434	# TODO: use suspend/resume instead
354	# (but this is cancel-safe)	435	# (but this is cancel-safe)
355	my $freeze_guard = freeze_mainloop;	436	my $freeze_guard = freeze_mainloop;
356		437
357	my $busy = 1;	438	my $busy = 1;
358	my @res;	439	my @res;
359		440
360	(async {	441	(async {
		442	$Coro::current->desc ("sync job coro");
361	@res = eval { $job->() };	443	@res = eval { $job->() };
362	warn $@ if $@;	444	warn $@ if $@;
363	undef $busy;	445	undef $busy;
364	})->prio (Coro::PRIO_MAX);	446	})->prio (Coro::PRIO_MAX);
365		447
366	while ($busy) {	448	while ($busy) {
		449	if (Coro::nready) {
		450	Coro::cede_notself;
		451	} else {
367	Coro::cede or Event::one_event;	452	Event::one_event;
		453	}
368	}	454	}
369		455
370	$time = Event::time - $time;	456	$time = Event::time - $time;
371		457
372	LOG llevError | logBacktrace, Carp::longmess "long sync job"	458	LOG llevError | logBacktrace, Carp::longmess "long sync job"
…		…
409	Coro::Storable. May, of course, block. Note that the executed sub may	495	Coro::Storable. May, of course, block. Note that the executed sub may
410	never block itself or use any form of Event handling.	496	never block itself or use any form of Event handling.
411		497
412	=cut	498	=cut
413		499
414	sub _store_scalar {
415	open my $fh, ">", \my $buf
416	or die "fork_call: cannot open fh-to-buf in child : $!";
417	Storable::store_fd $_[0], $fh;
418	close $fh;
419
420	$buf
421	}
422
423	sub fork_call(&@) {	500	sub fork_call(&@) {
424	my ($cb, @args) = @_;	501	my ($cb, @args) = @_;
425		502
426	# 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,
427	# or die "socketpair: $!";	504	# otherwise perl prematurely frees the stuff :/
428	pipe my $fh1, my $fh2	505	# TODO: investigate and fix (likely this will be rather laborious)
429	or die "pipe: $!";
430		506
431	if (my $pid = fork) {	507	my @res = Coro::Util::fork_eval {
432	close $fh2;
433
434	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
435	warn "pst<$res>" unless $res =~ /^pst/;
436	$res = Coro::Storable::thaw $res;
437
438	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
439
440	Carp::confess $$res unless "ARRAY" eq ref $res;
441
442	return wantarray ? @$res : $res->[-1];
443	} else {
444	reset_signals;	508	reset_signals;
445	local $SIG{__WARN__};	509	&$cb
446	local $SIG{__DIE__};	510	}, @args;
447	# just in case, this hack effectively disables event
448	# in the child. cleaner and slower would be canceling all watchers,
449	# but this works for the time being.
450	local $Coro::idle;
451	$Coro::current->prio (Coro::PRIO_MAX);
452		511
453	eval {	512	wantarray ? @res : $res[-1]
454	close $fh1;
455
456	my @res = eval { $cb->(@args) };
457
458	syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
459	close $fh2;
460	};
461
462	warn $@ if $@;
463	_exit 0;
464	}
465	}	513	}
466		514
467	=item $value = cf::db_get $family => $key	515	=item $value = cf::db_get $family => $key
468		516
469	Returns a single value from the environment database.	517	Returns a single value from the environment database.
…		…
471	=item cf::db_put $family => $key => $value	519	=item cf::db_put $family => $key => $value
472		520
473	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
474	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).
475		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
476	=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	}
477		547
478	our $DB;	548	our $DB;
479		549
480	sub db_init {	550	sub db_init {
481	unless ($DB) {
482	$DB = BDB::db_create $DB_ENV;
483
484	cf::sync_job {	551	cf::sync_job {
485	eval {	552	$DB ||= db_table "db";
486	$DB->set_flags (BDB::CHKSUM);
487
488	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
489	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
490	cf::cleanup "db_open(db): $!" if $!;
491	};
492	cf::cleanup "db_open(db): $@" if $@;
493	};
494	}	553	};
495	}	554	}
496		555
497	sub db_get($$) {	556	sub db_get($$) {
498	my $key = "$_[0]/$_[1]";	557	my $key = "$_[0]/$_[1]";
499		558
…		…
549	if (1) {	608	if (1) {
550	$md5 =	609	$md5 =
551	join "\x00",	610	join "\x00",
552	$processversion,	611	$processversion,
553	map {	612	map {
554	Coro::cede;	613	cf::cede_to_tick;
555	($src->[$_], Digest::MD5::md5_hex $data[$_])	614	($src->[$_], Digest::MD5::md5_hex $data[$_])
556	} 0.. $#$src;	615	} 0.. $#$src;
557		616
558		617
559	my $dbmd5 = db_get cache => "$id/md5";	618	my $dbmd5 = db_get cache => "$id/md5";
…		…
865	";	924	";
866	die if $@;	925	die if $@;
867	}	926	}
868		927
869	our $override;	928	our $override;
870	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?
871		930
872	sub override {	931	sub override {
873	$override = 1;	932	$override = 1;
874	@invoke_results = ();	933	@INVOKE_RESULTS = (@_);
875	}	934	}
876		935
877	sub do_invoke {	936	sub do_invoke {
878	my $event = shift;	937	my $event = shift;
879	my $callbacks = shift;	938	my $callbacks = shift;
880		939
881	@invoke_results = ();	940	@INVOKE_RESULTS = ();
882		941
883	local $override;	942	local $override;
884		943
885	for (@$callbacks) {	944	for (@$callbacks) {
886	eval { &{$_->[1]} };	945	eval { &{$_->[1]} };
…		…
903		962
904	Generate an object-specific event with the given arguments.	963	Generate an object-specific event with the given arguments.
905		964
906	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
907	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
908	results (if you must, access C<@cf::invoke_results> directly).	967	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
909		968
910	=back	969	=back
911		970
912	=cut	971	=cut
913		972
914	#############################################################################	973	#############################################################################
915	# 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	}
916		1017
917	sub reattach {	1018	sub reattach {
918	# basically do the same as instantiate, without calling instantiate	1019	# basically do the same as instantiate, without calling instantiate
919	my ($obj) = @_;	1020	my ($obj) = @_;
920		1021
…		…
967	sub object_freezer_save {	1068	sub object_freezer_save {
968	my ($filename, $rdata, $objs) = @_;	1069	my ($filename, $rdata, $objs) = @_;
969		1070
970	sync_job {	1071	sync_job {
971	if (length $$rdata) {	1072	if (length $$rdata) {
		1073	utf8::decode (my $decname = $filename);
972	warn sprintf "saving %s (%d,%d)\n",	1074	warn sprintf "saving %s (%d,%d)\n",
973	$filename, length $$rdata, scalar @$objs;	1075	$decname, length $$rdata, scalar @$objs;
974		1076
975	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1077	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
976	chmod SAVE_MODE, $fh;	1078	chmod SAVE_MODE, $fh;
977	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1079	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
978	aio_fsync $fh if $cf::USE_FSYNC;	1080	aio_fsync $fh if $cf::USE_FSYNC;
979	close $fh;	1081	close $fh;
980		1082
981	if (@$objs) {	1083	if (@$objs) {
982	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) {
983	chmod SAVE_MODE, $fh;	1085	chmod SAVE_MODE, $fh;
984	my $data = Storable::nfreeze { version => 1, objs => $objs };	1086	my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
985	aio_write $fh, 0, (length $data), $data, 0;	1087	aio_write $fh, 0, (length $data), $data, 0;
986	aio_fsync $fh if $cf::USE_FSYNC;	1088	aio_fsync $fh if $cf::USE_FSYNC;
987	close $fh;	1089	close $fh;
988	aio_rename "$filename.pst~", "$filename.pst";	1090	aio_rename "$filename.pst~", "$filename.pst";
989	}	1091	}
…		…
997	}	1099	}
998	} else {	1100	} else {
999	aio_unlink $filename;	1101	aio_unlink $filename;
1000	aio_unlink "$filename.pst";	1102	aio_unlink "$filename.pst";
1001	}	1103	}
1002	}	1104	};
1003	}	1105	}
1004		1106
1005	sub object_freezer_as_string {	1107	sub object_freezer_as_string {
1006	my ($rdata, $objs) = @_;	1108	my ($rdata, $objs) = @_;
1007		1109
…		…
1019	or return;	1121	or return;
1020		1122
1021	unless (aio_stat "$filename.pst") {	1123	unless (aio_stat "$filename.pst") {
1022	(aio_load "$filename.pst", $av) >= 0	1124	(aio_load "$filename.pst", $av) >= 0
1023	or return;	1125	or return;
1024	$av = eval { (Storable::thaw $av)->{objs} };
1025	}
1026		1126
		1127	my $st = eval { Coro::Storable::thaw $av }
		1128	|| eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
		1129	$av = $st->{objs};
		1130	}
		1131
		1132	utf8::decode (my $decname = $filename);
1027	warn sprintf "loading %s (%d)\n",	1133	warn sprintf "loading %s (%d,%d)\n",
1028	$filename, length $data, scalar @{$av || []};	1134	$decname, length $data, scalar @{$av || []};
		1135
1029	return ($data, $av);	1136	($data, $av)
1030	}	1137	}
1031		1138
1032	=head2 COMMAND CALLBACKS	1139	=head2 COMMAND CALLBACKS
1033		1140
1034	=over 4	1141	=over 4
…		…
1107	my ($pl, $buf) = @_;	1214	my ($pl, $buf) = @_;
1108		1215
1109	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1216	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1110		1217
1111	if (ref $msg) {	1218	if (ref $msg) {
		1219	my ($type, $reply, @payload) =
		1220	"ARRAY" eq ref $msg
		1221	? @$msg
		1222	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1223
		1224	my @reply;
		1225
1112	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1226	if (my $cb = $EXTCMD{$type}) {
1113	if (my %reply = $cb->($pl, $msg)) {	1227	@reply = $cb->($pl, @payload);
1114	$pl->ext_reply ($msg->{msgid}, %reply);
1115	}
1116	}	1228	}
		1229
		1230	$pl->ext_reply ($reply, @reply)
		1231	if $reply;
		1232
1117	} else {	1233	} else {
1118	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1234	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1119	}	1235	}
1120		1236
1121	cf::override;	1237	cf::override;
…		…
1211		1327
1212	=head3 cf::player	1328	=head3 cf::player
1213		1329
1214	=over 4	1330	=over 4
1215		1331
		1332	=item cf::player::num_playing
		1333
		1334	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1335
		1336	=cut
		1337
		1338	sub num_playing {
		1339	scalar grep
		1340	$_->ob->map
		1341	&& !$_->hidden
		1342	&& !$_->ob->flag (cf::FLAG_WIZ),
		1343	cf::player::list
		1344	}
		1345
1216	=item cf::player::find $login	1346	=item cf::player::find $login
1217		1347
1218	Returns the given player object, loading it if necessary (might block).	1348	Returns the given player object, loading it if necessary (might block).
1219		1349
1220	=cut	1350	=cut
…		…
1255	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1385	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1256	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1386	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1257	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1387	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1258	aio_unlink +(playerdir $login) . "/$login.pl";	1388	aio_unlink +(playerdir $login) . "/$login.pl";
1259		1389
1260	my $pl = load_pl path $login	1390	my $f = new_from_file cf::object::thawer path $login
1261	or return;	1391	or return;
		1392
		1393	my $pl = cf::player::load_pl $f
		1394	or return;
		1395	local $cf::PLAYER_LOADING{$login} = $pl;
		1396	$f->resolve_delayed_derefs;
1262	$cf::PLAYER{$login} = $pl	1397	$cf::PLAYER{$login} = $pl
1263	}	1398	}
1264	}	1399	}
1265	}	1400	}
1266		1401
…		…
1276		1411
1277	aio_mkdir playerdir $pl, 0770;	1412	aio_mkdir playerdir $pl, 0770;
1278	$pl->{last_save} = $cf::RUNTIME;	1413	$pl->{last_save} = $cf::RUNTIME;
1279		1414
1280	$pl->save_pl ($path);	1415	$pl->save_pl ($path);
1281	Coro::cede;	1416	cf::cede_to_tick;
1282	}	1417	}
1283		1418
1284	sub new($) {	1419	sub new($) {
1285	my ($login) = @_;	1420	my ($login) = @_;
1286		1421
…		…
1290	$self->{deny_save} = 1;	1425	$self->{deny_save} = 1;
1291		1426
1292	$cf::PLAYER{$login} = $self;	1427	$cf::PLAYER{$login} = $self;
1293		1428
1294	$self	1429	$self
		1430	}
		1431
		1432	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1433
		1434	=cut
		1435
		1436	sub send_msg {
		1437	my $ns = shift->ns
		1438	or return;
		1439	$ns->send_msg (@_);
1295	}	1440	}
1296		1441
1297	=item $pl->quit_character	1442	=item $pl->quit_character
1298		1443
1299	Nukes the player without looking back. If logged in, the connection will	1444	Nukes the player without looking back. If logged in, the connection will
…		…
1354	or return [];	1499	or return [];
1355		1500
1356	my @logins;	1501	my @logins;
1357		1502
1358	for my $login (@$dirs) {	1503	for my $login (@$dirs) {
		1504	my $path = path $login;
		1505
		1506	# a .pst is a dead give-away for a valid player
		1507	unless (-e "$path.pst") {
1359	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1508	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1360	aio_read $fh, 0, 512, my $buf, 0 or next;	1509	aio_read $fh, 0, 512, my $buf, 0 or next;
1361	$buf !~ /^password -------------$/m or next; # official not-valid tag	1510	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1511	}
1362		1512
1363	utf8::decode $login;	1513	utf8::decode $login;
1364	push @logins, $login;	1514	push @logins, $login;
1365	}	1515	}
1366		1516
…		…
1404	sub expand_cfpod {	1554	sub expand_cfpod {
1405	((my $self), (local $_)) = @_;	1555	((my $self), (local $_)) = @_;
1406		1556
1407	# escape & and <	1557	# escape & and <
1408	s/&/&amp;/g;	1558	s/&/&amp;/g;
1409	s/(?<![BIUGH])</&lt;/g;	1559	s/(?<![BIUGHT])</&lt;/g;
1410		1560
1411	# this is buggy, it needs to properly take care of nested <'s	1561	# this is buggy, it needs to properly take care of nested <'s
1412		1562
1413	1 while	1563	1 while
1414	# replace B<>, I<>, U<> etc.	1564	# replace B<>, I<>, U<> etc.
1415	s/B<([^\>]*)>/<b>$1<\/b>/	1565	s/B<([^\>]*)>/<b>$1<\/b>/
1416	|| s/I<([^\>]*)>/<i>$1<\/i>/	1566	|| s/I<([^\>]*)>/<i>$1<\/i>/
1417	|| s/U<([^\>]*)>/<u>$1<\/u>/	1567	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1568	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1418	# replace G<male|female> tags	1569	# replace G<male|female> tags
1419	|| s{G<([^>|]*)\|([^>]*)>}{	1570	|| s{G<([^>|]*)\|([^>]*)>}{
1420	$self->gender ? $2 : $1	1571	$self->gender ? $2 : $1
1421	}ge	1572	}ge
1422	# replace H<hint text>	1573	# replace H<hint text>
…		…
1443	sub hintmode {	1594	sub hintmode {
1444	$_[0]{hintmode} = $_[1] if @_ > 1;	1595	$_[0]{hintmode} = $_[1] if @_ > 1;
1445	$_[0]{hintmode}	1596	$_[0]{hintmode}
1446	}	1597	}
1447		1598
1448	=item $player->ext_reply ($msgid, %msg)	1599	=item $player->ext_reply ($msgid, @msg)
1449		1600
1450	Sends an ext reply to the player.	1601	Sends an ext reply to the player.
1451		1602
1452	=cut	1603	=cut
1453		1604
1454	sub ext_reply($$%) {	1605	sub ext_reply($$@) {
1455	my ($self, $id, %msg) = @_;	1606	my ($self, $id, @msg) = @_;
1456		1607
1457	$msg{msgid} = $id;	1608	$self->ns->ext_reply ($id, @msg)
1458	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1459	}	1609	}
1460		1610
1461	=item $player->ext_event ($type, %msg)	1611	=item $player->ext_msg ($type, @msg)
1462		1612
1463	Sends an ext event to the client.	1613	Sends an ext event to the client.
1464		1614
1465	=cut	1615	=cut
1466		1616
1467	sub ext_event($$%) {	1617	sub ext_msg($$@) {
1468	my ($self, $type, %msg) = @_;	1618	my ($self, $type, @msg) = @_;
1469		1619
1470	$self->ns->ext_event ($type, %msg);	1620	$self->ns->ext_msg ($type, @msg);
1471	}	1621	}
1472		1622
1473	=head3 cf::region	1623	=head3 cf::region
1474		1624
1475	=over 4	1625	=over 4
…		…
1488	my ($path) = @_;	1638	my ($path) = @_;
1489		1639
1490	my ($match, $specificity);	1640	my ($match, $specificity);
1491		1641
1492	for my $region (list) {	1642	for my $region (list) {
1493	if ($region->match && $path =~ $region->match) {	1643	if ($region->{match} && $path =~ $region->{match}) {
1494	($match, $specificity) = ($region, $region->specificity)	1644	($match, $specificity) = ($region, $region->specificity)
1495	if $region->specificity > $specificity;	1645	if $region->specificity > $specificity;
1496	}	1646	}
1497	}	1647	}
1498		1648
…		…
1618	$self->init; # pass $1 etc.	1768	$self->init; # pass $1 etc.
1619	return $self;	1769	return $self;
1620	}	1770	}
1621	}	1771	}
1622		1772
1623	Carp::carp "unable to resolve path '$path' (base '$base').";	1773	Carp::cluck "unable to resolve path '$path' (base '$base').";
1624	()	1774	()
1625	}	1775	}
1626		1776
1627	sub init {	1777	sub init {
1628	my ($self) = @_;	1778	my ($self) = @_;
…		…
1691		1841
1692	sub load_header_from($) {	1842	sub load_header_from($) {
1693	my ($self, $path) = @_;	1843	my ($self, $path) = @_;
1694		1844
1695	utf8::encode $path;	1845	utf8::encode $path;
1696	#aio_open $path, O_RDONLY, 0	1846	my $f = new_from_file cf::object::thawer $path
1697	# or return;
1698
1699	$self->_load_header ($path)
1700	or return;	1847	or return;
		1848
		1849	$self->_load_header ($f)
		1850	or return;
		1851
		1852	local $MAP_LOADING{$self->{path}} = $self;
		1853	$f->resolve_delayed_derefs;
1701		1854
1702	$self->{load_path} = $path;	1855	$self->{load_path} = $path;
1703		1856
1704	1	1857	1
1705	}	1858	}
…		…
1759	sub find {	1912	sub find {
1760	my ($path, $origin) = @_;	1913	my ($path, $origin) = @_;
1761		1914
1762	$path = normalise $path, $origin && $origin->path;	1915	$path = normalise $path, $origin && $origin->path;
1763		1916
		1917	cf::lock_wait "map_data:$path";#d#remove
1764	cf::lock_wait "map_find:$path";	1918	cf::lock_wait "map_find:$path";
1765		1919
1766	$cf::MAP{$path} || do {	1920	$cf::MAP{$path} || do {
1767	my $guard = cf::lock_acquire "map_find:$path";	1921	my $guard1 = cf::lock_acquire "map_find:$path";
		1922	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1923
1768	my $map = new_from_path cf::map $path	1924	my $map = new_from_path cf::map $path
1769	or return;	1925	or return;
1770		1926
1771	$map->{last_save} = $cf::RUNTIME;	1927	$map->{last_save} = $cf::RUNTIME;
1772		1928
…		…
1774	or return;	1930	or return;
1775		1931
1776	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1932	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1777	# doing this can freeze the server in a sync job, obviously	1933	# doing this can freeze the server in a sync job, obviously
1778	#$cf::WAIT_FOR_TICK->wait;	1934	#$cf::WAIT_FOR_TICK->wait;
		1935	undef $guard1;
		1936	undef $guard2;
1779	$map->reset;	1937	$map->reset;
1780	undef $guard;
1781	return find $path;	1938	return find $path;
1782	}	1939	}
1783		1940
1784	$cf::MAP{$path} = $map	1941	$cf::MAP{$path} = $map
1785	}	1942	}
…		…
1794	local $self->{deny_reset} = 1; # loading can take a long time	1951	local $self->{deny_reset} = 1; # loading can take a long time
1795		1952
1796	my $path = $self->{path};	1953	my $path = $self->{path};
1797		1954
1798	{	1955	{
1799	my $guard = cf::lock_acquire "map_load:$path";	1956	my $guard = cf::lock_acquire "map_data:$path";
1800		1957
		1958	return unless $self->valid;
1801	return if $self->in_memory != cf::MAP_SWAPPED;	1959	return unless $self->in_memory == cf::MAP_SWAPPED;
1802		1960
1803	$self->in_memory (cf::MAP_LOADING);	1961	$self->in_memory (cf::MAP_LOADING);
1804		1962
1805	$self->alloc;	1963	$self->alloc;
1806		1964
1807	$self->pre_load;	1965	$self->pre_load;
1808	Coro::cede;	1966	cf::cede_to_tick;
1809		1967
		1968	my $f = new_from_file cf::object::thawer $self->{load_path};
		1969	$f->skip_block;
1810	$self->_load_objects ($self->{load_path}, 1)	1970	$self->_load_objects ($f)
1811	or return;	1971	or return;
1812		1972
1813	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1973	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1814	if delete $self->{load_original};	1974	if delete $self->{load_original};
1815		1975
1816	if (my $uniq = $self->uniq_path) {	1976	if (my $uniq = $self->uniq_path) {
1817	utf8::encode $uniq;	1977	utf8::encode $uniq;
1818	if (aio_open $uniq, O_RDONLY, 0) {	1978	unless (aio_stat $uniq) {
		1979	if (my $f = new_from_file cf::object::thawer $uniq) {
1819	$self->clear_unique_items;	1980	$self->clear_unique_items;
1820	$self->_load_objects ($uniq, 0);	1981	$self->_load_objects ($f);
		1982	$f->resolve_delayed_derefs;
		1983	}
1821	}	1984	}
1822	}	1985	}
1823		1986
1824	Coro::cede;	1987	$f->resolve_delayed_derefs;
		1988
		1989	cf::cede_to_tick;
1825	# now do the right thing for maps	1990	# now do the right thing for maps
1826	$self->link_multipart_objects;	1991	$self->link_multipart_objects;
1827	$self->difficulty ($self->estimate_difficulty)	1992	$self->difficulty ($self->estimate_difficulty)
1828	unless $self->difficulty;	1993	unless $self->difficulty;
1829	Coro::cede;	1994	cf::cede_to_tick;
1830		1995
1831	unless ($self->{deny_activate}) {	1996	unless ($self->{deny_activate}) {
1832	$self->decay_objects;	1997	$self->decay_objects;
1833	$self->fix_auto_apply;	1998	$self->fix_auto_apply;
1834	$self->update_buttons;	1999	$self->update_buttons;
1835	Coro::cede;	2000	cf::cede_to_tick;
1836	$self->set_darkness_map;	2001	$self->set_darkness_map;
1837	Coro::cede;	2002	cf::cede_to_tick;
1838	$self->activate;	2003	$self->activate;
1839	}	2004	}
		2005
		2006	$self->{last_save} = $cf::RUNTIME;
		2007	$self->last_access ($cf::RUNTIME);
1840		2008
1841	$self->in_memory (cf::MAP_IN_MEMORY);	2009	$self->in_memory (cf::MAP_IN_MEMORY);
1842	}	2010	}
1843		2011
1844	$self->post_load;	2012	$self->post_load;
…		…
1855		2023
1856	$self	2024	$self
1857	}	2025	}
1858		2026
1859	# find and load all maps in the 3x3 area around a map	2027	# find and load all maps in the 3x3 area around a map
1860	sub load_diag {	2028	sub load_neighbours {
1861	my ($map) = @_;	2029	my ($map) = @_;
1862		2030
1863	my @diag; # diagonal neighbours	2031	my @neigh; # diagonal neighbours
1864		2032
1865	for (0 .. 3) {	2033	for (0 .. 3) {
1866	my $neigh = $map->tile_path ($_)	2034	my $neigh = $map->tile_path ($_)
1867	or next;	2035	or next;
1868	$neigh = find $neigh, $map	2036	$neigh = find $neigh, $map
1869	or next;	2037	or next;
1870	$neigh->load;	2038	$neigh->load;
1871		2039
		2040	push @neigh,
1872	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2041	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1873	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2042	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1874	}	2043	}
1875		2044
1876	for (@diag) {	2045	for (grep defined $_->[0], @neigh) {
		2046	my ($path, $origin) = @$_;
1877	my $neigh = find @$_	2047	my $neigh = find $path, $origin
1878	or next;	2048	or next;
1879	$neigh->load;	2049	$neigh->load;
1880	}	2050	}
1881	}	2051	}
1882		2052
…		…
1887	}	2057	}
1888		2058
1889	sub do_load_sync {	2059	sub do_load_sync {
1890	my ($map) = @_;	2060	my ($map) = @_;
1891		2061
		2062	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2063	if $Coro::current == $Coro::main;
		2064
1892	cf::sync_job { $map->load };	2065	cf::sync_job { $map->load };
1893	}	2066	}
1894		2067
1895	our %MAP_PREFETCH;	2068	our %MAP_PREFETCH;
1896	our $MAP_PREFETCHER = undef;	2069	our $MAP_PREFETCHER = undef;
1897		2070
1898	sub find_async {	2071	sub find_async {
1899	my ($path, $origin) = @_;	2072	my ($path, $origin, $load) = @_;
1900		2073
1901	$path = normalise $path, $origin && $origin->{path};	2074	$path = normalise $path, $origin && $origin->{path};
1902		2075
1903	if (my $map = $cf::MAP{$path}) {	2076	if (my $map = $cf::MAP{$path}) {
1904	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2077	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1905	}	2078	}
1906		2079
1907	undef $MAP_PREFETCH{$path};	2080	$MAP_PREFETCH{$path} |= $load;
		2081
1908	$MAP_PREFETCHER ||= cf::async {	2082	$MAP_PREFETCHER ||= cf::async {
		2083	$Coro::current->{desc} = "map prefetcher";
		2084
1909	while (%MAP_PREFETCH) {	2085	while (%MAP_PREFETCH) {
1910	for my $path (keys %MAP_PREFETCH) {	2086	while (my ($k, $v) = each %MAP_PREFETCH) {
1911	my $map = find $path	2087	if (my $map = find $k) {
1912	or next;
1913	$map->load;	2088	$map->load if $v;
		2089	}
1914		2090
1915	delete $MAP_PREFETCH{$path};	2091	delete $MAP_PREFETCH{$k};
1916	}	2092	}
1917	}	2093	}
1918	undef $MAP_PREFETCHER;	2094	undef $MAP_PREFETCHER;
1919	};	2095	};
1920	$MAP_PREFETCHER->prio (6);	2096	$MAP_PREFETCHER->prio (6);
…		…
1923	}	2099	}
1924		2100
1925	sub save {	2101	sub save {
1926	my ($self) = @_;	2102	my ($self) = @_;
1927		2103
1928	my $lock = cf::lock_acquire "map_data:" . $self->path;	2104	my $lock = cf::lock_acquire "map_data:$self->{path}";
1929		2105
1930	$self->{last_save} = $cf::RUNTIME;	2106	$self->{last_save} = $cf::RUNTIME;
1931		2107
1932	return unless $self->dirty;	2108	return unless $self->dirty;
1933		2109
…		…
1939	return if $self->{deny_save};	2115	return if $self->{deny_save};
1940		2116
1941	local $self->{last_access} = $self->last_access;#d#	2117	local $self->{last_access} = $self->last_access;#d#
1942		2118
1943	cf::async {	2119	cf::async {
		2120	$Coro::current->{desc} = "map player save";
1944	$_->contr->save for $self->players;	2121	$_->contr->save for $self->players;
1945	};	2122	};
1946		2123
1947	if ($uniq) {	2124	if ($uniq) {
1948	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2125	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
1956	my ($self) = @_;	2133	my ($self) = @_;
1957		2134
1958	# save first because save cedes	2135	# save first because save cedes
1959	$self->save;	2136	$self->save;
1960		2137
1961	my $lock = cf::lock_acquire "map_data:" . $self->path;	2138	my $lock = cf::lock_acquire "map_data:$self->{path}";
1962		2139
1963	return if $self->players;	2140	return if $self->players;
1964	return if $self->in_memory != cf::MAP_IN_MEMORY;	2141	return if $self->in_memory != cf::MAP_IN_MEMORY;
1965	return if $self->{deny_save};	2142	return if $self->{deny_save};
1966		2143
		2144	$self->in_memory (cf::MAP_SWAPPED);
		2145
		2146	$self->deactivate;
		2147	$_->clear_links_to ($self) for values %cf::MAP;
1967	$self->clear;	2148	$self->clear;
1968	$self->in_memory (cf::MAP_SWAPPED);
1969	}	2149	}
1970		2150
1971	sub reset_at {	2151	sub reset_at {
1972	my ($self) = @_;	2152	my ($self) = @_;
1973		2153
…		…
2005	if $uniq;	2185	if $uniq;
2006	}	2186	}
2007		2187
2008	delete $cf::MAP{$self->path};	2188	delete $cf::MAP{$self->path};
2009		2189
		2190	$self->deactivate;
		2191	$_->clear_links_to ($self) for values %cf::MAP;
2010	$self->clear;	2192	$self->clear;
2011
2012	$_->clear_links_to ($self) for values %cf::MAP;
2013		2193
2014	$self->unlink_save;	2194	$self->unlink_save;
2015	$self->destroy;	2195	$self->destroy;
2016	}	2196	}
2017		2197
2018	my $nuke_counter = "aaaa";	2198	my $nuke_counter = "aaaa";
2019		2199
2020	sub nuke {	2200	sub nuke {
2021	my ($self) = @_;	2201	my ($self) = @_;
2022		2202
		2203	{
		2204	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2205
2023	delete $cf::MAP{$self->path};	2206	delete $cf::MAP{$self->path};
2024		2207
2025	$self->unlink_save;	2208	$self->unlink_save;
2026		2209
2027	bless $self, "cf::map";	2210	bless $self, "cf::map";
2028	delete $self->{deny_reset};	2211	delete $self->{deny_reset};
2029	$self->{deny_save} = 1;	2212	$self->{deny_save} = 1;
2030	$self->reset_timeout (1);	2213	$self->reset_timeout (1);
2031	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2214	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2032		2215
2033	$cf::MAP{$self->path} = $self;	2216	$cf::MAP{$self->path} = $self;
		2217	}
2034		2218
2035	$self->reset; # polite request, might not happen	2219	$self->reset; # polite request, might not happen
2036	}	2220	}
2037		2221
2038	=item $maps = cf::map::tmp_maps	2222	=item $maps = cf::map::tmp_maps
…		…
2114		2298
2115	sub inv_recursive {	2299	sub inv_recursive {
2116	inv_recursive_ inv $_[0]	2300	inv_recursive_ inv $_[0]
2117	}	2301	}
2118		2302
		2303	=item $ref = $ob->ref
		2304
		2305	creates and returns a persistent reference to an objetc that can be stored as a string.
		2306
		2307	=item $ob = cf::object::deref ($refstring)
		2308
		2309	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2310	even if the object actually exists. May block.
		2311
		2312	=cut
		2313
		2314	sub deref {
		2315	my ($ref) = @_;
		2316
		2317	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2318	my ($uuid, $name) = ($1, $2);
		2319	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2320	or return;
		2321	$pl->ob->uuid eq $uuid
		2322	or return;
		2323
		2324	$pl->ob
		2325	} else {
		2326	warn "$ref: cannot resolve object reference\n";
		2327	undef
		2328	}
		2329	}
		2330
2119	package cf;	2331	package cf;
2120		2332
2121	=back	2333	=back
2122		2334
2123	=head3 cf::object::player	2335	=head3 cf::object::player
…		…
2145		2357
2146	} else {	2358	} else {
2147	my $pl = $self->contr;	2359	my $pl = $self->contr;
2148		2360
2149	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2361	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2150	my $diag = $pl->{npc_dialog};	2362	my $dialog = $pl->{npc_dialog};
2151	$diag->{pl}->ext_reply (	2363	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2152	$diag->{id},
2153	msgtype => "reply",
2154	msg => $diag->{pl}->expand_cfpod ($msg),
2155	add_topics => []
2156	);
2157		2364
2158	} else {	2365	} else {
2159	$msg = $npc->name . " says: $msg" if $npc;	2366	$msg = $npc->name . " says: $msg" if $npc;
2160	$self->message ($msg, $flags);	2367	$self->message ($msg, $flags);
2161	}	2368	}
2162	}	2369	}
		2370	}
		2371
		2372	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2373
		2374	=cut
		2375
		2376	sub cf::object::send_msg {
		2377	my $pl = shift->contr
		2378	or return;
		2379	$pl->send_msg (@_);
2163	}	2380	}
2164		2381
2165	=item $player_object->may ("access")	2382	=item $player_object->may ("access")
2166		2383
2167	Returns wether the given player is authorized to access resource "access"	2384	Returns wether the given player is authorized to access resource "access"
…		…
2246	# use -1 or undef as default coordinates, not 0, 0	2463	# use -1 or undef as default coordinates, not 0, 0
2247	($x, $y) = ($map->enter_x, $map->enter_y)	2464	($x, $y) = ($map->enter_x, $map->enter_y)
2248	if $x <=0 && $y <= 0;	2465	if $x <=0 && $y <= 0;
2249		2466
2250	$map->load;	2467	$map->load;
2251	$map->load_diag;	2468	$map->load_neighbours;
2252		2469
2253	return unless $self->contr->active;	2470	return unless $self->contr->active;
2254	$self->activate_recursive;	2471	$self->activate_recursive;
2255		2472
2256	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2473	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2257	$self->enter_map ($map, $x, $y);	2474	$self->enter_map ($map, $x, $y);
2258	}	2475	}
2259		2476
2260	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2477	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2261		2478
2262	Moves the player to the given map-path and coordinates by first freezing	2479	Moves the player to the given map-path and coordinates by first freezing
2263	her, loading and preparing them map, calling the provided $check callback	2480	her, loading and preparing them map, calling the provided $check callback
2264	that has to return the map if sucecssful, and then unfreezes the player on	2481	that has to return the map if sucecssful, and then unfreezes the player on
2265	the new (success) or old (failed) map position.	2482	the new (success) or old (failed) map position. In either case, $done will
		2483	be called at the end of this process.
2266		2484
2267	=cut	2485	=cut
2268		2486
2269	our $GOTOGEN;	2487	our $GOTOGEN;
2270		2488
2271	sub cf::object::player::goto {	2489	sub cf::object::player::goto {
2272	my ($self, $path, $x, $y, $check) = @_;	2490	my ($self, $path, $x, $y, $check, $done) = @_;
2273		2491
2274	# do generation counting so two concurrent goto's will be executed in-order	2492	# do generation counting so two concurrent goto's will be executed in-order
2275	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2493	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2276		2494
2277	$self->enter_link;	2495	$self->enter_link;
2278		2496
2279	(async {	2497	(async {
		2498	$Coro::current->{desc} = "player::goto $path $x $y";
		2499
		2500	# *tag paths override both path and x|y
		2501	if ($path =~ /^\*(.*)$/) {
		2502	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2503	my $ob = $obs[rand @obs];
		2504
		2505	# see if we actually can go there
		2506	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2507	$ob = $obs[rand @obs];
		2508	} else {
		2509	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2510	}
		2511	# else put us there anyways for now #d#
		2512
		2513	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2514	} else {
		2515	($path, $x, $y) = (undef, undef, undef);
		2516	}
		2517	}
		2518
2280	my $map = eval {	2519	my $map = eval {
2281	my $map = cf::map::find $path;	2520	my $map = defined $path ? cf::map::find $path : undef;
2282		2521
2283	if ($map) {	2522	if ($map) {
2284	$map = $map->customise_for ($self);	2523	$map = $map->customise_for ($self);
2285	$map = $check->($map) if $check && $map;	2524	$map = $check->($map) if $check && $map;
2286	} else {	2525	} else {
2287	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2526	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2288	}	2527	}
2289		2528
2290	$map	2529	$map
2291	};	2530	};
2292		2531
…		…
2297		2536
2298	if ($gen == $self->{_goto_generation}) {	2537	if ($gen == $self->{_goto_generation}) {
2299	delete $self->{_goto_generation};	2538	delete $self->{_goto_generation};
2300	$self->leave_link ($map, $x, $y);	2539	$self->leave_link ($map, $x, $y);
2301	}	2540	}
		2541
		2542	$done->() if $done;
2302	})->prio (1);	2543	})->prio (1);
2303	}	2544	}
2304		2545
2305	=item $player_object->enter_exit ($exit_object)	2546	=item $player_object->enter_exit ($exit_object)
2306		2547
…		…
2380	# if exit is damned, update players death & WoR home-position	2621	# if exit is damned, update players death & WoR home-position
2381	$self->contr->savebed ($slaying, $hp, $sp)	2622	$self->contr->savebed ($slaying, $hp, $sp)
2382	if $exit->flag (FLAG_DAMNED);	2623	if $exit->flag (FLAG_DAMNED);
2383		2624
2384	(async {	2625	(async {
		2626	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2627
2385	$self->deactivate_recursive; # just to be sure	2628	$self->deactivate_recursive; # just to be sure
2386	unless (eval {	2629	unless (eval {
2387	$self->goto ($slaying, $hp, $sp);	2630	$self->goto ($slaying, $hp, $sp);
2388		2631
2389	1;	2632	1;
…		…
2415		2658
2416	utf8::encode $text;	2659	utf8::encode $text;
2417	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2660	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2418	}	2661	}
2419		2662
2420	=item $client->send_msg ($color, $type, $msg, [extra...])	2663	=item $client->send_msg ($channel, $msg, $color, [extra...])
2421		2664
2422	Send a drawinfo or msg packet to the client, formatting the msg for the	2665	Send a drawinfo or msg packet to the client, formatting the msg for the
2423	client if neccessary. C<$type> should be a string identifying the type of	2666	client if neccessary. C<$type> should be a string identifying the type of
2424	the message, with C<log> being the default. If C<$color> is negative, suppress	2667	the message, with C<log> being the default. If C<$color> is negative, suppress
2425	the message unless the client supports the msg packet.	2668	the message unless the client supports the msg packet.
2426		2669
2427	=cut	2670	=cut
2428		2671
		2672	our %CHANNEL = (
		2673	"c/identify" => {
		2674	id => "infobox",
		2675	title => "Identify",
		2676	reply => undef,
		2677	tooltip => "Items recently identified",
		2678	},
		2679	"c/examine" => {
		2680	id => "infobox",
		2681	title => "Examine",
		2682	reply => undef,
		2683	tooltip => "Signs and other items you examined",
		2684	},
		2685	"c/lookat" => {
		2686	id => "infobox",
		2687	title => "Look",
		2688	reply => undef,
		2689	tooltip => "What you saw there",
		2690	},
		2691	);
		2692
2429	sub cf::client::send_msg {	2693	sub cf::client::send_msg {
2430	my ($self, $color, $type, $msg, @extra) = @_;	2694	my ($self, $channel, $msg, $color, @extra) = @_;
2431		2695
2432	$msg = $self->pl->expand_cfpod ($msg);	2696	$msg = $self->pl->expand_cfpod ($msg);
2433		2697
		2698	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2699
		2700	# check predefined channels, for the benefit of C
		2701	if ($CHANNEL{$channel}) {
		2702	$channel = $CHANNEL{$channel};
		2703
		2704	$self->ext_msg (channel_info => $channel)
		2705	if $self->can_msg;
		2706
		2707	$channel = $channel->{id};
		2708
		2709	} elsif (ref $channel) {
		2710	# send meta info to client, if not yet sent
		2711	unless (exists $self->{channel}{$channel->{id}}) {
		2712	$self->{channel}{$channel->{id}} = $channel;
		2713	$self->ext_msg (channel_info => $channel)
		2714	if $self->can_msg;
		2715	}
		2716
		2717	$channel = $channel->{id};
		2718	}
		2719
2434	return unless @extra || length $msg;	2720	return unless @extra || length $msg;
2435		2721
2436	if ($self->can_msg) {	2722	if ($self->can_msg) {
		2723	# default colour, mask it out
		2724	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2725	if $color & cf::NDI_DEF;
		2726
2437	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));	2727	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2728	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2438	} else {	2729	} else {
2439	# replace some tags by gcfclient-compatible ones
2440	for ($msg) {
2441	1 while
2442	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2443	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2444	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2445	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2446	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2447	}
2448
2449	if ($color >= 0) {	2730	if ($color >= 0) {
		2731	# replace some tags by gcfclient-compatible ones
		2732	for ($msg) {
		2733	1 while
		2734	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2735	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2736	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2737	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2738	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2739	}
		2740
		2741	$color &= cf::NDI_COLOR_MASK;
		2742
		2743	utf8::encode $msg;
		2744
2450	if (0 && $msg =~ /\[/) {	2745	if (0 && $msg =~ /\[/) {
		2746	# COMMAND/INFO
2451	$self->send_packet ("drawextinfo $color 4 0 $msg")	2747	$self->send_packet ("drawextinfo $color 10 8 $msg")
2452	} else {	2748	} else {
2453	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	2749	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2454	$self->send_packet ("drawinfo $color $msg")	2750	$self->send_packet ("drawinfo $color $msg")
2455	}	2751	}
2456	}	2752	}
2457	}	2753	}
2458	}	2754	}
2459		2755
2460	=item $client->ext_event ($type, %msg)	2756	=item $client->ext_msg ($type, @msg)
2461		2757
2462	Sends an ext event to the client.	2758	Sends an ext event to the client.
2463		2759
2464	=cut	2760	=cut
2465		2761
2466	sub cf::client::ext_event($$%) {	2762	sub cf::client::ext_msg($$@) {
2467	my ($self, $type, %msg) = @_;	2763	my ($self, $type, @msg) = @_;
2468		2764
		2765	if ($self->extcmd == 2) {
		2766	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2767	} elsif ($self->extcmd == 1) { # TODO: remove
2469	$msg{msgtype} = "event_$type";	2768	push @msg, msgtype => "event_$type";
2470	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2769	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2770	}
		2771	}
		2772
		2773	=item $client->ext_reply ($msgid, @msg)
		2774
		2775	Sends an ext reply to the client.
		2776
		2777	=cut
		2778
		2779	sub cf::client::ext_reply($$@) {
		2780	my ($self, $id, @msg) = @_;
		2781
		2782	if ($self->extcmd == 2) {
		2783	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2784	} elsif ($self->extcmd == 1) {
		2785	#TODO: version 1, remove
		2786	unshift @msg, msgtype => "reply", msgid => $id;
		2787	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2788	}
2471	}	2789	}
2472		2790
2473	=item $success = $client->query ($flags, "text", \&cb)	2791	=item $success = $client->query ($flags, "text", \&cb)
2474		2792
2475	Queues a query to the client, calling the given callback with	2793	Queues a query to the client, calling the given callback with
…		…
2530	my ($ns, $buf) = @_;	2848	my ($ns, $buf) = @_;
2531		2849
2532	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2850	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2533		2851
2534	if (ref $msg) {	2852	if (ref $msg) {
		2853	my ($type, $reply, @payload) =
		2854	"ARRAY" eq ref $msg
		2855	? @$msg
		2856	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2857
		2858	my @reply;
		2859
2535	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2860	if (my $cb = $EXTICMD{$type}) {
2536	if (my %reply = $cb->($ns, $msg)) {	2861	@reply = $cb->($ns, @payload);
2537	$reply{msgid} = $msg->{msgid};
2538	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2539	}
2540	}	2862	}
		2863
		2864	$ns->ext_reply ($reply, @reply)
		2865	if $reply;
		2866
2541	} else {	2867	} else {
2542	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2868	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2543	}	2869	}
2544		2870
2545	cf::override;	2871	cf::override;
…		…
2592	our $safe = new Safe "safe";	2918	our $safe = new Safe "safe";
2593	our $safe_hole = new Safe::Hole;	2919	our $safe_hole = new Safe::Hole;
2594		2920
2595	$SIG{FPE} = 'IGNORE';	2921	$SIG{FPE} = 'IGNORE';
2596		2922
2597	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2923	$safe->permit_only (Opcode::opset qw(
		2924	:base_core :base_mem :base_orig :base_math
		2925	grepstart grepwhile mapstart mapwhile
		2926	sort time
		2927	));
2598		2928
2599	# here we export the classes and methods available to script code	2929	# here we export the classes and methods available to script code
2600		2930
2601	=pod	2931	=pod
2602		2932
2603	The following functions and methods are available within a safe environment:	2933	The following functions and methods are available within a safe environment:
2604		2934
2605	cf::object	2935	cf::object
2606	contr pay_amount pay_player map x y force_find force_add	2936	contr pay_amount pay_player map x y force_find force_add destroy
2607	insert remove	2937	insert remove name archname title slaying race decrease_ob_nr
2608		2938
2609	cf::object::player	2939	cf::object::player
2610	player	2940	player
2611		2941
2612	cf::player	2942	cf::player
…		…
2617		2947
2618	=cut	2948	=cut
2619		2949
2620	for (	2950	for (
2621	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	2951	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2952	insert remove inv name archname title slaying race
2622	insert remove)],	2953	decrease_ob_nr destroy)],
2623	["cf::object::player" => qw(player)],	2954	["cf::object::player" => qw(player)],
2624	["cf::player" => qw(peaceful)],	2955	["cf::player" => qw(peaceful)],
2625	["cf::map" => qw(trigger)],	2956	["cf::map" => qw(trigger)],
2626	) {	2957	) {
2627	no strict 'refs';	2958	no strict 'refs';
…		…
2703	# the server's init and main functions	3034	# the server's init and main functions
2704		3035
2705	sub load_facedata($) {	3036	sub load_facedata($) {
2706	my ($path) = @_;	3037	my ($path) = @_;
2707		3038
		3039	# HACK to clear player env face cache, we need some signal framework
		3040	# for this (global event?)
		3041	%ext::player_env::MUSIC_FACE_CACHE = ();
		3042
		3043	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3044
2708	warn "loading facedata from $path\n";	3045	warn "loading facedata from $path\n";
2709		3046
2710	my $facedata;	3047	my $facedata;
2711	0 < aio_load $path, $facedata	3048	0 < aio_load $path, $facedata
2712	or die "$path: $!";	3049	or die "$path: $!";
…		…
2714	$facedata = Coro::Storable::thaw $facedata;	3051	$facedata = Coro::Storable::thaw $facedata;
2715		3052
2716	$facedata->{version} == 2	3053	$facedata->{version} == 2
2717	or cf::cleanup "$path: version mismatch, cannot proceed.";	3054	or cf::cleanup "$path: version mismatch, cannot proceed.";
2718		3055
		3056	# patch in the exptable
		3057	$facedata->{resource}{"res/exp_table"} = {
		3058	type => FT_RSRC,
		3059	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3060	};
		3061	cf::cede_to_tick;
		3062
2719	{	3063	{
2720	my $faces = $facedata->{faceinfo};	3064	my $faces = $facedata->{faceinfo};
2721		3065
2722	while (my ($face, $info) = each %$faces) {	3066	while (my ($face, $info) = each %$faces) {
2723	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3067	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2724	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3068	cf::face::set_visibility $idx, $info->{visibility};
		3069	cf::face::set_magicmap $idx, $info->{magicmap};
2725	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3070	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2726	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3071	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2727	Coro::cede;	3072
		3073	cf::cede_to_tick;
2728	}	3074	}
2729		3075
2730	while (my ($face, $info) = each %$faces) {	3076	while (my ($face, $info) = each %$faces) {
2731	next unless $info->{smooth};	3077	next unless $info->{smooth};
2732	my $idx = cf::face::find $face	3078	my $idx = cf::face::find $face
2733	or next;	3079	or next;
2734	if (my $smooth = cf::face::find $info->{smooth}) {	3080	if (my $smooth = cf::face::find $info->{smooth}) {
		3081	cf::face::set_smooth $idx, $smooth;
2735	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3082	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2736	} else {	3083	} else {
2737	warn "smooth face '$info->{smooth}' not found for face '$face'";	3084	warn "smooth face '$info->{smooth}' not found for face '$face'";
2738	}	3085	}
2739	Coro::cede;	3086
		3087	cf::cede_to_tick;
2740	}	3088	}
2741	}	3089	}
2742		3090
2743	{	3091	{
2744	my $anims = $facedata->{animinfo};	3092	my $anims = $facedata->{animinfo};
2745		3093
2746	while (my ($anim, $info) = each %$anims) {	3094	while (my ($anim, $info) = each %$anims) {
2747	cf::anim::set $anim, $info->{frames}, $info->{facings};	3095	cf::anim::set $anim, $info->{frames}, $info->{facings};
2748	Coro::cede;	3096	cf::cede_to_tick;
2749	}	3097	}
2750		3098
2751	cf::anim::invalidate_all; # d'oh	3099	cf::anim::invalidate_all; # d'oh
2752	}	3100	}
2753		3101
		3102	{
		3103	# TODO: for gcfclient pleasure, we should give resources
		3104	# that gcfclient doesn't grok a >10000 face index.
		3105	my $res = $facedata->{resource};
		3106
		3107	my $soundconf = delete $res->{"res/sound.conf"};
		3108
		3109	while (my ($name, $info) = each %$res) {
		3110	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3111	my $data;
		3112
		3113	if ($info->{type} & 1) {
		3114	# prepend meta info
		3115
		3116	my $meta = $enc->encode ({
		3117	name => $name,
		3118	%{ $info->{meta} || {} },
		3119	});
		3120
		3121	$data = pack "(w/a*)*", $meta, $info->{data};
		3122	} else {
		3123	$data = $info->{data};
		3124	}
		3125
		3126	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3127	cf::face::set_type $idx, $info->{type};
		3128
		3129	cf::cede_to_tick;
		3130	}
		3131
		3132	if ($soundconf) {
		3133	$soundconf = $enc->decode (delete $soundconf->{data});
		3134
		3135	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3136	my $sound = $soundconf->{compat}[$_]
		3137	or next;
		3138
		3139	my $face = cf::face::find "sound/$sound->[1]";
		3140	cf::sound::set $sound->[0] => $face;
		3141	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3142	}
		3143
		3144	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3145	my $face = cf::face::find "sound/$v";
		3146	cf::sound::set $k => $face;
		3147	}
		3148	}
		3149	}
		3150
2754	1	3151	1
2755	}	3152	}
2756		3153
		3154	register_exticmd fx_want => sub {
		3155	my ($ns, $want) = @_;
		3156
		3157	while (my ($k, $v) = each %$want) {
		3158	$ns->fx_want ($k, $v);
		3159	}
		3160	};
		3161
2757	sub reload_regions {	3162	sub reload_regions {
		3163	# HACK to clear player env face cache, we need some signal framework
		3164	# for this (global event?)
		3165	%ext::player_env::MUSIC_FACE_CACHE = ();
		3166
2758	load_resource_file "$MAPDIR/regions"	3167	load_resource_file "$MAPDIR/regions"
2759	or die "unable to load regions file\n";	3168	or die "unable to load regions file\n";
		3169
		3170	for (cf::region::list) {
		3171	$_->{match} = qr/$_->{match}/
		3172	if exists $_->{match};
		3173	}
2760	}	3174	}
2761		3175
2762	sub reload_facedata {	3176	sub reload_facedata {
2763	load_facedata "$DATADIR/facedata"	3177	load_facedata "$DATADIR/facedata"
2764	or die "unable to load facedata\n";	3178	or die "unable to load facedata\n";
…		…
2793		3207
2794	sub init {	3208	sub init {
2795	reload_resources;	3209	reload_resources;
2796	}	3210	}
2797		3211
2798	sub cfg_load {	3212	sub reload_config {
2799	open my $fh, "<:utf8", "$CONFDIR/config"	3213	open my $fh, "<:utf8", "$CONFDIR/config"
2800	or return;	3214	or return;
2801		3215
2802	local $/;	3216	local $/;
2803	*CFG = YAML::Syck::Load <$fh>;	3217	*CFG = YAML::Syck::Load <$fh>;
…		…
2819	sub main {	3233	sub main {
2820	# we must not ever block the main coroutine	3234	# we must not ever block the main coroutine
2821	local $Coro::idle = sub {	3235	local $Coro::idle = sub {
2822	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3236	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2823	(async {	3237	(async {
		3238	$Coro::current->{desc} = "IDLE BUG HANDLER";
2824	Event::one_event;	3239	Event::one_event;
2825	})->prio (Coro::PRIO_MAX);	3240	})->prio (Coro::PRIO_MAX);
2826	};	3241	};
2827		3242
2828	cfg_load;	3243	reload_config;
2829	db_init;	3244	db_init;
2830	load_extensions;	3245	load_extensions;
2831		3246
2832	$TICK_WATCHER->start;	3247	$TICK_WATCHER->start;
2833	Event::loop;	3248	Event::loop;
…		…
2900	# and maps saved/destroyed asynchronously.	3315	# and maps saved/destroyed asynchronously.
2901	warn "begin emergency player save\n";	3316	warn "begin emergency player save\n";
2902	for my $login (keys %cf::PLAYER) {	3317	for my $login (keys %cf::PLAYER) {
2903	my $pl = $cf::PLAYER{$login} or next;	3318	my $pl = $cf::PLAYER{$login} or next;
2904	$pl->valid or next;	3319	$pl->valid or next;
		3320	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2905	$pl->save;	3321	$pl->save;
2906	}	3322	}
2907	warn "end emergency player save\n";	3323	warn "end emergency player save\n";
2908		3324
2909	warn "begin emergency map save\n";	3325	warn "begin emergency map save\n";
…		…
2957		3373
2958	warn "flushing outstanding aio requests";	3374	warn "flushing outstanding aio requests";
2959	for (;;) {	3375	for (;;) {
2960	BDB::flush;	3376	BDB::flush;
2961	IO::AIO::flush;	3377	IO::AIO::flush;
2962	Coro::cede;	3378	Coro::cede_notself;
2963	last unless IO::AIO::nreqs || BDB::nreqs;	3379	last unless IO::AIO::nreqs || BDB::nreqs;
2964	warn "iterate...";	3380	warn "iterate...";
2965	}	3381	}
2966		3382
2967	++$RELOAD;	3383	++$RELOAD;
…		…
3026	warn "reloading cf.pm";	3442	warn "reloading cf.pm";
3027	require cf;	3443	require cf;
3028	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3444	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3029		3445
3030	warn "loading config and database again";	3446	warn "loading config and database again";
3031	cf::cfg_load;	3447	cf::reload_config;
3032		3448
3033	warn "loading extensions";	3449	warn "loading extensions";
3034	cf::load_extensions;	3450	cf::load_extensions;
3035		3451
3036	warn "reattaching attachments to objects/players";	3452	warn "reattaching attachments to objects/players";
…		…
3072	register_command "reload" => sub {	3488	register_command "reload" => sub {
3073	my ($who, $arg) = @_;	3489	my ($who, $arg) = @_;
3074		3490
3075	if ($who->flag (FLAG_WIZ)) {	3491	if ($who->flag (FLAG_WIZ)) {
3076	$who->message ("reloading server.");	3492	$who->message ("reloading server.");
		3493	async {
		3494	$Coro::current->{desc} = "perl_reload";
3077	async { reload_perl };	3495	reload_perl;
		3496	};
3078	}	3497	}
3079	};	3498	};
3080		3499
3081	unshift @INC, $LIBDIR;	3500	unshift @INC, $LIBDIR;
3082		3501
…		…
3101	my $signal = new Coro::Signal;	3520	my $signal = new Coro::Signal;
3102	push @WAIT_FOR_TICK_BEGIN, $signal;	3521	push @WAIT_FOR_TICK_BEGIN, $signal;
3103	$signal->wait;	3522	$signal->wait;
3104	}	3523	}
3105		3524
3106	my $min = 1e6;#d#
3107	my $avg = 10;
3108	$TICK_WATCHER = Event->timer (	3525	$TICK_WATCHER = Event->timer (
3109	reentrant => 0,	3526	reentrant => 0,
3110	parked => 1,	3527	parked => 1,
3111	prio => 0,	3528	prio => 0,
3112	at => $NEXT_TICK || $TICK,	3529	at => $NEXT_TICK || $TICK,
…		…
3120		3537
3121	$NOW = $tick_start = Event::time;	3538	$NOW = $tick_start = Event::time;
3122		3539
3123	cf::server_tick; # one server iteration	3540	cf::server_tick; # one server iteration
3124		3541
3125	0 && sync_job {#d#
3126	for(1..10) {
3127	my $t = Event::time;
3128	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3129	or die;
3130
3131	$map->width (50);
3132	$map->height (50);
3133	$map->alloc;
3134	$map->_load_objects ("/tmp/x.map", 1);
3135	my $t = Event::time - $t;
3136
3137	#next unless $t < 0.0013;#d#
3138	if ($t < $min) {
3139	$min = $t;
3140	}
3141	$avg = $avg * 0.99 + $t * 0.01;
3142	}
3143	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3144	exit 0;
3145	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3146	};
3147
3148	$RUNTIME += $TICK;	3542	$RUNTIME += $TICK;
3149	$NEXT_TICK += $TICK;	3543	$NEXT_TICK += $TICK;
3150		3544
3151	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3545	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3152	$NEXT_RUNTIME_WRITE = $NOW + 10;	3546	$NEXT_RUNTIME_WRITE = $NOW + 10;
3153	Coro::async_pool {	3547	Coro::async_pool {
		3548	$Coro::current->{desc} = "runtime saver";
3154	write_runtime	3549	write_runtime
3155	or warn "ERROR: unable to write runtime file: $!";	3550	or warn "ERROR: unable to write runtime file: $!";
3156	};	3551	};
3157	}	3552	}
3158		3553
3159	# my $AFTER = Event::time;
3160	# warn $AFTER - $NOW;#d#
3161
3162	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3554	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3163	$sig->send;	3555	$sig->send;
3164	}	3556	}
3165	while (my $sig = shift @WAIT_FOR_TICK) {	3557	while (my $sig = shift @WAIT_FOR_TICK) {
3166	$sig->send;	3558	$sig->send;
…		…
3176		3568
3177	$LOAD = ($NOW - $tick_start) / $TICK;	3569	$LOAD = ($NOW - $tick_start) / $TICK;
3178	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3570	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3179		3571
3180	_post_tick;	3572	_post_tick;
3181
3182
3183	},	3573	},
3184	);	3574	);
3185		3575
3186	{	3576	{
		3577	BDB::min_parallel 8;
3187	BDB::max_poll_time $TICK * 0.1;	3578	BDB::max_poll_time $TICK * 0.1;
3188	$BDB_POLL_WATCHER = Event->io (	3579	$BDB_POLL_WATCHER = Event->io (
3189	reentrant => 0,	3580	reentrant => 0,
3190	fd => BDB::poll_fileno,	3581	fd => BDB::poll_fileno,
3191	poll => 'r',	3582	poll => 'r',
3192	prio => 0,	3583	prio => 0,
3193	data => WF_AUTOCANCEL,	3584	data => WF_AUTOCANCEL,
3194	cb => \&BDB::poll_cb,	3585	cb => \&BDB::poll_cb,
3195	);	3586	);
3196	BDB::min_parallel 8;
3197		3587
3198	BDB::set_sync_prepare {	3588	BDB::set_sync_prepare {
3199	my $status;	3589	my $status;
3200	my $current = $Coro::current;	3590	my $current = $Coro::current;
3201	(	3591	(
…		…
3210	)	3600	)
3211	};	3601	};
3212		3602
3213	unless ($DB_ENV) {	3603	unless ($DB_ENV) {
3214	$DB_ENV = BDB::db_env_create;	3604	$DB_ENV = BDB::db_env_create;
		3605	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3606	| BDB::LOG_AUTOREMOVE, 1);
		3607	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3608	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3215		3609
3216	cf::sync_job {	3610	cf::sync_job {
3217	eval {	3611	eval {
3218	BDB::db_env_open	3612	BDB::db_env_open
3219	$DB_ENV,	3613	$DB_ENV,
…		…
3221	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3615	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3222	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3616	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3223	0666;	3617	0666;
3224		3618
3225	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3619	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3226
3227	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3228	$DB_ENV->set_lk_detect;
3229	};	3620	};
3230		3621
3231	cf::cleanup "db_env_open(db): $@" if $@;	3622	cf::cleanup "db_env_open(db): $@" if $@;
3232	};	3623	};
3233	}	3624	}
		3625
		3626	$BDB_DEADLOCK_WATCHER = Event->timer (
		3627	after => 3,
		3628	interval => 1,
		3629	hard => 1,
		3630	prio => 0,
		3631	data => WF_AUTOCANCEL,
		3632	cb => sub {
		3633	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3634	},
		3635	);
		3636	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3637	after => 11,
		3638	interval => 60,
		3639	hard => 1,
		3640	prio => 0,
		3641	data => WF_AUTOCANCEL,
		3642	cb => sub {
		3643	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3644	},
		3645	);
		3646	$BDB_TRICKLE_WATCHER = Event->timer (
		3647	after => 5,
		3648	interval => 10,
		3649	hard => 1,
		3650	prio => 0,
		3651	data => WF_AUTOCANCEL,
		3652	cb => sub {
		3653	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3654	},
		3655	);
3234	}	3656	}
3235		3657
3236	{	3658	{
3237	IO::AIO::min_parallel 8;	3659	IO::AIO::min_parallel 8;
3238		3660
…		…
3241	$AIO_POLL_WATCHER = Event->io (	3663	$AIO_POLL_WATCHER = Event->io (
3242	reentrant => 0,	3664	reentrant => 0,
3243	data => WF_AUTOCANCEL,	3665	data => WF_AUTOCANCEL,
3244	fd => IO::AIO::poll_fileno,	3666	fd => IO::AIO::poll_fileno,
3245	poll => 'r',	3667	poll => 'r',
3246	prio => 6,	3668	prio => 0,
3247	cb => \&IO::AIO::poll_cb,	3669	cb => \&IO::AIO::poll_cb,
3248	);	3670	);
3249	}	3671	}
3250		3672
3251	my $_log_backtrace;	3673	my $_log_backtrace;
…		…
3257		3679
3258	# limit the # of concurrent backtraces	3680	# limit the # of concurrent backtraces
3259	if ($_log_backtrace < 2) {	3681	if ($_log_backtrace < 2) {
3260	++$_log_backtrace;	3682	++$_log_backtrace;
3261	async {	3683	async {
		3684	$Coro::current->{desc} = "abt $msg";
		3685
3262	my @bt = fork_call {	3686	my @bt = fork_call {
3263	@addr = map { sprintf "%x", $_ } @addr;	3687	@addr = map { sprintf "%x", $_ } @addr;
3264	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3688	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3265	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	3689	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3266	or die "addr2line: $!";	3690	or die "addr2line: $!";

Diff Legend

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