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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.297 by root, Thu Jul 5 08:10:30 2007 UTC vs.
Revision 1.390 by root, Thu Oct 25 09:01:24 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	$res = Coro::Storable::thaw $res;
427
428	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430	die $$res unless "ARRAY" eq ref $res;
431
432	return wantarray ? @$res : $res->[-1];
433	} else {
434	reset_signals;	508	reset_signals;
435	local $SIG{__WARN__};	509	&$cb
436	local $SIG{__DIE__};	510	}, @args;
437	eval {
438	close $fh1;
439		511
440	my @res = eval { $cb->(@args) };	512	wantarray ? @res : $res[-1]
441	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442	};
443
444	warn $@ if $@;
445	_exit 0;
446	}
447	}	513	}
448		514
449	=item $value = cf::db_get $family => $key	515	=item $value = cf::db_get $family => $key
450		516
451	Returns a single value from the environment database.	517	Returns a single value from the environment database.
…		…
453	=item cf::db_put $family => $key => $value	519	=item cf::db_put $family => $key => $value
454		520
455	Stores the given C<$value> in the family. It can currently store binary	521	Stores the given C<$value> in the family. It can currently store binary
456	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).	522	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
457		523
		524	=item $db = cf::db_table "name"
		525
		526	Create and/or open a new database table. The string must not be "db" and must be unique
		527	within each server.
		528
458	=cut	529	=cut
		530
		531	sub db_table($) {
		532	my ($name) = @_;
		533	my $db = BDB::db_create $DB_ENV;
		534
		535	eval {
		536	$db->set_flags (BDB::CHKSUM);
		537
		538	utf8::encode $name;
		539	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		540	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
		541	cf::cleanup "db_open(db): $!" if $!;
		542	};
		543	cf::cleanup "db_open(db): $@" if $@;
		544
		545	$db
		546	}
