[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.298 by root, Sun Jul 8 14:50:07 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"
…		…
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	warn "pst<$res>" unless $res =~ /^pst/;
427	$res = Coro::Storable::thaw $res;
428
429	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431	Carp::confess $$res unless "ARRAY" eq ref $res;
432
433	return wantarray ? @$res : $res->[-1];
434	} else {
435	reset_signals;	508	reset_signals;
436	local $SIG{__WARN__};	509	&$cb
437	local $SIG{__DIE__};	510	}, @args;
438	local $Coro::idle;
439	$Coro::current->prio (Coro::PRIO_MAX);
440	eval {
441	close $fh1;
442		511
443	my @res = eval { $cb->(@args) };	512	wantarray ? @res : $res[-1]
444
445	open my $fh, ">", \my $buf
446	or die "fork_call: cannot open fh-to-buf in child : $!";
447	Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448	close $fh;
449
450	warn "writing ", length $buf;
451	my $x;
452	(length $buf) == ($x = syswrite $fh2, $buf)
453	or warn "error writing ".(length $buf)." != $x\n";
454	close $fh2;
455	};
456
457	warn $@ if $@;
458	_exit 0;
459	}
460	}	513	}
461		514
462	=item $value = cf::db_get $family => $key	515	=item $value = cf::db_get $family => $key
463		516
464	Returns a single value from the environment database.	517	Returns a single value from the environment database.
…		…
466	=item cf::db_put $family => $key => $value	519	=item cf::db_put $family => $key => $value
467		520
468	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
469	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).
470		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
471	=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	}
472		547
473	our $DB;	548	our $DB;
474		549
475	sub db_init {	550	sub db_init {
476	unless ($DB) {
477	$DB = BDB::db_create $DB_ENV;
478
479	cf::sync_job {	551	cf::sync_job {
480	eval {	552	$DB \|\|= db_table "db";
481	$DB->set_flags (BDB::CHKSUM);
482
483	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
484	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
485	cf::cleanup "db_open(db): $!" if $!;
486	};
487	cf::cleanup "db_open(db): $@" if $@;
488	};
489	}	553	};
490	}	554	}
491		555
492	sub db_get($$) {	556	sub db_get($$) {
493	my $key = "$_[0]/$_[1]";	557	my $key = "$_[0]/$_[1]";
494		558
…		…
544	if (1) {	608	if (1) {
545	$md5 =	609	$md5 =
546	join "\x00",	610	join "\x00",
547	$processversion,	611	$processversion,
548	map {	612	map {
549	Coro::cede;	613	cf::cede_to_tick;
550	($src->[$_], Digest::MD5::md5_hex $data[$_])	614	($src->[$_], Digest::MD5::md5_hex $data[$_])
551	} 0.. $#$src;	615	} 0.. $#$src;
552		616
553		617
554	my $dbmd5 = db_get cache => "$id/md5";	618	my $dbmd5 = db_get cache => "$id/md5";
…		…
860	";	924	";
861	die if $@;	925	die if $@;
862	}	926	}
863		927
864	our $override;	928	our $override;
865	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?
866		930
867	sub override {	931	sub override {
868	$override = 1;	932	$override = 1;
869	@invoke_results = ();	933	@INVOKE_RESULTS = (@_);
870	}	934	}
871		935
872	sub do_invoke {	936	sub do_invoke {
873	my $event = shift;	937	my $event = shift;
874	my $callbacks = shift;	938	my $callbacks = shift;
875		939
876	@invoke_results = ();	940	@INVOKE_RESULTS = ();
877		941
878	local $override;	942	local $override;
879		943
880	for (@$callbacks) {	944	for (@$callbacks) {
881	eval { &{$_->[1]} };	945	eval { &{$_->[1]} };
…		…
898		962
899	Generate an object-specific event with the given arguments.	963	Generate an object-specific event with the given arguments.
900		964
901	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
902	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
903	results (if you must, access C<@cf::invoke_results> directly).	967	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904		968
905	=back	969	=back
906		970
907	=cut	971	=cut
908		972
909	#############################################################################	973	#############################################################################
910	# 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	}
911		1017
912	sub reattach {	1018	sub reattach {
913	# basically do the same as instantiate, without calling instantiate	1019	# basically do the same as instantiate, without calling instantiate
914	my ($obj) = @_;	1020	my ($obj) = @_;
915		1021
…		…
962	sub object_freezer_save {	1068	sub object_freezer_save {
963	my ($filename, $rdata, $objs) = @_;	1069	my ($filename, $rdata, $objs) = @_;
964		1070
965	sync_job {	1071	sync_job {
966	if (length $$rdata) {	1072	if (length $$rdata) {
		1073	utf8::decode (my $decname = $filename);
967	warn sprintf "saving %s (%d,%d)\n",	1074	warn sprintf "saving %s (%d,%d)\n",
968	$filename, length $$rdata, scalar @$objs;	1075	$decname, length $$rdata, scalar @$objs;
969		1076
970	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1077	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
971	chmod SAVE_MODE, $fh;	1078	chmod SAVE_MODE, $fh;
972	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1079	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
973	aio_fsync $fh if $cf::USE_FSYNC;	1080	aio_fsync $fh if $cf::USE_FSYNC;
974	close $fh;	1081	close $fh;
975		1082
976	if (@$objs) {	1083	if (@$objs) {
977	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) {
978	chmod SAVE_MODE, $fh;	1085	chmod SAVE_MODE, $fh;
979	my $data = Storable::nfreeze { version => 1, objs => $objs };	1086	my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
980	aio_write $fh, 0, (length $data), $data, 0;	1087	aio_write $fh, 0, (length $data), $data, 0;
981	aio_fsync $fh if $cf::USE_FSYNC;	1088	aio_fsync $fh if $cf::USE_FSYNC;
982	close $fh;	1089	close $fh;
983	aio_rename "$filename.pst~", "$filename.pst";	1090	aio_rename "$filename.pst~", "$filename.pst";
984	}	1091	}
…		…
992	}	1099	}
993	} else {	1100	} else {
994	aio_unlink $filename;	1101	aio_unlink $filename;
995	aio_unlink "$filename.pst";	1102	aio_unlink "$filename.pst";
996	}	1103	}
997	}	1104	};
998	}	1105	}
999		1106
1000	sub object_freezer_as_string {	1107	sub object_freezer_as_string {
1001	my ($rdata, $objs) = @_;	1108	my ($rdata, $objs) = @_;
1002		1109
…		…
1014	or return;	1121	or return;
1015		1122
1016	unless (aio_stat "$filename.pst") {	1123	unless (aio_stat "$filename.pst") {
1017	(aio_load "$filename.pst", $av) >= 0	1124	(aio_load "$filename.pst", $av) >= 0
1018	or return;	1125	or return;
1019	$av = eval { (Storable::thaw $av)->{objs} };
1020	}
1021		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);
1022	warn sprintf "loading %s (%d)\n",	1133	warn sprintf "loading %s (%d,%d)\n",
1023	$filename, length $data, scalar @{$av \|\| []};	1134	$decname, length $data, scalar @{$av \|\| []};
		1135
1024	return ($data, $av);	1136	($data, $av)
1025	}	1137	}
1026		1138
1027	=head2 COMMAND CALLBACKS	1139	=head2 COMMAND CALLBACKS
1028		1140
1029	=over 4	1141	=over 4
…		…
1102	my ($pl, $buf) = @_;	1214	my ($pl, $buf) = @_;
1103		1215
1104	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1216	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105		1217
1106	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
1107	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1226	if (my $cb = $EXTCMD{$type}) {
1108	if (my %reply = $cb->($pl, $msg)) {	1227	@reply = $cb->($pl, @payload);
1109	$pl->ext_reply ($msg->{msgid}, %reply);
1110	}
1111	}	1228	}
		1229
		1230	$pl->ext_reply ($reply, @reply)
		1231	if $reply;
		1232
1112	} else {	1233	} else {
1113	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1234	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114	}	1235	}
1115		1236
1116	cf::override;	1237	cf::override;
…		…
1206		1327
1207	=head3 cf::player	1328	=head3 cf::player
1208		1329
1209	=over 4	1330	=over 4
1210		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
1211	=item cf::player::find $login	1346	=item cf::player::find $login
1212		1347
1213	Returns the given player object, loading it if necessary (might block).	1348	Returns the given player object, loading it if necessary (might block).
1214		1349
1215	=cut	1350	=cut
…		…
1250	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1385	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1251	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1386	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1252	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1387	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1253	aio_unlink +(playerdir $login) . "/$login.pl";	1388	aio_unlink +(playerdir $login) . "/$login.pl";
1254		1389
1255	my $pl = load_pl path $login	1390	my $f = new_from_file cf::object::thawer path $login
1256	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;
1257	$cf::PLAYER{$login} = $pl	1397	$cf::PLAYER{$login} = $pl
1258	}	1398	}
1259	}	1399	}
1260	}	1400	}
1261		1401
…		…
1271		1411
1272	aio_mkdir playerdir $pl, 0770;	1412	aio_mkdir playerdir $pl, 0770;
1273	$pl->{last_save} = $cf::RUNTIME;	1413	$pl->{last_save} = $cf::RUNTIME;
1274		1414
1275	$pl->save_pl ($path);	1415	$pl->save_pl ($path);
1276	Coro::cede;	1416	cf::cede_to_tick;
1277	}	1417	}
1278		1418
1279	sub new($) {	1419	sub new($) {
1280	my ($login) = @_;	1420	my ($login) = @_;
1281		1421
…		…
1285	$self->{deny_save} = 1;	1425	$self->{deny_save} = 1;
1286		1426
1287	$cf::PLAYER{$login} = $self;	1427	$cf::PLAYER{$login} = $self;
1288		1428
1289	$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 (@_);
1290	}	1440	}
1291		1441
1292	=item $pl->quit_character	1442	=item $pl->quit_character
1293		1443
1294	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
…		…
1349	or return [];	1499	or return [];
1350		1500
1351	my @logins;	1501	my @logins;
1352		1502
1353	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") {
1354	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1508	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1355	aio_read $fh, 0, 512, my $buf, 0 or next;	1509	aio_read $fh, 0, 512, my $buf, 0 or next;
1356	$buf !~ /^password -------------$/m or next; # official not-valid tag	1510	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1511	}
1357		1512
1358	utf8::decode $login;	1513	utf8::decode $login;
1359	push @logins, $login;	1514	push @logins, $login;
1360	}	1515	}
1361		1516
…		…
1399	sub expand_cfpod {	1554	sub expand_cfpod {
1400	((my $self), (local $_)) = @_;	1555	((my $self), (local $_)) = @_;
1401		1556
1402	# escape & and <	1557	# escape & and <
1403	s/&/&/g;	1558	s/&/&/g;
1404	s/(?<![BIUGH])</</g;	1559	s/(?<![BIUGHT])</</g;
1405		1560
1406	# 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
1407		1562
1408	1 while	1563	1 while
1409	# replace B<>, I<>, U<> etc.	1564	# replace B<>, I<>, U<> etc.
1410	s/B<([^\>]*)>/<b>$1<\/b>/	1565	s/B<([^\>]*)>/<b>$1<\/b>/
1411	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1566	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1412	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1567	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1568	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1413	# replace G<male\|female> tags	1569	# replace G<male\|female> tags
1414	\|\| s{G<([^>\|])\\|([^>])>}{	1570	\|\| s{G<([^>\|])\\|([^>])>}{
1415	$self->gender ? $2 : $1	1571	$self->gender ? $2 : $1
1416	}ge	1572	}ge
1417	# replace H<hint text>	1573	# replace H<hint text>
…		…
1438	sub hintmode {	1594	sub hintmode {
1439	$_[0]{hintmode} = $_[1] if @_ > 1;	1595	$_[0]{hintmode} = $_[1] if @_ > 1;
1440	$_[0]{hintmode}	1596	$_[0]{hintmode}
1441	}	1597	}
1442		1598
1443	=item $player->ext_reply ($msgid, %msg)	1599	=item $player->ext_reply ($msgid, @msg)
1444		1600
1445	Sends an ext reply to the player.	1601	Sends an ext reply to the player.
1446		1602
1447	=cut	1603	=cut
1448		1604
1449	sub ext_reply($$%) {	1605	sub ext_reply($$@) {
1450	my ($self, $id, %msg) = @_;	1606	my ($self, $id, @msg) = @_;
1451		1607
1452	$msg{msgid} = $id;	1608	$self->ns->ext_reply ($id, @msg)
1453	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1454	}	1609	}
1455		1610
1456	=item $player->ext_event ($type, %msg)	1611	=item $player->ext_msg ($type, @msg)
1457		1612
1458	Sends an ext event to the client.	1613	Sends an ext event to the client.
1459		1614
1460	=cut	1615	=cut
1461		1616
1462	sub ext_event($$%) {	1617	sub ext_msg($$@) {
1463	my ($self, $type, %msg) = @_;	1618	my ($self, $type, @msg) = @_;
1464		1619
1465	$self->ns->ext_event ($type, %msg);	1620	$self->ns->ext_msg ($type, @msg);
1466	}	1621	}
1467		1622
1468	=head3 cf::region	1623	=head3 cf::region
1469		1624
1470	=over 4	1625	=over 4
…		…
1483	my ($path) = @_;	1638	my ($path) = @_;
1484		1639
1485	my ($match, $specificity);	1640	my ($match, $specificity);
1486		1641
1487	for my $region (list) {	1642	for my $region (list) {
1488	if ($region->match && $path =~ $region->match) {	1643	if ($region->{match} && $path =~ $region->{match}) {
1489	($match, $specificity) = ($region, $region->specificity)	1644	($match, $specificity) = ($region, $region->specificity)
1490	if $region->specificity > $specificity;	1645	if $region->specificity > $specificity;
1491	}	1646	}
1492	}	1647	}
1493		1648
…		…
1613	$self->init; # pass $1 etc.	1768	$self->init; # pass $1 etc.
1614	return $self;	1769	return $self;
1615	}	1770	}
1616	}	1771	}
1617		1772
1618	Carp::carp "unable to resolve path '$path' (base '$base').";	1773	Carp::cluck "unable to resolve path '$path' (base '$base').";
1619	()	1774	()
1620	}	1775	}
1621		1776
1622	sub init {	1777	sub init {
1623	my ($self) = @_;	1778	my ($self) = @_;
…		…
1686		1841
1687	sub load_header_from($) {	1842	sub load_header_from($) {
1688	my ($self, $path) = @_;	1843	my ($self, $path) = @_;
1689		1844
1690	utf8::encode $path;	1845	utf8::encode $path;
1691	#aio_open $path, O_RDONLY, 0	1846	my $f = new_from_file cf::object::thawer $path
1692	# or return;
1693
1694	$self->_load_header ($path)
1695	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;
1696		1854
1697	$self->{load_path} = $path;	1855	$self->{load_path} = $path;
1698		1856
1699	1	1857	1
1700	}	1858	}
…		…
1754	sub find {	1912	sub find {
1755	my ($path, $origin) = @_;	1913	my ($path, $origin) = @_;
1756		1914
1757	$path = normalise $path, $origin && $origin->path;	1915	$path = normalise $path, $origin && $origin->path;
1758		1916
		1917	cf::lock_wait "map_data:$path";#d#remove
1759	cf::lock_wait "map_find:$path";	1918	cf::lock_wait "map_find:$path";
1760		1919
1761	$cf::MAP{$path} \|\| do {	1920	$cf::MAP{$path} \|\| do {
1762	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
1763	my $map = new_from_path cf::map $path	1924	my $map = new_from_path cf::map $path
1764	or return;	1925	or return;
1765		1926
1766	$map->{last_save} = $cf::RUNTIME;	1927	$map->{last_save} = $cf::RUNTIME;
1767		1928
…		…
1769	or return;	1930	or return;
1770		1931
1771	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1932	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1772	# doing this can freeze the server in a sync job, obviously	1933	# doing this can freeze the server in a sync job, obviously
1773	#$cf::WAIT_FOR_TICK->wait;	1934	#$cf::WAIT_FOR_TICK->wait;
		1935	undef $guard1;
		1936	undef $guard2;
1774	$map->reset;	1937	$map->reset;
1775	undef $guard;
1776	return find $path;	1938	return find $path;
1777	}	1939	}
1778		1940
1779	$cf::MAP{$path} = $map	1941	$cf::MAP{$path} = $map
1780	}	1942	}
…		…
1789	local $self->{deny_reset} = 1; # loading can take a long time	1951	local $self->{deny_reset} = 1; # loading can take a long time
1790		1952
1791	my $path = $self->{path};	1953	my $path = $self->{path};
1792		1954
1793	{	1955	{
1794	my $guard = cf::lock_acquire "map_load:$path";	1956	my $guard = cf::lock_acquire "map_data:$path";
1795		1957
		1958	return unless $self->valid;
1796	return if $self->in_memory != cf::MAP_SWAPPED;	1959	return unless $self->in_memory == cf::MAP_SWAPPED;
1797		1960
1798	$self->in_memory (cf::MAP_LOADING);	1961	$self->in_memory (cf::MAP_LOADING);
1799		1962
1800	$self->alloc;	1963	$self->alloc;
1801		1964
1802	$self->pre_load;	1965	$self->pre_load;
1803	Coro::cede;	1966	cf::cede_to_tick;
1804		1967
		1968	my $f = new_from_file cf::object::thawer $self->{load_path};
		1969	$f->skip_block;
1805	$self->_load_objects ($self->{load_path}, 1)	1970	$self->_load_objects ($f)
1806	or return;	1971	or return;
1807		1972
1808	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1973	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1809	if delete $self->{load_original};	1974	if delete $self->{load_original};
1810		1975
1811	if (my $uniq = $self->uniq_path) {	1976	if (my $uniq = $self->uniq_path) {
1812	utf8::encode $uniq;	1977	utf8::encode $uniq;
1813	if (aio_open $uniq, O_RDONLY, 0) {	1978	unless (aio_stat $uniq) {
		1979	if (my $f = new_from_file cf::object::thawer $uniq) {
1814	$self->clear_unique_items;	1980	$self->clear_unique_items;
1815	$self->_load_objects ($uniq, 0);	1981	$self->_load_objects ($f);
		1982	$f->resolve_delayed_derefs;
		1983	}
1816	}	1984	}
1817	}	1985	}
1818		1986
1819	Coro::cede;	1987	$f->resolve_delayed_derefs;
		1988
		1989	cf::cede_to_tick;
1820	# now do the right thing for maps	1990	# now do the right thing for maps
1821	$self->link_multipart_objects;	1991	$self->link_multipart_objects;
1822	$self->difficulty ($self->estimate_difficulty)	1992	$self->difficulty ($self->estimate_difficulty)
1823	unless $self->difficulty;	1993	unless $self->difficulty;
1824	Coro::cede;	1994	cf::cede_to_tick;
1825		1995
1826	unless ($self->{deny_activate}) {	1996	unless ($self->{deny_activate}) {
1827	$self->decay_objects;	1997	$self->decay_objects;
1828	$self->fix_auto_apply;	1998	$self->fix_auto_apply;
1829	$self->update_buttons;	1999	$self->update_buttons;
1830	Coro::cede;	2000	cf::cede_to_tick;
1831	$self->set_darkness_map;	2001	$self->set_darkness_map;
1832	Coro::cede;	2002	cf::cede_to_tick;
1833	$self->activate;	2003	$self->activate;
1834	}	2004	}
		2005
		2006	$self->{last_save} = $cf::RUNTIME;
		2007	$self->last_access ($cf::RUNTIME);
1835		2008
1836	$self->in_memory (cf::MAP_IN_MEMORY);	2009	$self->in_memory (cf::MAP_IN_MEMORY);
1837	}	2010	}
1838		2011
1839	$self->post_load;	2012	$self->post_load;
…		…
1850		2023
1851	$self	2024	$self
1852	}	2025	}
1853		2026
1854	# 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
1855	sub load_diag {	2028	sub load_neighbours {
1856	my ($map) = @_;	2029	my ($map) = @_;
1857		2030
1858	my @diag; # diagonal neighbours	2031	my @neigh; # diagonal neighbours
1859		2032
1860	for (0 .. 3) {	2033	for (0 .. 3) {
1861	my $neigh = $map->tile_path ($_)	2034	my $neigh = $map->tile_path ($_)
1862	or next;	2035	or next;
1863	$neigh = find $neigh, $map	2036	$neigh = find $neigh, $map
1864	or next;	2037	or next;
1865	$neigh->load;	2038	$neigh->load;
1866		2039
		2040	push @neigh,
1867	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2041	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1868	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2042	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1869	}	2043	}
1870		2044
1871	for (@diag) {	2045	for (grep defined $_->[0], @neigh) {
		2046	my ($path, $origin) = @$_;
1872	my $neigh = find @$_	2047	my $neigh = find $path, $origin
1873	or next;	2048	or next;
1874	$neigh->load;	2049	$neigh->load;
1875	}	2050	}
1876	}	2051	}
1877		2052
…		…
1882	}	2057	}
1883		2058
1884	sub do_load_sync {	2059	sub do_load_sync {
1885	my ($map) = @_;	2060	my ($map) = @_;
1886		2061
		2062	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2063	if $Coro::current == $Coro::main;
		2064
1887	cf::sync_job { $map->load };	2065	cf::sync_job { $map->load };
1888	}	2066	}
1889		2067
1890	our %MAP_PREFETCH;	2068	our %MAP_PREFETCH;
1891	our $MAP_PREFETCHER = undef;	2069	our $MAP_PREFETCHER = undef;
1892		2070
1893	sub find_async {	2071	sub find_async {
1894	my ($path, $origin) = @_;	2072	my ($path, $origin, $load) = @_;
1895		2073
1896	$path = normalise $path, $origin && $origin->{path};	2074	$path = normalise $path, $origin && $origin->{path};
1897		2075
1898	if (my $map = $cf::MAP{$path}) {	2076	if (my $map = $cf::MAP{$path}) {
1899	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2077	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1900	}	2078	}
1901		2079
1902	undef $MAP_PREFETCH{$path};	2080	$MAP_PREFETCH{$path} \|= $load;
		2081
1903	$MAP_PREFETCHER \|\|= cf::async {	2082	$MAP_PREFETCHER \|\|= cf::async {
		2083	$Coro::current->{desc} = "map prefetcher";
		2084
1904	while (%MAP_PREFETCH) {	2085	while (%MAP_PREFETCH) {
1905	for my $path (keys %MAP_PREFETCH) {	2086	while (my ($k, $v) = each %MAP_PREFETCH) {
1906	my $map = find $path	2087	if (my $map = find $k) {
1907	or next;
1908	$map->load;	2088	$map->load if $v;
		2089	}
1909		2090
1910	delete $MAP_PREFETCH{$path};	2091	delete $MAP_PREFETCH{$k};
1911	}	2092	}
1912	}	2093	}
1913	undef $MAP_PREFETCHER;	2094	undef $MAP_PREFETCHER;
1914	};	2095	};
1915	$MAP_PREFETCHER->prio (6);	2096	$MAP_PREFETCHER->prio (6);
…		…
1918	}	2099	}
1919		2100
1920	sub save {	2101	sub save {
1921	my ($self) = @_;	2102	my ($self) = @_;
1922		2103
1923	my $lock = cf::lock_acquire "map_data:" . $self->path;	2104	my $lock = cf::lock_acquire "map_data:$self->{path}";
1924		2105
1925	$self->{last_save} = $cf::RUNTIME;	2106	$self->{last_save} = $cf::RUNTIME;
1926		2107
1927	return unless $self->dirty;	2108	return unless $self->dirty;
1928		2109
…		…
1934	return if $self->{deny_save};	2115	return if $self->{deny_save};
1935		2116
1936	local $self->{last_access} = $self->last_access;#d#	2117	local $self->{last_access} = $self->last_access;#d#
1937		2118
1938	cf::async {	2119	cf::async {
		2120	$Coro::current->{desc} = "map player save";
1939	$_->contr->save for $self->players;	2121	$_->contr->save for $self->players;
1940	};	2122	};
1941		2123
1942	if ($uniq) {	2124	if ($uniq) {
1943	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	2125	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
…		…
1951	my ($self) = @_;	2133	my ($self) = @_;
1952		2134
1953	# save first because save cedes	2135	# save first because save cedes
1954	$self->save;	2136	$self->save;
1955		2137
1956	my $lock = cf::lock_acquire "map_data:" . $self->path;	2138	my $lock = cf::lock_acquire "map_data:$self->{path}";
1957		2139
1958	return if $self->players;	2140	return if $self->players;
1959	return if $self->in_memory != cf::MAP_IN_MEMORY;	2141	return if $self->in_memory != cf::MAP_IN_MEMORY;
1960	return if $self->{deny_save};	2142	return if $self->{deny_save};
1961		2143
		2144	$self->in_memory (cf::MAP_SWAPPED);
		2145
		2146	$self->deactivate;
		2147	$_->clear_links_to ($self) for values %cf::MAP;
1962	$self->clear;	2148	$self->clear;
1963	$self->in_memory (cf::MAP_SWAPPED);
1964	}	2149	}
1965		2150
1966	sub reset_at {	2151	sub reset_at {
1967	my ($self) = @_;	2152	my ($self) = @_;
1968		2153
…		…
2000	if $uniq;	2185	if $uniq;
2001	}	2186	}
2002		2187
2003	delete $cf::MAP{$self->path};	2188	delete $cf::MAP{$self->path};
2004		2189
		2190	$self->deactivate;
		2191	$_->clear_links_to ($self) for values %cf::MAP;
2005	$self->clear;	2192	$self->clear;
2006
2007	$_->clear_links_to ($self) for values %cf::MAP;
2008		2193
2009	$self->unlink_save;	2194	$self->unlink_save;
2010	$self->destroy;	2195	$self->destroy;
2011	}	2196	}
2012		2197
2013	my $nuke_counter = "aaaa";	2198	my $nuke_counter = "aaaa";
2014		2199
2015	sub nuke {	2200	sub nuke {
2016	my ($self) = @_;	2201	my ($self) = @_;
2017		2202
		2203	{
		2204	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2205
2018	delete $cf::MAP{$self->path};	2206	delete $cf::MAP{$self->path};
2019		2207
2020	$self->unlink_save;	2208	$self->unlink_save;
2021		2209
2022	bless $self, "cf::map";	2210	bless $self, "cf::map";
2023	delete $self->{deny_reset};	2211	delete $self->{deny_reset};
2024	$self->{deny_save} = 1;	2212	$self->{deny_save} = 1;
2025	$self->reset_timeout (1);	2213	$self->reset_timeout (1);
2026	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2214	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2027		2215
2028	$cf::MAP{$self->path} = $self;	2216	$cf::MAP{$self->path} = $self;
		2217	}
2029		2218
2030	$self->reset; # polite request, might not happen	2219	$self->reset; # polite request, might not happen
2031	}	2220	}
2032		2221
2033	=item $maps = cf::map::tmp_maps	2222	=item $maps = cf::map::tmp_maps
…		…
2109		2298
2110	sub inv_recursive {	2299	sub inv_recursive {
2111	inv_recursive_ inv $_[0]	2300	inv_recursive_ inv $_[0]
2112	}	2301	}
2113		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
2114	package cf;	2331	package cf;
2115		2332
2116	=back	2333	=back
2117		2334
2118	=head3 cf::object::player	2335	=head3 cf::object::player
…		…
2140		2357
2141	} else {	2358	} else {
2142	my $pl = $self->contr;	2359	my $pl = $self->contr;
2143		2360
2144	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2361	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145	my $diag = $pl->{npc_dialog};	2362	my $dialog = $pl->{npc_dialog};
2146	$diag->{pl}->ext_reply (	2363	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2147	$diag->{id},
2148	msgtype => "reply",
2149	msg => $diag->{pl}->expand_cfpod ($msg),
2150	add_topics => []
2151	);
2152		2364
2153	} else {	2365	} else {
2154	$msg = $npc->name . " says: $msg" if $npc;	2366	$msg = $npc->name . " says: $msg" if $npc;
2155	$self->message ($msg, $flags);	2367	$self->message ($msg, $flags);
2156	}	2368	}
2157	}	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 (@_);
2158	}	2380	}
2159		2381
2160	=item $player_object->may ("access")	2382	=item $player_object->may ("access")
2161		2383
2162	Returns wether the given player is authorized to access resource "access"	2384	Returns wether the given player is authorized to access resource "access"
…		…
2241	# use -1 or undef as default coordinates, not 0, 0	2463	# use -1 or undef as default coordinates, not 0, 0
2242	($x, $y) = ($map->enter_x, $map->enter_y)	2464	($x, $y) = ($map->enter_x, $map->enter_y)
2243	if $x <=0 && $y <= 0;	2465	if $x <=0 && $y <= 0;
2244		2466
2245	$map->load;	2467	$map->load;
2246	$map->load_diag;	2468	$map->load_neighbours;
2247		2469
2248	return unless $self->contr->active;	2470	return unless $self->contr->active;
2249	$self->activate_recursive;	2471	$self->activate_recursive;
2250		2472
2251	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2473	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252	$self->enter_map ($map, $x, $y);	2474	$self->enter_map ($map, $x, $y);
2253	}	2475	}
2254		2476
2255	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2477	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256		2478
2257	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
2258	her, loading and preparing them map, calling the provided $check callback	2480	her, loading and preparing them map, calling the provided $check callback
2259	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
2260	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.
2261		2484
2262	=cut	2485	=cut
2263		2486
2264	our $GOTOGEN;	2487	our $GOTOGEN;
2265		2488
2266	sub cf::object::player::goto {	2489	sub cf::object::player::goto {
2267	my ($self, $path, $x, $y, $check) = @_;	2490	my ($self, $path, $x, $y, $check, $done) = @_;
2268		2491
2269	# 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
2270	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2493	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271		2494
2272	$self->enter_link;	2495	$self->enter_link;
2273		2496
2274	(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
2275	my $map = eval {	2519	my $map = eval {
2276	my $map = cf::map::find $path;	2520	my $map = defined $path ? cf::map::find $path : undef;
2277		2521
2278	if ($map) {	2522	if ($map) {
2279	$map = $map->customise_for ($self);	2523	$map = $map->customise_for ($self);
2280	$map = $check->($map) if $check && $map;	2524	$map = $check->($map) if $check && $map;
2281	} else {	2525	} else {
2282	$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);
2283	}	2527	}
2284		2528
2285	$map	2529	$map
2286	};	2530	};
2287		2531
…		…
2292		2536
2293	if ($gen == $self->{_goto_generation}) {	2537	if ($gen == $self->{_goto_generation}) {
2294	delete $self->{_goto_generation};	2538	delete $self->{_goto_generation};
2295	$self->leave_link ($map, $x, $y);	2539	$self->leave_link ($map, $x, $y);
2296	}	2540	}
		2541
		2542	$done->() if $done;
2297	})->prio (1);	2543	})->prio (1);
2298	}	2544	}
2299		2545
2300	=item $player_object->enter_exit ($exit_object)	2546	=item $player_object->enter_exit ($exit_object)
2301		2547
…		…
2375	# if exit is damned, update players death & WoR home-position	2621	# if exit is damned, update players death & WoR home-position
2376	$self->contr->savebed ($slaying, $hp, $sp)	2622	$self->contr->savebed ($slaying, $hp, $sp)
2377	if $exit->flag (FLAG_DAMNED);	2623	if $exit->flag (FLAG_DAMNED);
2378		2624
2379	(async {	2625	(async {
		2626	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2627
2380	$self->deactivate_recursive; # just to be sure	2628	$self->deactivate_recursive; # just to be sure
2381	unless (eval {	2629	unless (eval {
2382	$self->goto ($slaying, $hp, $sp);	2630	$self->goto ($slaying, $hp, $sp);
2383		2631
2384	1;	2632	1;
…		…
2410		2658
2411	utf8::encode $text;	2659	utf8::encode $text;
2412	$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);
2413	}	2661	}
2414		2662
2415	=item $client->send_msg ($color, $type, $msg, [extra...])	2663	=item $client->send_msg ($channel, $msg, $color, [extra...])
2416		2664
2417	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
2418	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
2419	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
2420	the message unless the client supports the msg packet.	2668	the message unless the client supports the msg packet.
2421		2669
2422	=cut	2670	=cut
2423		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
2424	sub cf::client::send_msg {	2693	sub cf::client::send_msg {
2425	my ($self, $color, $type, $msg, @extra) = @_;	2694	my ($self, $channel, $msg, $color, @extra) = @_;
2426		2695
2427	$msg = $self->pl->expand_cfpod ($msg);	2696	$msg = $self->pl->expand_cfpod ($msg);
2428		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
2429	return unless @extra \|\| length $msg;	2720	return unless @extra \|\| length $msg;
2430		2721
2431	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
2432	$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]));
2433	} else {	2729	} else {
2434	# replace some tags by gcfclient-compatible ones
2435	for ($msg) {
2436	1 while
2437	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2438	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2439	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2440	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2441	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2442	}
2443
2444	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
2445	if (0 && $msg =~ /\[/) {	2745	if (0 && $msg =~ /\[/) {
		2746	# COMMAND/INFO
2446	$self->send_packet ("drawextinfo $color 4 0 $msg")	2747	$self->send_packet ("drawextinfo $color 10 8 $msg")
2447	} else {	2748	} else {
2448	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2749	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2449	$self->send_packet ("drawinfo $color $msg")	2750	$self->send_packet ("drawinfo $color $msg")
2450	}	2751	}
2451	}	2752	}
2452	}	2753	}
2453	}	2754	}
2454		2755
2455	=item $client->ext_event ($type, %msg)	2756	=item $client->ext_msg ($type, @msg)
2456		2757
2457	Sends an ext event to the client.	2758	Sends an ext event to the client.
2458		2759
2459	=cut	2760	=cut
2460		2761
2461	sub cf::client::ext_event($$%) {	2762	sub cf::client::ext_msg($$@) {
2462	my ($self, $type, %msg) = @_;	2763	my ($self, $type, @msg) = @_;
2463		2764
		2765	if ($self->extcmd == 2) {
		2766	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2767	} elsif ($self->extcmd == 1) { # TODO: remove
2464	$msg{msgtype} = "event_$type";	2768	push @msg, msgtype => "event_$type";
2465	$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	}
2466	}	2789	}
2467		2790
2468	=item $success = $client->query ($flags, "text", \&cb)	2791	=item $success = $client->query ($flags, "text", \&cb)
2469		2792
2470	Queues a query to the client, calling the given callback with	2793	Queues a query to the client, calling the given callback with
…		…
2525	my ($ns, $buf) = @_;	2848	my ($ns, $buf) = @_;
2526		2849
2527	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2850	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528		2851
2529	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
2530	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2860	if (my $cb = $EXTICMD{$type}) {
2531	if (my %reply = $cb->($ns, $msg)) {	2861	@reply = $cb->($ns, @payload);
2532	$reply{msgid} = $msg->{msgid};
2533	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534	}
2535	}	2862	}
		2863
		2864	$ns->ext_reply ($reply, @reply)
		2865	if $reply;
		2866