459		547
460	our $DB;	548	our $DB;
461		549
462	sub db_init {	550	sub db_init {
463	unless ($DB) {
464	$DB = BDB::db_create $DB_ENV;
465
466	cf::sync_job {	551	cf::sync_job {
467	eval {	552	$DB \|\|= db_table "db";
468	$DB->set_flags (BDB::CHKSUM);
469
470	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
472	cf::cleanup "db_open(db): $!" if $!;
473	};
474	cf::cleanup "db_open(db): $@" if $@;
475	};
476	}	553	};
477	}	554	}
478		555
479	sub db_get($$) {	556	sub db_get($$) {
480	my $key = "$_[0]/$_[1]";	557	my $key = "$_[0]/$_[1]";
481		558
…		…
531	if (1) {	608	if (1) {
532	$md5 =	609	$md5 =
533	join "\x00",	610	join "\x00",
534	$processversion,	611	$processversion,
535	map {	612	map {
536	Coro::cede;	613	cf::cede_to_tick;
537	($src->[$_], Digest::MD5::md5_hex $data[$_])	614	($src->[$_], Digest::MD5::md5_hex $data[$_])
538	} 0.. $#$src;	615	} 0.. $#$src;
539		616
540		617
541	my $dbmd5 = db_get cache => "$id/md5";	618	my $dbmd5 = db_get cache => "$id/md5";
…		…
847	";	924	";
848	die if $@;	925	die if $@;
849	}	926	}
850		927
851	our $override;	928	our $override;
852	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	929	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
853		930
854	sub override {	931	sub override {
855	$override = 1;	932	$override = 1;
856	@invoke_results = ();	933	@INVOKE_RESULTS = (@_);
857	}	934	}
858		935
859	sub do_invoke {	936	sub do_invoke {
860	my $event = shift;	937	my $event = shift;
861	my $callbacks = shift;	938	my $callbacks = shift;
862		939
863	@invoke_results = ();	940	@INVOKE_RESULTS = ();
864		941
865	local $override;	942	local $override;
866		943
867	for (@$callbacks) {	944	for (@$callbacks) {
868	eval { &{$_->[1]} };	945	eval { &{$_->[1]} };
…		…
885		962
886	Generate an object-specific event with the given arguments.	963	Generate an object-specific event with the given arguments.
887		964
888	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	965	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
889	removed in future versions), and there is no public API to access override	966	removed in future versions), and there is no public API to access override
890	results (if you must, access C<@cf::invoke_results> directly).	967	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891		968
892	=back	969	=back
893		970
894	=cut	971	=cut
895		972
896	#############################################################################	973	#############################################################################
897	# object support	974	# object support
		975
		976	sub _object_equal($$);
		977	sub _object_equal($$) {
		978	my ($a, $b) = @_;
		979
		980	return 0 unless (ref $a) eq (ref $b);
		981
		982	if ("HASH" eq ref $a) {
		983	my @ka = keys %$a;
		984	my @kb = keys %$b;
		985
		986	return 0 if @ka != @kb;
		987
		988	for (0 .. $#ka) {
		989	return 0 unless $ka[$_] eq $kb[$_];
		990	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		991	}
		992
		993	} elsif ("ARRAY" eq ref $a) {
		994
		995	return 0 if @$a != @$b;
		996
		997	for (0 .. $#$a) {
		998	return 0 unless _object_equal $a->[$_], $b->[$_];
		999	}
		1000
		1001	} elsif ($a ne $b) {
		1002	return 0;
		1003	}
		1004
		1005	1
		1006	}
		1007
		1008	our $SLOW_MERGES;#d#
		1009	sub _can_merge {
		1010	my ($ob1, $ob2) = @_;
		1011
		1012	++$SLOW_MERGES;#d#
		1013
		1014	# we do the slow way here
		1015	return _object_equal $ob1, $ob2
		1016	}
898		1017
899	sub reattach {	1018	sub reattach {
900	# basically do the same as instantiate, without calling instantiate	1019	# basically do the same as instantiate, without calling instantiate
901	my ($obj) = @_;	1020	my ($obj) = @_;
902		1021
…		…
949	sub object_freezer_save {	1068	sub object_freezer_save {
950	my ($filename, $rdata, $objs) = @_;	1069	my ($filename, $rdata, $objs) = @_;
951		1070
952	sync_job {	1071	sync_job {
953	if (length $$rdata) {	1072	if (length $$rdata) {
		1073	utf8::decode (my $decname = $filename);
954	warn sprintf "saving %s (%d,%d)\n",	1074	warn sprintf "saving %s (%d,%d)\n",
955	$filename, length $$rdata, scalar @$objs;	1075	$decname, length $$rdata, scalar @$objs;
956		1076
957	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1077	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
958	chmod SAVE_MODE, $fh;	1078	chmod SAVE_MODE, $fh;
959	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1079	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960	aio_fsync $fh if $cf::USE_FSYNC;	1080	aio_fsync $fh if $cf::USE_FSYNC;
961	close $fh;	1081	close $fh;
962		1082
963	if (@$objs) {	1083	if (@$objs) {
964	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {	1084	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {
965	chmod SAVE_MODE, $fh;	1085	chmod SAVE_MODE, $fh;
966	my $data = Storable::nfreeze { version => 1, objs => $objs };	1086	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
967	aio_write $fh, 0, (length $data), $data, 0;	1087	aio_write $fh, 0, (length $data), $data, 0;
968	aio_fsync $fh if $cf::USE_FSYNC;	1088	aio_fsync $fh if $cf::USE_FSYNC;
969	close $fh;	1089	close $fh;
970	aio_rename "$filename.pst~", "$filename.pst";	1090	aio_rename "$filename.pst~", "$filename.pst";
971	}	1091	}
…		…
979	}	1099	}
980	} else {	1100	} else {
981	aio_unlink $filename;	1101	aio_unlink $filename;
982	aio_unlink "$filename.pst";	1102	aio_unlink "$filename.pst";
983	}	1103	}
984	}	1104	};
985	}	1105	}
986		1106
987	sub object_freezer_as_string {	1107	sub object_freezer_as_string {
988	my ($rdata, $objs) = @_;	1108	my ($rdata, $objs) = @_;
989		1109
…		…
1001	or return;	1121	or return;
1002		1122
1003	unless (aio_stat "$filename.pst") {	1123	unless (aio_stat "$filename.pst") {
1004	(aio_load "$filename.pst", $av) >= 0	1124	(aio_load "$filename.pst", $av) >= 0
1005	or return;	1125	or return;
		1126
1006	$av = eval { (Storable::thaw $av)->{objs} };	1127	my $st = eval { Coro::Storable::thaw $av };
		1128	$av = $st->{objs};
1007	}	1129	}
1008		1130
		1131	utf8::decode (my $decname = $filename);
1009	warn sprintf "loading %s (%d)\n",	1132	warn sprintf "loading %s (%d,%d)\n",
1010	$filename, length $data, scalar @{$av \|\| []};	1133	$decname, length $data, scalar @{$av \|\| []};
		1134
1011	return ($data, $av);	1135	($data, $av)
1012	}	1136	}
1013		1137
1014	=head2 COMMAND CALLBACKS	1138	=head2 COMMAND CALLBACKS
1015		1139
1016	=over 4	1140	=over 4
…		…
1089	my ($pl, $buf) = @_;	1213	my ($pl, $buf) = @_;
1090		1214
1091	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1215	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092		1216
1093	if (ref $msg) {	1217	if (ref $msg) {
		1218	my ($type, $reply, @payload) =
		1219	"ARRAY" eq ref $msg
		1220	? @$msg
		1221	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1222
		1223	my @reply;
		1224
1094	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1225	if (my $cb = $EXTCMD{$type}) {
1095	if (my %reply = $cb->($pl, $msg)) {	1226	@reply = $cb->($pl, @payload);
1096	$pl->ext_reply ($msg->{msgid}, %reply);
1097	}
1098	}	1227	}
		1228
		1229	$pl->ext_reply ($reply, @reply)
		1230	if $reply;
		1231
1099	} else {	1232	} else {
1100	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1233	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101	}	1234	}
1102		1235
1103	cf::override;	1236	cf::override;
…		…
1193		1326
1194	=head3 cf::player	1327	=head3 cf::player
1195		1328
1196	=over 4	1329	=over 4
1197		1330
		1331	=item cf::player::num_playing
		1332
		1333	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1334
		1335	=cut
		1336
		1337	sub num_playing {
		1338	scalar grep
		1339	$_->ob->map
		1340	&& !$_->hidden
		1341	&& !$_->ob->flag (cf::FLAG_WIZ),
		1342	cf::player::list
		1343	}
		1344
1198	=item cf::player::find $login	1345	=item cf::player::find $login
1199		1346
1200	Returns the given player object, loading it if necessary (might block).	1347	Returns the given player object, loading it if necessary (might block).
1201		1348
1202	=cut	1349	=cut
…		…
1237	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1384	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1385	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1386	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240	aio_unlink +(playerdir $login) . "/$login.pl";	1387	aio_unlink +(playerdir $login) . "/$login.pl";
1241		1388
1242	my $pl = load_pl path $login	1389	my $f = new_from_file cf::object::thawer path $login
1243	or return;	1390	or return;
		1391
		1392	my $pl = cf::player::load_pl $f
		1393	or return;
		1394	local $cf::PLAYER_LOADING{$login} = $pl;
		1395	$f->resolve_delayed_derefs;
1244	$cf::PLAYER{$login} = $pl	1396	$cf::PLAYER{$login} = $pl
1245	}	1397	}
1246	}	1398	}
1247	}	1399	}
1248		1400
…		…
1258		1410
1259	aio_mkdir playerdir $pl, 0770;	1411	aio_mkdir playerdir $pl, 0770;
1260	$pl->{last_save} = $cf::RUNTIME;	1412	$pl->{last_save} = $cf::RUNTIME;
1261		1413
1262	$pl->save_pl ($path);	1414	$pl->save_pl ($path);
1263	Coro::cede;	1415	cf::cede_to_tick;
1264	}	1416	}
1265		1417
1266	sub new($) {	1418	sub new($) {
1267	my ($login) = @_;	1419	my ($login) = @_;
1268		1420
…		…
1272	$self->{deny_save} = 1;	1424	$self->{deny_save} = 1;
1273		1425
1274	$cf::PLAYER{$login} = $self;	1426	$cf::PLAYER{$login} = $self;
1275		1427
1276	$self	1428	$self
		1429	}
		1430
		1431	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1432
		1433	=cut
		1434
		1435	sub send_msg {
		1436	my $ns = shift->ns
		1437	or return;
		1438	$ns->send_msg (@_);
1277	}	1439	}
1278		1440
1279	=item $pl->quit_character	1441	=item $pl->quit_character
1280		1442
1281	Nukes the player without looking back. If logged in, the connection will	1443	Nukes the player without looking back. If logged in, the connection will
…		…
1336	or return [];	1498	or return [];
1337		1499
1338	my @logins;	1500	my @logins;
1339		1501
1340	for my $login (@$dirs) {	1502	for my $login (@$dirs) {
		1503	my $path = path $login;
		1504
		1505	# a .pst is a dead give-away for a valid player
		1506	unless (-e "$path.pst") {
1341	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1507	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342	aio_read $fh, 0, 512, my $buf, 0 or next;	1508	aio_read $fh, 0, 512, my $buf, 0 or next;
1343	$buf !~ /^password -------------$/m or next; # official not-valid tag	1509	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1510	}
1344		1511
1345	utf8::decode $login;	1512	utf8::decode $login;
1346	push @logins, $login;	1513	push @logins, $login;
1347	}	1514	}
1348		1515
…		…
1386	sub expand_cfpod {	1553	sub expand_cfpod {
1387	((my $self), (local $_)) = @_;	1554	((my $self), (local $_)) = @_;
1388		1555
1389	# escape & and <	1556	# escape & and <
1390	s/&/&/g;	1557	s/&/&/g;
1391	s/(?<![BIUGH])</</g;	1558	s/(?<![BIUGHT])</</g;
1392		1559
1393	# this is buggy, it needs to properly take care of nested <'s	1560	# this is buggy, it needs to properly take care of nested <'s
1394		1561
1395	1 while	1562	1 while
1396	# replace B<>, I<>, U<> etc.	1563	# replace B<>, I<>, U<> etc.
1397	s/B<([^\>]*)>/<b>$1<\/b>/	1564	s/B<([^\>]*)>/<b>$1<\/b>/
1398	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1565	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1399	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1566	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1567	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1400	# replace G<male\|female> tags	1568	# replace G<male\|female> tags
1401	\|\| s{G<([^>\|])\\|([^>])>}{	1569	\|\| s{G<([^>\|])\\|([^>])>}{
1402	$self->gender ? $2 : $1	1570	$self->gender ? $2 : $1
1403	}ge	1571	}ge
1404	# replace H<hint text>	1572	# replace H<hint text>
…		…
1425	sub hintmode {	1593	sub hintmode {
1426	$_[0]{hintmode} = $_[1] if @_ > 1;	1594	$_[0]{hintmode} = $_[1] if @_ > 1;
1427	$_[0]{hintmode}	1595	$_[0]{hintmode}
1428	}	1596	}
1429		1597
1430	=item $player->ext_reply ($msgid, %msg)	1598	=item $player->ext_reply ($msgid, @msg)
1431		1599
1432	Sends an ext reply to the player.	1600	Sends an ext reply to the player.
1433		1601
1434	=cut	1602	=cut
1435		1603
1436	sub ext_reply($$%) {	1604	sub ext_reply($$@) {
1437	my ($self, $id, %msg) = @_;	1605	my ($self, $id, @msg) = @_;
1438		1606
1439	$msg{msgid} = $id;	1607	$self->ns->ext_reply ($id, @msg)
1440	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1441	}	1608	}
1442		1609
1443	=item $player->ext_event ($type, %msg)	1610	=item $player->ext_msg ($type, @msg)
1444		1611
1445	Sends an ext event to the client.	1612	Sends an ext event to the client.
1446		1613
1447	=cut	1614	=cut
1448		1615
1449	sub ext_event($$%) {	1616	sub ext_msg($$@) {
1450	my ($self, $type, %msg) = @_;	1617	my ($self, $type, @msg) = @_;
1451		1618
1452	$self->ns->ext_event ($type, %msg);	1619	$self->ns->ext_msg ($type, @msg);
1453	}	1620	}
1454		1621
1455	=head3 cf::region	1622	=head3 cf::region
1456		1623
1457	=over 4	1624	=over 4
…		…
1470	my ($path) = @_;	1637	my ($path) = @_;
1471		1638
1472	my ($match, $specificity);	1639	my ($match, $specificity);
1473		1640
1474	for my $region (list) {	1641	for my $region (list) {
1475	if ($region->match && $path =~ $region->match) {	1642	if ($region->{match} && $path =~ $region->{match}) {
1476	($match, $specificity) = ($region, $region->specificity)	1643	($match, $specificity) = ($region, $region->specificity)
1477	if $region->specificity > $specificity;	1644	if $region->specificity > $specificity;
1478	}	1645	}
1479	}	1646	}
1480		1647
…		…
1600	$self->init; # pass $1 etc.	1767	$self->init; # pass $1 etc.
1601	return $self;	1768	return $self;
1602	}	1769	}
1603	}	1770	}
1604		1771
1605	Carp::carp "unable to resolve path '$path' (base '$base').";	1772	Carp::cluck "unable to resolve path '$path' (base '$base').";
1606	()	1773	()
1607	}	1774	}
1608		1775
1609	sub init {	1776	sub init {
1610	my ($self) = @_;	1777	my ($self) = @_;
…		…
1673		1840
1674	sub load_header_from($) {	1841	sub load_header_from($) {
1675	my ($self, $path) = @_;	1842	my ($self, $path) = @_;
1676		1843
1677	utf8::encode $path;	1844	utf8::encode $path;
1678	#aio_open $path, O_RDONLY, 0	1845	my $f = new_from_file cf::object::thawer $path
1679	# or return;
1680
1681	$self->_load_header ($path)
1682	or return;	1846	or return;
		1847
		1848	$self->_load_header ($f)
		1849	or return;
		1850
		1851	local $MAP_LOADING{$self->{path}} = $self;
		1852	$f->resolve_delayed_derefs;
1683		1853
1684	$self->{load_path} = $path;	1854	$self->{load_path} = $path;
1685		1855
1686	1	1856	1
1687	}	1857	}
…		…
1741	sub find {	1911	sub find {
1742	my ($path, $origin) = @_;	1912	my ($path, $origin) = @_;
1743		1913
1744	$path = normalise $path, $origin && $origin->path;	1914	$path = normalise $path, $origin && $origin->path;
1745		1915
		1916	cf::lock_wait "map_data:$path";#d#remove
1746	cf::lock_wait "map_find:$path";	1917	cf::lock_wait "map_find:$path";
1747		1918
1748	$cf::MAP{$path} \|\| do {	1919	$cf::MAP{$path} \|\| do {
1749	my $guard = cf::lock_acquire "map_find:$path";	1920	my $guard1 = cf::lock_acquire "map_find:$path";
		1921	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1922
1750	my $map = new_from_path cf::map $path	1923	my $map = new_from_path cf::map $path
1751	or return;	1924	or return;
1752		1925
1753	$map->{last_save} = $cf::RUNTIME;	1926	$map->{last_save} = $cf::RUNTIME;
1754		1927
…		…
1756	or return;	1929	or return;
1757		1930
1758	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1931	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1759	# doing this can freeze the server in a sync job, obviously	1932	# doing this can freeze the server in a sync job, obviously
1760	#$cf::WAIT_FOR_TICK->wait;	1933	#$cf::WAIT_FOR_TICK->wait;
		1934	undef $guard1;
		1935	undef $guard2;
1761	$map->reset;	1936	$map->reset;
1762	undef $guard;
1763	return find $path;	1937	return find $path;
1764	}	1938	}
1765		1939
1766	$cf::MAP{$path} = $map	1940	$cf::MAP{$path} = $map
1767	}	1941	}
…		…
1776	local $self->{deny_reset} = 1; # loading can take a long time	1950	local $self->{deny_reset} = 1; # loading can take a long time
1777		1951
1778	my $path = $self->{path};	1952	my $path = $self->{path};
1779		1953
1780	{	1954	{
1781	my $guard = cf::lock_acquire "map_load:$path";	1955	my $guard = cf::lock_acquire "map_data:$path";
1782		1956
		1957	return unless $self->valid;
1783	return if $self->in_memory != cf::MAP_SWAPPED;	1958	return unless $self->in_memory == cf::MAP_SWAPPED;
1784		1959
1785	$self->in_memory (cf::MAP_LOADING);	1960	$self->in_memory (cf::MAP_LOADING);
1786		1961
1787	$self->alloc;	1962	$self->alloc;
1788		1963
1789	$self->pre_load;	1964	$self->pre_load;
1790	Coro::cede;	1965	cf::cede_to_tick;
1791		1966
		1967	my $f = new_from_file cf::object::thawer $self->{load_path};
		1968	$f->skip_block;
1792	$self->_load_objects ($self->{load_path}, 1)	1969	$self->_load_objects ($f)
1793	or return;	1970	or return;
1794		1971
1795	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1972	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1796	if delete $self->{load_original};	1973	if delete $self->{load_original};
1797		1974
1798	if (my $uniq = $self->uniq_path) {	1975	if (my $uniq = $self->uniq_path) {
1799	utf8::encode $uniq;	1976	utf8::encode $uniq;
1800	if (aio_open $uniq, O_RDONLY, 0) {	1977	unless (aio_stat $uniq) {
		1978	if (my $f = new_from_file cf::object::thawer $uniq) {
1801	$self->clear_unique_items;	1979	$self->clear_unique_items;
1802	$self->_load_objects ($uniq, 0);	1980	$self->_load_objects ($f);
		1981	$f->resolve_delayed_derefs;
		1982	}
1803	}	1983	}
1804	}	1984	}
1805		1985
1806	Coro::cede;	1986	$f->resolve_delayed_derefs;
		1987
		1988	cf::cede_to_tick;
1807	# now do the right thing for maps	1989	# now do the right thing for maps
1808	$self->link_multipart_objects;	1990	$self->link_multipart_objects;
1809	$self->difficulty ($self->estimate_difficulty)	1991	$self->difficulty ($self->estimate_difficulty)
1810	unless $self->difficulty;	1992	unless $self->difficulty;
1811	Coro::cede;	1993	cf::cede_to_tick;
1812		1994
1813	unless ($self->{deny_activate}) {	1995	unless ($self->{deny_activate}) {
1814	$self->decay_objects;	1996	$self->decay_objects;
1815	$self->fix_auto_apply;	1997	$self->fix_auto_apply;
1816	$self->update_buttons;	1998	$self->update_buttons;
1817	Coro::cede;	1999	cf::cede_to_tick;
1818	$self->set_darkness_map;	2000	$self->set_darkness_map;
1819	Coro::cede;	2001	cf::cede_to_tick;
1820	$self->activate;	2002	$self->activate;
1821	}	2003	}
		2004
		2005	$self->{last_save} = $cf::RUNTIME;
		2006	$self->last_access ($cf::RUNTIME);
1822		2007
1823	$self->in_memory (cf::MAP_IN_MEMORY);	2008	$self->in_memory (cf::MAP_IN_MEMORY);
1824	}	2009	}
1825		2010
1826	$self->post_load;	2011	$self->post_load;
…		…
1837		2022
1838	$self	2023	$self
1839	}	2024	}
1840		2025
1841	# find and load all maps in the 3x3 area around a map	2026	# find and load all maps in the 3x3 area around a map
1842	sub load_diag {	2027	sub load_neighbours {
1843	my ($map) = @_;	2028	my ($map) = @_;
1844		2029
1845	my @diag; # diagonal neighbours	2030	my @neigh; # diagonal neighbours
1846		2031
1847	for (0 .. 3) {	2032	for (0 .. 3) {
1848	my $neigh = $map->tile_path ($_)	2033	my $neigh = $map->tile_path ($_)
1849	or next;	2034	or next;
1850	$neigh = find $neigh, $map	2035	$neigh = find $neigh, $map
1851	or next;	2036	or next;
1852	$neigh->load;	2037	$neigh->load;
1853		2038
		2039	push @neigh,
1854	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2040	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1855	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2041	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1856	}	2042	}
1857		2043
1858	for (@diag) {	2044	for (grep defined $_->[0], @neigh) {
		2045	my ($path, $origin) = @$_;
1859	my $neigh = find @$_	2046	my $neigh = find $path, $origin
1860	or next;	2047	or next;
1861	$neigh->load;	2048	$neigh->load;
1862	}	2049	}
1863	}	2050	}
1864		2051
…		…
1869	}	2056	}
1870		2057
1871	sub do_load_sync {	2058	sub do_load_sync {
1872	my ($map) = @_;	2059	my ($map) = @_;
1873		2060
		2061	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2062	if $Coro::current == $Coro::main;
		2063
1874	cf::sync_job { $map->load };	2064	cf::sync_job { $map->load };
1875	}	2065	}
1876		2066
1877	our %MAP_PREFETCH;	2067	our %MAP_PREFETCH;
1878	our $MAP_PREFETCHER = undef;	2068	our $MAP_PREFETCHER = undef;
1879		2069
1880	sub find_async {	2070	sub find_async {
1881	my ($path, $origin) = @_;	2071	my ($path, $origin, $load) = @_;
1882		2072
1883	$path = normalise $path, $origin && $origin->{path};	2073	$path = normalise $path, $origin && $origin->{path};
1884		2074
1885	if (my $map = $cf::MAP{$path}) {	2075	if (my $map = $cf::MAP{$path}) {
1886	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2076	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1887	}	2077	}
1888		2078
1889	undef $MAP_PREFETCH{$path};	2079	$MAP_PREFETCH{$path} \|= $load;
		2080
1890	$MAP_PREFETCHER \|\|= cf::async {	2081	$MAP_PREFETCHER \|\|= cf::async {
		2082	$Coro::current->{desc} = "map prefetcher";
		2083
1891	while (%MAP_PREFETCH) {	2084	while (%MAP_PREFETCH) {
1892	for my $path (keys %MAP_PREFETCH) {	2085	while (my ($k, $v) = each %MAP_PREFETCH) {
1893	my $map = find $path	2086	if (my $map = find $k) {
1894	or next;
1895	$map->load;	2087	$map->load if $v;
		2088	}
1896		2089
1897	delete $MAP_PREFETCH{$path};	2090	delete $MAP_PREFETCH{$k};
1898	}	2091	}
1899	}	2092	}
1900	undef $MAP_PREFETCHER;	2093	undef $MAP_PREFETCHER;
1901	};	2094	};
1902	$MAP_PREFETCHER->prio (6);	2095	$MAP_PREFETCHER->prio (6);
…		…
1905	}	2098	}
1906		2099
1907	sub save {	2100	sub save {
1908	my ($self) = @_;	2101	my ($self) = @_;
1909		2102
1910	my $lock = cf::lock_acquire "map_data:" . $self->path;	2103	my $lock = cf::lock_acquire "map_data:$self->{path}";
1911		2104
1912	$self->{last_save} = $cf::RUNTIME;	2105	$self->{last_save} = $cf::RUNTIME;
1913		2106
1914	return unless $self->dirty;	2107	return unless $self->dirty;
1915		2108
…		…
1921	return if $self->{deny_save};	2114	return if $self->{deny_save};
1922		2115
1923	local $self->{last_access} = $self->last_access;#d#	2116	local $self->{last_access} = $self->last_access;#d#
1924		2117
1925	cf::async {	2118	cf::async {
		2119	$Coro::current->{desc} = "map player save";
1926	$_->contr->save for $self->players;	2120	$_->contr->save for $self->players;
1927	};	2121	};
1928		2122
1929	if ($uniq) {	2123	if ($uniq) {
1930	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	2124	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
…		…
1938	my ($self) = @_;	2132	my ($self) = @_;
1939		2133
1940	# save first because save cedes	2134	# save first because save cedes
1941	$self->save;	2135	$self->save;
1942		2136
1943	my $lock = cf::lock_acquire "map_data:" . $self->path;	2137	my $lock = cf::lock_acquire "map_data:$self->{path}";
1944		2138
1945	return if $self->players;	2139	return if $self->players;
1946	return if $self->in_memory != cf::MAP_IN_MEMORY;	2140	return if $self->in_memory != cf::MAP_IN_MEMORY;
1947	return if $self->{deny_save};	2141	return if $self->{deny_save};
1948		2142
		2143	$self->in_memory (cf::MAP_SWAPPED);
		2144
		2145	$self->deactivate;
		2146	$_->clear_links_to ($self) for values %cf::MAP;
1949	$self->clear;	2147	$self->clear;
1950	$self->in_memory (cf::MAP_SWAPPED);
1951	}	2148	}
1952		2149
1953	sub reset_at {	2150	sub reset_at {
1954	my ($self) = @_;	2151	my ($self) = @_;
1955		2152
…		…
1987	if $uniq;	2184	if $uniq;
1988	}	2185	}
1989		2186
1990	delete $cf::MAP{$self->path};	2187	delete $cf::MAP{$self->path};
1991		2188
		2189	$self->deactivate;
		2190	$_->clear_links_to ($self) for values %cf::MAP;
1992	$self->clear;	2191	$self->clear;
1993
1994	$_->clear_links_to ($self) for values %cf::MAP;
1995		2192
1996	$self->unlink_save;	2193	$self->unlink_save;
1997	$self->destroy;	2194	$self->destroy;
1998	}	2195	}
1999		2196
2000	my $nuke_counter = "aaaa";	2197	my $nuke_counter = "aaaa";
2001		2198
2002	sub nuke {	2199	sub nuke {
2003	my ($self) = @_;	2200	my ($self) = @_;
2004		2201
		2202	{
		2203	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2204
2005	delete $cf::MAP{$self->path};	2205	delete $cf::MAP{$self->path};
2006		2206
2007	$self->unlink_save;	2207	$self->unlink_save;
2008		2208
2009	bless $self, "cf::map";	2209	bless $self, "cf::map";
2010	delete $self->{deny_reset};	2210	delete $self->{deny_reset};
2011	$self->{deny_save} = 1;	2211	$self->{deny_save} = 1;
2012	$self->reset_timeout (1);	2212	$self->reset_timeout (1);
2013	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2213	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2014		2214
2015	$cf::MAP{$self->path} = $self;	2215	$cf::MAP{$self->path} = $self;
		2216	}
2016		2217
2017	$self->reset; # polite request, might not happen	2218	$self->reset; # polite request, might not happen
2018	}	2219	}
2019		2220
2020	=item $maps = cf::map::tmp_maps	2221	=item $maps = cf::map::tmp_maps
…		…
2096		2297
2097	sub inv_recursive {	2298	sub inv_recursive {
2098	inv_recursive_ inv $_[0]	2299	inv_recursive_ inv $_[0]
2099	}	2300	}
2100		2301
		2302	=item $ref = $ob->ref
		2303
		2304	creates and returns a persistent reference to an objetc that can be stored as a string.
		2305
		2306	=item $ob = cf::object::deref ($refstring)
		2307
		2308	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2309	even if the object actually exists. May block.
		2310
		2311	=cut
		2312
		2313	sub deref {
		2314	my ($ref) = @_;
		2315
		2316	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2317	my ($uuid, $name) = ($1, $2);
		2318	my $pl = $cf::PLAYER_LOADING{$name} \|\| cf::player::find $name
		2319	or return;
		2320	$pl->ob->uuid eq $uuid
		2321	or return;
		2322
		2323	$pl->ob
		2324	} else {
		2325	warn "$ref: cannot resolve object reference\n";
		2326	undef
		2327	}
		2328	}
		2329
2101	package cf;	2330	package cf;
2102		2331
2103	=back	2332	=back
2104		2333
2105	=head3 cf::object::player	2334	=head3 cf::object::player
…		…
2127		2356
2128	} else {	2357	} else {
2129	my $pl = $self->contr;	2358	my $pl = $self->contr;
2130		2359
2131	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2360	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2132	my $diag = $pl->{npc_dialog};	2361	my $dialog = $pl->{npc_dialog};
2133	$diag->{pl}->ext_reply (	2362	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2134	$diag->{id},
2135	msgtype => "reply",
2136	msg => $diag->{pl}->expand_cfpod ($msg),
2137	add_topics => []
2138	);
2139		2363
2140	} else {	2364	} else {
2141	$msg = $npc->name . " says: $msg" if $npc;	2365	$msg = $npc->name . " says: $msg" if $npc;
2142	$self->message ($msg, $flags);	2366	$self->message ($msg, $flags);
2143	}	2367	}
2144	}	2368	}
		2369	}
		2370
		2371	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2372
		2373	=cut
		2374
		2375	sub cf::object::send_msg {
		2376	my $pl = shift->contr
		2377	or return;
		2378	$pl->send_msg (@_);
2145	}	2379	}
2146		2380
2147	=item $player_object->may ("access")	2381	=item $player_object->may ("access")
2148		2382
2149	Returns wether the given player is authorized to access resource "access"	2383	Returns wether the given player is authorized to access resource "access"
…		…
2228	# use -1 or undef as default coordinates, not 0, 0	2462	# use -1 or undef as default coordinates, not 0, 0
2229	($x, $y) = ($map->enter_x, $map->enter_y)	2463	($x, $y) = ($map->enter_x, $map->enter_y)
2230	if $x <=0 && $y <= 0;	2464	if $x <=0 && $y <= 0;
2231		2465
2232	$map->load;	2466	$map->load;
2233	$map->load_diag;	2467	$map->load_neighbours;
2234		2468
2235	return unless $self->contr->active;	2469	return unless $self->contr->active;
2236	$self->activate_recursive;	2470	$self->activate_recursive;
2237		2471
2238	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2472	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2239	$self->enter_map ($map, $x, $y);	2473	$self->enter_map ($map, $x, $y);
2240	}	2474	}
2241		2475
2242	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2476	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2243		2477
2244	Moves the player to the given map-path and coordinates by first freezing	2478	Moves the player to the given map-path and coordinates by first freezing
2245	her, loading and preparing them map, calling the provided $check callback	2479	her, loading and preparing them map, calling the provided $check callback
2246	that has to return the map if sucecssful, and then unfreezes the player on	2480	that has to return the map if sucecssful, and then unfreezes the player on
2247	the new (success) or old (failed) map position.	2481	the new (success) or old (failed) map position. In either case, $done will
		2482	be called at the end of this process.