2536	} else {	2867	} else {
2537	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";
2538	}	2869	}
2539		2870
2540	cf::override;	2871	cf::override;
…		…
2587	our $safe = new Safe "safe";	2918	our $safe = new Safe "safe";
2588	our $safe_hole = new Safe::Hole;	2919	our $safe_hole = new Safe::Hole;
2589		2920
2590	$SIG{FPE} = 'IGNORE';	2921	$SIG{FPE} = 'IGNORE';
2591		2922
2592	$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	));
2593		2928
2594	# here we export the classes and methods available to script code	2929	# here we export the classes and methods available to script code
2595		2930
2596	=pod	2931	=pod
2597		2932
2598	The following functions and methods are available within a safe environment:	2933	The following functions and methods are available within a safe environment:
2599		2934
2600	cf::object	2935	cf::object
2601	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
2602	insert remove	2937	insert remove name archname title slaying race decrease_ob_nr
2603		2938
2604	cf::object::player	2939	cf::object::player
2605	player	2940	player
2606		2941
2607	cf::player	2942	cf::player
…		…
2612		2947
2613	=cut	2948	=cut
2614		2949
2615	for (	2950	for (
2616	["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
2617	insert remove)],	2953	decrease_ob_nr destroy)],
2618	["cf::object::player" => qw(player)],	2954	["cf::object::player" => qw(player)],
2619	["cf::player" => qw(peaceful)],	2955	["cf::player" => qw(peaceful)],
2620	["cf::map" => qw(trigger)],	2956	["cf::map" => qw(trigger)],
2621	) {	2957	) {
2622	no strict 'refs';	2958	no strict 'refs';
…		…
2698	# the server's init and main functions	3034	# the server's init and main functions
2699		3035
2700	sub load_facedata($) {	3036	sub load_facedata($) {
2701	my ($path) = @_;	3037	my ($path) = @_;
2702		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
2703	warn "loading facedata from $path\n";	3045	warn "loading facedata from $path\n";
2704		3046
2705	my $facedata;	3047	my $facedata;
2706	0 < aio_load $path, $facedata	3048	0 < aio_load $path, $facedata
2707	or die "$path: $!";	3049	or die "$path: $!";
…		…
2709	$facedata = Coro::Storable::thaw $facedata;	3051	$facedata = Coro::Storable::thaw $facedata;
2710		3052
2711	$facedata->{version} == 2	3053	$facedata->{version} == 2
2712	or cf::cleanup "$path: version mismatch, cannot proceed.";	3054	or cf::cleanup "$path: version mismatch, cannot proceed.";
2713		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
2714	{	3063	{
2715	my $faces = $facedata->{faceinfo};	3064	my $faces = $facedata->{faceinfo};
2716		3065
2717	while (my ($face, $info) = each %$faces) {	3066	while (my ($face, $info) = each %$faces) {
2718	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3067	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2719	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3068	cf::face::set_visibility $idx, $info->{visibility};
		3069	cf::face::set_magicmap $idx, $info->{magicmap};
2720	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3070	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2721	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3071	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2722	Coro::cede;	3072
		3073	cf::cede_to_tick;
2723	}	3074	}
2724		3075
2725	while (my ($face, $info) = each %$faces) {	3076	while (my ($face, $info) = each %$faces) {
2726	next unless $info->{smooth};	3077	next unless $info->{smooth};
2727	my $idx = cf::face::find $face	3078	my $idx = cf::face::find $face
2728	or next;	3079	or next;
2729	if (my $smooth = cf::face::find $info->{smooth}) {	3080	if (my $smooth = cf::face::find $info->{smooth}) {
		3081	cf::face::set_smooth $idx, $smooth;
2730	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3082	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731	} else {	3083	} else {
2732	warn "smooth face '$info->{smooth}' not found for face '$face'";	3084	warn "smooth face '$info->{smooth}' not found for face '$face'";
2733	}	3085	}
2734	Coro::cede;	3086
		3087	cf::cede_to_tick;
2735	}	3088	}
2736	}	3089	}
2737		3090
2738	{	3091	{
2739	my $anims = $facedata->{animinfo};	3092	my $anims = $facedata->{animinfo};
2740		3093
2741	while (my ($anim, $info) = each %$anims) {	3094	while (my ($anim, $info) = each %$anims) {
2742	cf::anim::set $anim, $info->{frames}, $info->{facings};	3095	cf::anim::set $anim, $info->{frames}, $info->{facings};
2743	Coro::cede;	3096	cf::cede_to_tick;
2744	}	3097	}
2745		3098
2746	cf::anim::invalidate_all; # d'oh	3099	cf::anim::invalidate_all; # d'oh
2747	}	3100	}
2748		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
2749	1	3151	1
2750	}	3152	}
2751		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
2752	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
2753	load_resource_file "$MAPDIR/regions"	3167	load_resource_file "$MAPDIR/regions"
2754	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	}
2755	}	3174	}
2756		3175
2757	sub reload_facedata {	3176	sub reload_facedata {
2758	load_facedata "$DATADIR/facedata"	3177	load_facedata "$DATADIR/facedata"
2759	or die "unable to load facedata\n";	3178	or die "unable to load facedata\n";
…		…
2788		3207
2789	sub init {	3208	sub init {
2790	reload_resources;	3209	reload_resources;
2791	}	3210	}
2792		3211
2793	sub cfg_load {	3212	sub reload_config {
2794	open my $fh, "<:utf8", "$CONFDIR/config"	3213	open my $fh, "<:utf8", "$CONFDIR/config"
2795	or return;	3214	or return;
2796		3215
2797	local $/;	3216	local $/;
2798	*CFG = YAML::Syck::Load <$fh>;	3217	*CFG = YAML::Syck::Load <$fh>;
…		…
2814	sub main {	3233	sub main {
2815	# we must not ever block the main coroutine	3234	# we must not ever block the main coroutine
2816	local $Coro::idle = sub {	3235	local $Coro::idle = sub {
2817	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#
2818	(async {	3237	(async {
		3238	$Coro::current->{desc} = "IDLE BUG HANDLER";
2819	Event::one_event;	3239	Event::one_event;
2820	})->prio (Coro::PRIO_MAX);	3240	})->prio (Coro::PRIO_MAX);
2821	};	3241	};
2822		3242
2823	cfg_load;	3243	reload_config;
2824	db_init;	3244	db_init;
2825	load_extensions;	3245	load_extensions;
2826		3246
2827	$TICK_WATCHER->start;	3247	$TICK_WATCHER->start;
2828	Event::loop;	3248	Event::loop;
…		…
2895	# and maps saved/destroyed asynchronously.	3315	# and maps saved/destroyed asynchronously.
2896	warn "begin emergency player save\n";	3316	warn "begin emergency player save\n";
2897	for my $login (keys %cf::PLAYER) {	3317	for my $login (keys %cf::PLAYER) {
2898	my $pl = $cf::PLAYER{$login} or next;	3318	my $pl = $cf::PLAYER{$login} or next;
2899	$pl->valid or next;	3319	$pl->valid or next;
		3320	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2900	$pl->save;	3321	$pl->save;
2901	}	3322	}
2902	warn "end emergency player save\n";	3323	warn "end emergency player save\n";
2903		3324
2904	warn "begin emergency map save\n";	3325	warn "begin emergency map save\n";
…		…
2952		3373
2953	warn "flushing outstanding aio requests";	3374	warn "flushing outstanding aio requests";
2954	for (;;) {	3375	for (;;) {
2955	BDB::flush;	3376	BDB::flush;
2956	IO::AIO::flush;	3377	IO::AIO::flush;
2957	Coro::cede;	3378	Coro::cede_notself;
2958	last unless IO::AIO::nreqs \|\| BDB::nreqs;	3379	last unless IO::AIO::nreqs \|\| BDB::nreqs;
2959	warn "iterate...";	3380	warn "iterate...";
2960	}	3381	}
2961		3382
2962	++$RELOAD;	3383	++$RELOAD;
…		…
3021	warn "reloading cf.pm";	3442	warn "reloading cf.pm";
3022	require cf;	3443	require cf;
3023	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3444	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3024		3445
3025	warn "loading config and database again";	3446	warn "loading config and database again";
3026	cf::cfg_load;	3447	cf::reload_config;
3027		3448
3028	warn "loading extensions";	3449	warn "loading extensions";
3029	cf::load_extensions;	3450	cf::load_extensions;
3030		3451
3031	warn "reattaching attachments to objects/players";	3452	warn "reattaching attachments to objects/players";
…		…
3067	register_command "reload" => sub {	3488	register_command "reload" => sub {
3068	my ($who, $arg) = @_;	3489	my ($who, $arg) = @_;
3069		3490
3070	if ($who->flag (FLAG_WIZ)) {	3491	if ($who->flag (FLAG_WIZ)) {
3071	$who->message ("reloading server.");	3492	$who->message ("reloading server.");
		3493	async {
		3494	$Coro::current->{desc} = "perl_reload";
3072	async { reload_perl };	3495	reload_perl;
		3496	};
3073	}	3497	}
3074	};	3498	};
3075		3499
3076	unshift @INC, $LIBDIR;	3500	unshift @INC, $LIBDIR;
3077		3501
…		…
3096	my $signal = new Coro::Signal;	3520	my $signal = new Coro::Signal;
3097	push @WAIT_FOR_TICK_BEGIN, $signal;	3521	push @WAIT_FOR_TICK_BEGIN, $signal;
3098	$signal->wait;	3522	$signal->wait;
3099	}	3523	}
3100		3524
3101	my $min = 1e6;#d#
3102	my $avg = 10;
3103	$TICK_WATCHER = Event->timer (	3525	$TICK_WATCHER = Event->timer (
3104	reentrant => 0,	3526	reentrant => 0,
3105	parked => 1,	3527	parked => 1,
3106	prio => 0,	3528	prio => 0,
3107	at => $NEXT_TICK \|\| $TICK,	3529	at => $NEXT_TICK \|\| $TICK,
…		…
3115		3537
3116	$NOW = $tick_start = Event::time;	3538	$NOW = $tick_start = Event::time;
3117		3539
3118	cf::server_tick; # one server iteration	3540	cf::server_tick; # one server iteration
3119		3541
3120	0 && sync_job {#d#
3121	for(1..10) {
3122	my $t = Event::time;
3123	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3124	or die;
3125
3126	$map->width (50);
3127	$map->height (50);
3128	$map->alloc;
3129	$map->_load_objects ("/tmp/x.map", 1);
3130	my $t = Event::time - $t;
3131
3132	#next unless $t < 0.0013;#d#
3133	if ($t < $min) {
3134	$min = $t;
3135	}
3136	$avg = $avg * 0.99 + $t * 0.01;
3137	}
3138	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3139	exit 0;
3140	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3141	};
3142
3143	$RUNTIME += $TICK;	3542	$RUNTIME += $TICK;
3144	$NEXT_TICK += $TICK;	3543	$NEXT_TICK += $TICK;
3145		3544
3146	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3545	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3147	$NEXT_RUNTIME_WRITE = $NOW + 10;	3546	$NEXT_RUNTIME_WRITE = $NOW + 10;
3148	Coro::async_pool {	3547	Coro::async_pool {
		3548	$Coro::current->{desc} = "runtime saver";
3149	write_runtime	3549	write_runtime
3150	or warn "ERROR: unable to write runtime file: $!";	3550	or warn "ERROR: unable to write runtime file: $!";
3151	};	3551	};
3152	}	3552	}
3153		3553
3154	# my $AFTER = Event::time;
3155	# warn $AFTER - $NOW;#d#
3156
3157	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3554	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3158	$sig->send;	3555	$sig->send;
3159	}	3556	}
3160	while (my $sig = shift @WAIT_FOR_TICK) {	3557	while (my $sig = shift @WAIT_FOR_TICK) {
3161	$sig->send;	3558	$sig->send;
…		…
3171		3568
3172	$LOAD = ($NOW - $tick_start) / $TICK;	3569	$LOAD = ($NOW - $tick_start) / $TICK;
3173	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3570	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3174		3571
3175	_post_tick;	3572	_post_tick;
3176
3177
3178	},	3573	},
3179	);	3574	);
3180		3575
3181	{	3576	{
		3577	BDB::min_parallel 8;
3182	BDB::max_poll_time $TICK * 0.1;	3578	BDB::max_poll_time $TICK * 0.1;
3183	$BDB_POLL_WATCHER = Event->io (	3579	$BDB_POLL_WATCHER = Event->io (
3184	reentrant => 0,	3580	reentrant => 0,
3185	fd => BDB::poll_fileno,	3581	fd => BDB::poll_fileno,
3186	poll => 'r',	3582	poll => 'r',
3187	prio => 0,	3583	prio => 0,
3188	data => WF_AUTOCANCEL,	3584	data => WF_AUTOCANCEL,
3189	cb => \&BDB::poll_cb,	3585	cb => \&BDB::poll_cb,
3190	);	3586	);
3191	BDB::min_parallel 8;
3192		3587
3193	BDB::set_sync_prepare {	3588	BDB::set_sync_prepare {
3194	my $status;	3589	my $status;
3195	my $current = $Coro::current;	3590	my $current = $Coro::current;
3196	(	3591	(
…		…
3205	)	3600	)
3206	};	3601	};
3207		3602
3208	unless ($DB_ENV) {	3603	unless ($DB_ENV) {
3209	$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);
3210		3609
3211	cf::sync_job {	3610	cf::sync_job {
3212	eval {	3611	eval {
3213	BDB::db_env_open	3612	BDB::db_env_open
3214	$DB_ENV,	3613	$DB_ENV,
…		…
3216	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
3217	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3616	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3218	0666;	3617	0666;
3219		3618
3220	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3619	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3221
3222	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
3223	$DB_ENV->set_lk_detect;
3224	};	3620	};
3225		3621
3226	cf::cleanup "db_env_open(db): $@" if $@;	3622	cf::cleanup "db_env_open(db): $@" if $@;
3227	};	3623	};
3228	}	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	);
3229	}	3656	}
3230		3657
3231	{	3658	{
3232	IO::AIO::min_parallel 8;	3659	IO::AIO::min_parallel 8;
3233		3660
…		…
3236	$AIO_POLL_WATCHER = Event->io (	3663	$AIO_POLL_WATCHER = Event->io (
3237	reentrant => 0,	3664	reentrant => 0,
3238	data => WF_AUTOCANCEL,	3665	data => WF_AUTOCANCEL,
3239	fd => IO::AIO::poll_fileno,	3666	fd => IO::AIO::poll_fileno,
3240	poll => 'r',	3667	poll => 'r',
3241	prio => 6,	3668	prio => 0,
3242	cb => \&IO::AIO::poll_cb,	3669	cb => \&IO::AIO::poll_cb,
3243	);	3670	);
3244	}	3671	}
3245		3672
3246	my $_log_backtrace;	3673	my $_log_backtrace;
…		…
3252		3679
3253	# limit the # of concurrent backtraces	3680	# limit the # of concurrent backtraces
3254	if ($_log_backtrace < 2) {	3681	if ($_log_backtrace < 2) {
3255	++$_log_backtrace;	3682	++$_log_backtrace;
3256	async {	3683	async {
		3684	$Coro::current->{desc} = "abt $msg";
		3685
3257	my @bt = fork_call {	3686	my @bt = fork_call {
3258	@addr = map { sprintf "%x", $_ } @addr;	3687	@addr = map { sprintf "%x", $_ } @addr;
3259	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3688	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3260	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 \|"
3261	or die "addr2line: $!";	3690	or die "addr2line: $!";

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.298 by root, Sun Jul 8 14:50:07 2007 UTC vs. Revision 1.387 by root, Mon Oct 15 23:49:10 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.387 by root, Mon Oct 15 23:49:10 2007 UTC