2248		2483
2249	=cut	2484	=cut
2250		2485
2251	our $GOTOGEN;	2486	our $GOTOGEN;
2252		2487
2253	sub cf::object::player::goto {	2488	sub cf::object::player::goto {
2254	my ($self, $path, $x, $y, $check) = @_;	2489	my ($self, $path, $x, $y, $check, $done) = @_;
2255		2490
2256	# do generation counting so two concurrent goto's will be executed in-order	2491	# do generation counting so two concurrent goto's will be executed in-order
2257	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2492	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2258		2493
2259	$self->enter_link;	2494	$self->enter_link;
2260		2495
2261	(async {	2496	(async {
		2497	$Coro::current->{desc} = "player::goto $path $x $y";
		2498
		2499	# *tag paths override both path and x\|y
		2500	if ($path =~ /^\(.)$/) {
		2501	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2502	my $ob = $obs[rand @obs];
		2503
		2504	# see if we actually can go there
		2505	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2506	$ob = $obs[rand @obs];
		2507	} else {
		2508	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE \| cf::NDI_RED);
		2509	}
		2510	# else put us there anyways for now #d#
		2511
		2512	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2513	} else {
		2514	($path, $x, $y) = (undef, undef, undef);
		2515	}
		2516	}
		2517
2262	my $map = eval {	2518	my $map = eval {
2263	my $map = cf::map::find $path;	2519	my $map = defined $path ? cf::map::find $path : undef;
2264		2520
2265	if ($map) {	2521	if ($map) {
2266	$map = $map->customise_for ($self);	2522	$map = $map->customise_for ($self);
2267	$map = $check->($map) if $check && $map;	2523	$map = $check->($map) if $check && $map;
2268	} else {	2524	} else {
2269	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);	2525	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE \| cf::NDI_RED);
2270	}	2526	}
2271		2527
2272	$map	2528	$map
2273	};	2529	};
2274		2530
…		…
2279		2535
2280	if ($gen == $self->{_goto_generation}) {	2536	if ($gen == $self->{_goto_generation}) {
2281	delete $self->{_goto_generation};	2537	delete $self->{_goto_generation};
2282	$self->leave_link ($map, $x, $y);	2538	$self->leave_link ($map, $x, $y);
2283	}	2539	}
		2540
		2541	$done->() if $done;
2284	})->prio (1);	2542	})->prio (1);
2285	}	2543	}
2286		2544
2287	=item $player_object->enter_exit ($exit_object)	2545	=item $player_object->enter_exit ($exit_object)
2288		2546
…		…
2362	# if exit is damned, update players death & WoR home-position	2620	# if exit is damned, update players death & WoR home-position
2363	$self->contr->savebed ($slaying, $hp, $sp)	2621	$self->contr->savebed ($slaying, $hp, $sp)
2364	if $exit->flag (FLAG_DAMNED);	2622	if $exit->flag (FLAG_DAMNED);
2365		2623
2366	(async {	2624	(async {
		2625	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2626
2367	$self->deactivate_recursive; # just to be sure	2627	$self->deactivate_recursive; # just to be sure
2368	unless (eval {	2628	unless (eval {
2369	$self->goto ($slaying, $hp, $sp);	2629	$self->goto ($slaying, $hp, $sp);
2370		2630
2371	1;	2631	1;
…		…
2397		2657
2398	utf8::encode $text;	2658	utf8::encode $text;
2399	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2659	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2400	}	2660	}
2401		2661
2402	=item $client->send_msg ($color, $type, $msg, [extra...])	2662	=item $client->send_msg ($channel, $msg, $color, [extra...])
2403		2663
2404	Send a drawinfo or msg packet to the client, formatting the msg for the	2664	Send a drawinfo or msg packet to the client, formatting the msg for the
2405	client if neccessary. C<$type> should be a string identifying the type of	2665	client if neccessary. C<$type> should be a string identifying the type of
2406	the message, with C<log> being the default. If C<$color> is negative, suppress	2666	the message, with C<log> being the default. If C<$color> is negative, suppress
2407	the message unless the client supports the msg packet.	2667	the message unless the client supports the msg packet.
2408		2668
2409	=cut	2669	=cut
2410		2670
		2671	our %CHANNEL = (
		2672	"c/identify" => {
		2673	id => "infobox",
		2674	title => "Identify",
		2675	reply => undef,
		2676	tooltip => "Items recently identified",
		2677	},
		2678	"c/examine" => {
		2679	id => "infobox",
		2680	title => "Examine",
		2681	reply => undef,
		2682	tooltip => "Signs and other items you examined",
		2683	},
		2684	"c/book" => {
		2685	id => "infobox",
		2686	title => "Book",
		2687	reply => undef,
		2688	tooltip => "The contents of a note or book",
		2689	},
		2690	"c/lookat" => {
		2691	id => "infobox",
		2692	title => "Look",
		2693	reply => undef,
		2694	tooltip => "What you saw there",
		2695	},
		2696	"c/who" => {
		2697	id => "infobox",
		2698	title => "Players",
		2699	reply => undef,
		2700	tooltip => "Shows players who are currently online",
		2701	},
		2702	"c/body" => {
		2703	id => "infobox",
		2704	title => "Body Parts",
		2705	reply => undef,
		2706	tooltip => "Shows which body parts you posess and are available",
		2707	},
		2708	"c/uptime" => {
		2709	id => "infobox",
		2710	title => "Uptime",
		2711	reply => undef,
		2712	tooltip => "How long the server has been running sicne last restart",
		2713	},
		2714	"c/mapinfo" => {
		2715	id => "infobox",
		2716	title => "Map Info",
		2717	reply => undef,
		2718	tooltip => "Information related to the maps",
		2719	},
		2720	);
		2721
2411	sub cf::client::send_msg {	2722	sub cf::client::send_msg {
2412	my ($self, $color, $type, $msg, @extra) = @_;	2723	my ($self, $channel, $msg, $color, @extra) = @_;
2413		2724
2414	$msg = $self->pl->expand_cfpod ($msg);	2725	$msg = $self->pl->expand_cfpod ($msg);
2415		2726
		2727	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2728
		2729	# check predefined channels, for the benefit of C
		2730	if ($CHANNEL{$channel}) {
		2731	$channel = $CHANNEL{$channel};
		2732
		2733	$self->ext_msg (channel_info => $channel)
		2734	if $self->can_msg;
		2735
		2736	$channel = $channel->{id};
		2737
		2738	} elsif (ref $channel) {
		2739	# send meta info to client, if not yet sent
		2740	unless (exists $self->{channel}{$channel->{id}}) {
		2741	$self->{channel}{$channel->{id}} = $channel;
		2742	$self->ext_msg (channel_info => $channel)
		2743	if $self->can_msg;
		2744	}
		2745
		2746	$channel = $channel->{id};
		2747	}
		2748
2416	return unless @extra \|\| length $msg;	2749	return unless @extra \|\| length $msg;
2417		2750
2418	if ($self->can_msg) {	2751	if ($self->can_msg) {
		2752	# default colour, mask it out
		2753	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2754	if $color & cf::NDI_DEF;
		2755
2419	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));	2756	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2757	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2420	} else {	2758	} else {
2421	# replace some tags by gcfclient-compatible ones
2422	for ($msg) {
2423	1 while
2424	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2425	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2426	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2427	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2428	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2429	}
2430
2431	if ($color >= 0) {	2759	if ($color >= 0) {
		2760	# replace some tags by gcfclient-compatible ones
		2761	for ($msg) {
		2762	1 while
		2763	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2764	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2765	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2766	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2767	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2768	}
		2769
		2770	$color &= cf::NDI_COLOR_MASK;
		2771
		2772	utf8::encode $msg;
		2773
2432	if (0 && $msg =~ /\[/) {	2774	if (0 && $msg =~ /\[/) {
		2775	# COMMAND/INFO
2433	$self->send_packet ("drawextinfo $color 4 0 $msg")	2776	$self->send_packet ("drawextinfo $color 10 8 $msg")
2434	} else {	2777	} else {
2435	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2778	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2436	$self->send_packet ("drawinfo $color $msg")	2779	$self->send_packet ("drawinfo $color $msg")
2437	}	2780	}
2438	}	2781	}
2439	}	2782	}
2440	}	2783	}
2441		2784
2442	=item $client->ext_event ($type, %msg)	2785	=item $client->ext_msg ($type, @msg)
2443		2786
2444	Sends an ext event to the client.	2787	Sends an ext event to the client.
2445		2788
2446	=cut	2789	=cut
2447		2790
2448	sub cf::client::ext_event($$%) {	2791	sub cf::client::ext_msg($$@) {
2449	my ($self, $type, %msg) = @_;	2792	my ($self, $type, @msg) = @_;
2450		2793
		2794	if ($self->extcmd == 2) {
		2795	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2796	} elsif ($self->extcmd == 1) { # TODO: remove
2451	$msg{msgtype} = "event_$type";	2797	push @msg, msgtype => "event_$type";
2452	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2798	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2799	}
		2800	}
		2801
		2802	=item $client->ext_reply ($msgid, @msg)
		2803
		2804	Sends an ext reply to the client.
		2805
		2806	=cut
		2807
		2808	sub cf::client::ext_reply($$@) {
		2809	my ($self, $id, @msg) = @_;
		2810
		2811	if ($self->extcmd == 2) {
		2812	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2813	} elsif ($self->extcmd == 1) {
		2814	#TODO: version 1, remove
		2815	unshift @msg, msgtype => "reply", msgid => $id;
		2816	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2817	}
2453	}	2818	}
2454		2819
2455	=item $success = $client->query ($flags, "text", \&cb)	2820	=item $success = $client->query ($flags, "text", \&cb)
2456		2821
2457	Queues a query to the client, calling the given callback with	2822	Queues a query to the client, calling the given callback with
…		…
2512	my ($ns, $buf) = @_;	2877	my ($ns, $buf) = @_;
2513		2878
2514	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2879	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2515		2880
2516	if (ref $msg) {	2881	if (ref $msg) {
		2882	my ($type, $reply, @payload) =
		2883	"ARRAY" eq ref $msg
		2884	? @$msg
		2885	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2886
		2887	my @reply;
		2888
2517	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2889	if (my $cb = $EXTICMD{$type}) {
2518	if (my %reply = $cb->($ns, $msg)) {	2890	@reply = $cb->($ns, @payload);
2519	$reply{msgid} = $msg->{msgid};
2520	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2521	}
2522	}	2891	}
		2892
		2893	$ns->ext_reply ($reply, @reply)
		2894	if $reply;
		2895
2523	} else {	2896	} else {
2524	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2897	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2525	}	2898	}
2526		2899
2527	cf::override;	2900	cf::override;
…		…
2574	our $safe = new Safe "safe";	2947	our $safe = new Safe "safe";
2575	our $safe_hole = new Safe::Hole;	2948	our $safe_hole = new Safe::Hole;
2576		2949
2577	$SIG{FPE} = 'IGNORE';	2950	$SIG{FPE} = 'IGNORE';
2578		2951
2579	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2952	$safe->permit_only (Opcode::opset qw(
		2953	:base_core :base_mem :base_orig :base_math
		2954	grepstart grepwhile mapstart mapwhile
		2955	sort time
		2956	));
2580		2957
2581	# here we export the classes and methods available to script code	2958	# here we export the classes and methods available to script code
2582		2959
2583	=pod	2960	=pod
2584		2961
2585	The following functions and methods are available within a safe environment:	2962	The following functions and methods are available within a safe environment:
2586		2963
2587	cf::object	2964	cf::object
2588	contr pay_amount pay_player map x y force_find force_add	2965	contr pay_amount pay_player map x y force_find force_add destroy
2589	insert remove	2966	insert remove name archname title slaying race decrease_ob_nr
2590		2967
2591	cf::object::player	2968	cf::object::player
2592	player	2969	player
2593		2970
2594	cf::player	2971	cf::player
…		…
2599		2976
2600	=cut	2977	=cut
2601		2978
2602	for (	2979	for (
2603	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	2980	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2981	insert remove inv name archname title slaying race
2604	insert remove)],	2982	decrease_ob_nr destroy)],
2605	["cf::object::player" => qw(player)],	2983	["cf::object::player" => qw(player)],
2606	["cf::player" => qw(peaceful)],	2984	["cf::player" => qw(peaceful)],
2607	["cf::map" => qw(trigger)],	2985	["cf::map" => qw(trigger)],
2608	) {	2986	) {
2609	no strict 'refs';	2987	no strict 'refs';
…		…
2685	# the server's init and main functions	3063	# the server's init and main functions
2686		3064
2687	sub load_facedata($) {	3065	sub load_facedata($) {
2688	my ($path) = @_;	3066	my ($path) = @_;
2689		3067
		3068	# HACK to clear player env face cache, we need some signal framework
		3069	# for this (global event?)
		3070	%ext::player_env::MUSIC_FACE_CACHE = ();
		3071
		3072	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3073
2690	warn "loading facedata from $path\n";	3074	warn "loading facedata from $path\n";
2691		3075
2692	my $facedata;	3076	my $facedata;
2693	0 < aio_load $path, $facedata	3077	0 < aio_load $path, $facedata
2694	or die "$path: $!";	3078	or die "$path: $!";
…		…
2696	$facedata = Coro::Storable::thaw $facedata;	3080	$facedata = Coro::Storable::thaw $facedata;
2697		3081
2698	$facedata->{version} == 2	3082	$facedata->{version} == 2
2699	or cf::cleanup "$path: version mismatch, cannot proceed.";	3083	or cf::cleanup "$path: version mismatch, cannot proceed.";
2700		3084
		3085	# patch in the exptable
		3086	$facedata->{resource}{"res/exp_table"} = {
		3087	type => FT_RSRC,
		3088	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3089	};
		3090	cf::cede_to_tick;
		3091
2701	{	3092	{
2702	my $faces = $facedata->{faceinfo};	3093	my $faces = $facedata->{faceinfo};
2703		3094
2704	while (my ($face, $info) = each %$faces) {	3095	while (my ($face, $info) = each %$faces) {
2705	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3096	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2706	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3097	cf::face::set_visibility $idx, $info->{visibility};
		3098	cf::face::set_magicmap $idx, $info->{magicmap};
2707	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3099	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2708	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3100	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2709	Coro::cede;	3101
		3102	cf::cede_to_tick;
2710	}	3103	}
2711		3104
2712	while (my ($face, $info) = each %$faces) {	3105	while (my ($face, $info) = each %$faces) {
2713	next unless $info->{smooth};	3106	next unless $info->{smooth};
2714	my $idx = cf::face::find $face	3107	my $idx = cf::face::find $face
2715	or next;	3108	or next;
2716	if (my $smooth = cf::face::find $info->{smooth}) {	3109	if (my $smooth = cf::face::find $info->{smooth}) {
		3110	cf::face::set_smooth $idx, $smooth;
2717	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3111	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2718	} else {	3112	} else {
2719	warn "smooth face '$info->{smooth}' not found for face '$face'";	3113	warn "smooth face '$info->{smooth}' not found for face '$face'";
2720	}	3114	}
2721	Coro::cede;	3115
		3116	cf::cede_to_tick;
2722	}	3117	}
2723	}	3118	}
2724		3119
2725	{	3120	{
2726	my $anims = $facedata->{animinfo};	3121	my $anims = $facedata->{animinfo};
2727		3122
2728	while (my ($anim, $info) = each %$anims) {	3123	while (my ($anim, $info) = each %$anims) {
2729	cf::anim::set $anim, $info->{frames}, $info->{facings};	3124	cf::anim::set $anim, $info->{frames}, $info->{facings};
2730	Coro::cede;	3125	cf::cede_to_tick;
2731	}	3126	}
2732		3127
2733	cf::anim::invalidate_all; # d'oh	3128	cf::anim::invalidate_all; # d'oh
2734	}	3129	}
2735		3130
		3131	{
		3132	# TODO: for gcfclient pleasure, we should give resources
		3133	# that gcfclient doesn't grok a >10000 face index.
		3134	my $res = $facedata->{resource};
		3135
		3136	my $soundconf = delete $res->{"res/sound.conf"};
		3137
		3138	while (my ($name, $info) = each %$res) {
		3139	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3140	my $data;
		3141
		3142	if ($info->{type} & 1) {
		3143	# prepend meta info
		3144
		3145	my $meta = $enc->encode ({
		3146	name => $name,
		3147	%{ $info->{meta} \|\| {} },
		3148	});
		3149
		3150	$data = pack "(w/a)", $meta, $info->{data};
		3151	} else {
		3152	$data = $info->{data};
		3153	}
		3154
		3155	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3156	cf::face::set_type $idx, $info->{type};
		3157
		3158	cf::cede_to_tick;
		3159	}
		3160
		3161	if ($soundconf) {
		3162	$soundconf = $enc->decode (delete $soundconf->{data});
		3163
		3164	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3165	my $sound = $soundconf->{compat}[$_]
		3166	or next;
		3167
		3168	my $face = cf::face::find "sound/$sound->[1]";
		3169	cf::sound::set $sound->[0] => $face;
		3170	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3171	}
		3172
		3173	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3174	my $face = cf::face::find "sound/$v";
		3175	cf::sound::set $k => $face;
		3176	}
		3177	}
		3178	}
		3179
2736	1	3180	1
2737	}	3181	}
2738		3182
		3183	register_exticmd fx_want => sub {
		3184	my ($ns, $want) = @_;
		3185
		3186	while (my ($k, $v) = each %$want) {
		3187	$ns->fx_want ($k, $v);
		3188	}
		3189	};
		3190
2739	sub reload_regions {	3191	sub reload_regions {
		3192	# HACK to clear player env face cache, we need some signal framework
		3193	# for this (global event?)
		3194	%ext::player_env::MUSIC_FACE_CACHE = ();
		3195
2740	load_resource_file "$MAPDIR/regions"	3196	load_resource_file "$MAPDIR/regions"
2741	or die "unable to load regions file\n";	3197	or die "unable to load regions file\n";
		3198
		3199	for (cf::region::list) {
		3200	$_->{match} = qr/$_->{match}/
		3201	if exists $_->{match};
		3202	}
2742	}	3203	}
2743		3204
2744	sub reload_facedata {	3205	sub reload_facedata {
2745	load_facedata "$DATADIR/facedata"	3206	load_facedata "$DATADIR/facedata"
2746	or die "unable to load facedata\n";	3207	or die "unable to load facedata\n";
…		…
2775		3236
2776	sub init {	3237	sub init {
2777	reload_resources;	3238	reload_resources;
2778	}	3239	}
2779		3240
2780	sub cfg_load {	3241	sub reload_config {
2781	open my $fh, "<:utf8", "$CONFDIR/config"	3242	open my $fh, "<:utf8", "$CONFDIR/config"
2782	or return;	3243	or return;
2783		3244
2784	local $/;	3245	local $/;
2785	*CFG = YAML::Syck::Load <$fh>;	3246	*CFG = YAML::Syck::Load <$fh>;
…		…
2801	sub main {	3262	sub main {
2802	# we must not ever block the main coroutine	3263	# we must not ever block the main coroutine
2803	local $Coro::idle = sub {	3264	local $Coro::idle = sub {
2804	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3265	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2805	(async {	3266	(async {
		3267	$Coro::current->{desc} = "IDLE BUG HANDLER";
2806	Event::one_event;	3268	Event::one_event;
2807	})->prio (Coro::PRIO_MAX);	3269	})->prio (Coro::PRIO_MAX);
2808	};	3270	};
2809		3271
2810	cfg_load;	3272	reload_config;
2811	db_init;	3273	db_init;
2812	load_extensions;	3274	load_extensions;
2813		3275
2814	$TICK_WATCHER->start;	3276	$TICK_WATCHER->start;
2815	Event::loop;	3277	Event::loop;
…		…
2882	# and maps saved/destroyed asynchronously.	3344	# and maps saved/destroyed asynchronously.
2883	warn "begin emergency player save\n";	3345	warn "begin emergency player save\n";
2884	for my $login (keys %cf::PLAYER) {	3346	for my $login (keys %cf::PLAYER) {
2885	my $pl = $cf::PLAYER{$login} or next;	3347	my $pl = $cf::PLAYER{$login} or next;
2886	$pl->valid or next;	3348	$pl->valid or next;
		3349	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2887	$pl->save;	3350	$pl->save;
2888	}	3351	}
2889	warn "end emergency player save\n";	3352	warn "end emergency player save\n";
2890		3353
2891	warn "begin emergency map save\n";	3354	warn "begin emergency map save\n";
…		…
2939		3402
2940	warn "flushing outstanding aio requests";	3403	warn "flushing outstanding aio requests";
2941	for (;;) {	3404	for (;;) {
2942	BDB::flush;	3405	BDB::flush;
2943	IO::AIO::flush;	3406	IO::AIO::flush;
2944	Coro::cede;	3407	Coro::cede_notself;
2945	last unless IO::AIO::nreqs \|\| BDB::nreqs;	3408	last unless IO::AIO::nreqs \|\| BDB::nreqs;
2946	warn "iterate...";	3409	warn "iterate...";
2947	}	3410	}
2948		3411
2949	++$RELOAD;	3412	++$RELOAD;
…		…
3008	warn "reloading cf.pm";	3471	warn "reloading cf.pm";
3009	require cf;	3472	require cf;
3010	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3473	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3011		3474
3012	warn "loading config and database again";	3475	warn "loading config and database again";
3013	cf::cfg_load;	3476	cf::reload_config;
3014		3477
3015	warn "loading extensions";	3478	warn "loading extensions";
3016	cf::load_extensions;	3479	cf::load_extensions;
3017		3480
3018	warn "reattaching attachments to objects/players";	3481	warn "reattaching attachments to objects/players";
…		…
3054	register_command "reload" => sub {	3517	register_command "reload" => sub {
3055	my ($who, $arg) = @_;	3518	my ($who, $arg) = @_;
3056		3519
3057	if ($who->flag (FLAG_WIZ)) {	3520	if ($who->flag (FLAG_WIZ)) {
3058	$who->message ("reloading server.");	3521	$who->message ("reloading server.");
		3522	async {
		3523	$Coro::current->{desc} = "perl_reload";
3059	async { reload_perl };	3524	reload_perl;
		3525	};
3060	}	3526	}
3061	};	3527	};
3062		3528
3063	unshift @INC, $LIBDIR;	3529	unshift @INC, $LIBDIR;
3064		3530
…		…
3083	my $signal = new Coro::Signal;	3549	my $signal = new Coro::Signal;
3084	push @WAIT_FOR_TICK_BEGIN, $signal;	3550	push @WAIT_FOR_TICK_BEGIN, $signal;
3085	$signal->wait;	3551	$signal->wait;
3086	}	3552	}
3087		3553
3088	my $min = 1e6;#d#
3089	my $avg = 10;
3090	$TICK_WATCHER = Event->timer (	3554	$TICK_WATCHER = Event->timer (
3091	reentrant => 0,	3555	reentrant => 0,
3092	parked => 1,	3556	parked => 1,
3093	prio => 0,	3557	prio => 0,
3094	at => $NEXT_TICK \|\| $TICK,	3558	at => $NEXT_TICK \|\| $TICK,
…		…
3102		3566
3103	$NOW = $tick_start = Event::time;	3567	$NOW = $tick_start = Event::time;
3104		3568
3105	cf::server_tick; # one server iteration	3569	cf::server_tick; # one server iteration
3106		3570
3107	0 && sync_job {#d#
3108	for(1..10) {
3109	my $t = Event::time;
3110	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3111	or die;
3112
3113	$map->width (50);
3114	$map->height (50);
3115	$map->alloc;
3116	$map->_load_objects ("/tmp/x.map", 1);
3117	my $t = Event::time - $t;
3118
3119	#next unless $t < 0.0013;#d#
3120	if ($t < $min) {
3121	$min = $t;
3122	}
3123	$avg = $avg * 0.99 + $t * 0.01;
3124	}
3125	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3126	exit 0;
3127	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3128	};
3129
3130	$RUNTIME += $TICK;	3571	$RUNTIME += $TICK;
3131	$NEXT_TICK += $TICK;	3572	$NEXT_TICK += $TICK;
3132		3573
3133	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3574	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3134	$NEXT_RUNTIME_WRITE = $NOW + 10;	3575	$NEXT_RUNTIME_WRITE = $NOW + 10;
3135	Coro::async_pool {	3576	Coro::async_pool {
		3577	$Coro::current->{desc} = "runtime saver";
3136	write_runtime	3578	write_runtime
3137	or warn "ERROR: unable to write runtime file: $!";	3579	or warn "ERROR: unable to write runtime file: $!";
3138	};	3580	};
3139	}	3581	}
3140		3582
3141	# my $AFTER = Event::time;
3142	# warn $AFTER - $NOW;#d#
3143
3144	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3583	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3145	$sig->send;	3584	$sig->send;
3146	}	3585	}
3147	while (my $sig = shift @WAIT_FOR_TICK) {	3586	while (my $sig = shift @WAIT_FOR_TICK) {
3148	$sig->send;	3587	$sig->send;
…		…
3158		3597
3159	$LOAD = ($NOW - $tick_start) / $TICK;	3598	$LOAD = ($NOW - $tick_start) / $TICK;
3160	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3599	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3161		3600
3162	_post_tick;	3601	_post_tick;
3163
3164
3165	},	3602	},
3166	);	3603	);
3167		3604
3168	{	3605	{
		3606	BDB::min_parallel 8;
3169	BDB::max_poll_time $TICK * 0.1;	3607	BDB::max_poll_time $TICK * 0.1;
3170	$BDB_POLL_WATCHER = Event->io (	3608	$BDB_POLL_WATCHER = Event->io (
3171	reentrant => 0,	3609	reentrant => 0,
3172	fd => BDB::poll_fileno,	3610	fd => BDB::poll_fileno,
3173	poll => 'r',	3611	poll => 'r',
3174	prio => 0,	3612	prio => 0,
3175	data => WF_AUTOCANCEL,	3613	data => WF_AUTOCANCEL,
3176	cb => \&BDB::poll_cb,	3614	cb => \&BDB::poll_cb,
3177	);	3615	);
3178	BDB::min_parallel 8;
3179		3616
3180	BDB::set_sync_prepare {	3617	BDB::set_sync_prepare {
3181	my $status;	3618	my $status;
3182	my $current = $Coro::current;	3619	my $current = $Coro::current;
3183	(	3620	(
…		…
3192	)	3629	)
3193	};	3630	};
3194		3631
3195	unless ($DB_ENV) {	3632	unless ($DB_ENV) {
3196	$DB_ENV = BDB::db_env_create;	3633	$DB_ENV = BDB::db_env_create;
		3634	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC
		3635	\| BDB::LOG_AUTOREMOVE, 1);
		3636	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3637	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3197		3638
3198	cf::sync_job {	3639	cf::sync_job {
3199	eval {	3640	eval {
3200	BDB::db_env_open	3641	BDB::db_env_open
3201	$DB_ENV,	3642	$DB_ENV,
…		…
3203	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN	3644	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN
3204	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3645	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3205	0666;	3646	0666;
3206		3647
3207	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3648	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3208
3209	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
3210	$DB_ENV->set_lk_detect;
3211	};	3649	};
3212		3650
3213	cf::cleanup "db_env_open(db): $@" if $@;	3651	cf::cleanup "db_env_open(db): $@" if $@;
3214	};	3652	};
3215	}	3653	}
		3654
		3655	$BDB_DEADLOCK_WATCHER = Event->timer (
		3656	after => 3,
		3657	interval => 1,
		3658	hard => 1,
		3659	prio => 0,
		3660	data => WF_AUTOCANCEL,
		3661	cb => sub {
		3662	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3663	},
		3664	);
		3665	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3666	after => 11,
		3667	interval => 60,
		3668	hard => 1,
		3669	prio => 0,
		3670	data => WF_AUTOCANCEL,
		3671	cb => sub {
		3672	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3673	},
		3674	);
		3675	$BDB_TRICKLE_WATCHER = Event->timer (
		3676	after => 5,
		3677	interval => 10,
		3678	hard => 1,
		3679	prio => 0,
		3680	data => WF_AUTOCANCEL,
		3681	cb => sub {
		3682	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3683	},
		3684	);
3216	}	3685	}
3217		3686
3218	{	3687	{
3219	IO::AIO::min_parallel 8;	3688	IO::AIO::min_parallel 8;
3220		3689
…		…
3223	$AIO_POLL_WATCHER = Event->io (	3692	$AIO_POLL_WATCHER = Event->io (
3224	reentrant => 0,	3693	reentrant => 0,
3225	data => WF_AUTOCANCEL,	3694	data => WF_AUTOCANCEL,
3226	fd => IO::AIO::poll_fileno,	3695	fd => IO::AIO::poll_fileno,
3227	poll => 'r',	3696	poll => 'r',
3228	prio => 6,	3697	prio => 0,
3229	cb => \&IO::AIO::poll_cb,	3698	cb => \&IO::AIO::poll_cb,
3230	);	3699	);
3231	}	3700	}
3232		3701
3233	my $_log_backtrace;	3702	my $_log_backtrace;
…		…
3239		3708
3240	# limit the # of concurrent backtraces	3709	# limit the # of concurrent backtraces
3241	if ($_log_backtrace < 2) {	3710	if ($_log_backtrace < 2) {
3242	++$_log_backtrace;	3711	++$_log_backtrace;
3243	async {	3712	async {
		3713	$Coro::current->{desc} = "abt $msg";
		3714
3244	my @bt = fork_call {	3715	my @bt = fork_call {
3245	@addr = map { sprintf "%x", $_ } @addr;	3716	@addr = map { sprintf "%x", $_ } @addr;
3246	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3717	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3247	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"	3718	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"
3248	or die "addr2line: $!";	3719	or die "addr2line: $!";

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.297 by root, Thu Jul 5 08:10:30 2007 UTC vs. Revision 1.390 by root, Thu Oct 25 09:01:24 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.297 by root, Thu Jul 5 08:10:30 2007 UTC vs.
Revision 1.390 by root, Thu Oct 25 09:01:24 2007 UTC