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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.300 by root, Tue Jul 10 06:44:29 2007 UTC vs.
Revision 1.385 by root, Fri Oct 12 19:13:26 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
…		…
409	Coro::Storable. May, of course, block. Note that the executed sub may	491	Coro::Storable. May, of course, block. Note that the executed sub may
410	never block itself or use any form of Event handling.	492	never block itself or use any form of Event handling.
411		493
412	=cut	494	=cut
413		495
414	sub _store_scalar {
415	open my $fh, ">", \my $buf
416	or die "fork_call: cannot open fh-to-buf in child : $!";
417	Storable::store_fd $_[0], $fh;
418	close $fh;
419
420	$buf
421	}
422
423	sub fork_call(&@) {	496	sub fork_call(&@) {
424	my ($cb, @args) = @_;	497	my ($cb, @args) = @_;
425		498
426	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	499	# we seemingly have to make a local copy of the whole thing,
427	# or die "socketpair: $!";	500	# otherwise perl prematurely frees the stuff :/
428	pipe my $fh1, my $fh2	501	# TODO: investigate and fix (likely this will be rather laborious)
429	or die "pipe: $!";
430		502
431	if (my $pid = fork) {	503	my @res = Coro::Util::fork_eval {
432	close $fh2;
433
434	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
435	warn "pst<$res>" unless $res =~ /^pst/;
436	$res = Coro::Storable::thaw $res;
437
438	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
439
440	Carp::confess $$res unless "ARRAY" eq ref $res;
441
442	return wantarray ? @$res : $res->[-1];
443	} else {
444	reset_signals;	504	reset_signals;
445	local $SIG{__WARN__};	505	&$cb
446	local $SIG{__DIE__};	506	}, @args;
447	# just in case, this hack effectively disables event
448	# in the child. cleaner and slower would be canceling all watchers,
449	# but this works for the time being.
450	local $Coro::idle;
451	$Coro::current->prio (Coro::PRIO_MAX);
452		507
453	eval {	508	wantarray ? @res : $res[-1]
454	close $fh1;
455
456	my @res = eval { $cb->(@args) };
457
458	syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
459	close $fh2;
460	};
461
462	warn $@ if $@;
463	_exit 0;
464	}
465	}	509	}
466		510
467	=item $value = cf::db_get $family => $key	511	=item $value = cf::db_get $family => $key
468		512
469	Returns a single value from the environment database.	513	Returns a single value from the environment database.
…		…
471	=item cf::db_put $family => $key => $value	515	=item cf::db_put $family => $key => $value
472		516
473	Stores the given C<$value> in the family. It can currently store binary	517	Stores the given C<$value> in the family. It can currently store binary
474	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).	518	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
475		519
		520	=item $db = cf::db_table "name"
		521
		522	Create and/or open a new database table. The string must not be "db" and must be unique
		523	within each server.
		524
476	=cut	525	=cut
		526
		527	sub db_table($) {
		528	my ($name) = @_;
		529	my $db = BDB::db_create $DB_ENV;
		530
		531	eval {
		532	$db->set_flags (BDB::CHKSUM);
		533
		534	utf8::encode $name;
		535	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		536	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
		537	cf::cleanup "db_open(db): $!" if $!;
		538	};
		539	cf::cleanup "db_open(db): $@" if $@;
		540
		541	$db
		542	}
477		543
478	our $DB;	544	our $DB;
479		545
480	sub db_init {	546	sub db_init {
481	unless ($DB) {
482	$DB = BDB::db_create $DB_ENV;
483
484	cf::sync_job {	547	cf::sync_job {
485	eval {	548	$DB \|\|= db_table "db";
486	$DB->set_flags (BDB::CHKSUM);
487
488	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
489	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
490	cf::cleanup "db_open(db): $!" if $!;
491	};
492	cf::cleanup "db_open(db): $@" if $@;
493	};
494	}	549	};
495	}	550	}
496		551
497	sub db_get($$) {	552	sub db_get($$) {
498	my $key = "$_[0]/$_[1]";	553	my $key = "$_[0]/$_[1]";
499		554
…		…
549	if (1) {	604	if (1) {
550	$md5 =	605	$md5 =
551	join "\x00",	606	join "\x00",
552	$processversion,	607	$processversion,
553	map {	608	map {
554	Coro::cede;	609	cf::cede_to_tick;
555	($src->[$_], Digest::MD5::md5_hex $data[$_])	610	($src->[$_], Digest::MD5::md5_hex $data[$_])
556	} 0.. $#$src;	611	} 0.. $#$src;
557		612
558		613
559	my $dbmd5 = db_get cache => "$id/md5";	614	my $dbmd5 = db_get cache => "$id/md5";
…		…
865	";	920	";
866	die if $@;	921	die if $@;
867	}	922	}
868		923
869	our $override;	924	our $override;
870	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	925	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
871		926
872	sub override {	927	sub override {
873	$override = 1;	928	$override = 1;
874	@invoke_results = ();	929	@INVOKE_RESULTS = (@_);
875	}	930	}
876		931
877	sub do_invoke {	932	sub do_invoke {
878	my $event = shift;	933	my $event = shift;
879	my $callbacks = shift;	934	my $callbacks = shift;
880		935
881	@invoke_results = ();	936	@INVOKE_RESULTS = ();
882		937
883	local $override;	938	local $override;
884		939
885	for (@$callbacks) {	940	for (@$callbacks) {
886	eval { &{$_->[1]} };	941	eval { &{$_->[1]} };
…		…
903		958
904	Generate an object-specific event with the given arguments.	959	Generate an object-specific event with the given arguments.
905		960
906	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	961	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
907	removed in future versions), and there is no public API to access override	962	removed in future versions), and there is no public API to access override
908	results (if you must, access C<@cf::invoke_results> directly).	963	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
909		964
910	=back	965	=back
911		966
912	=cut	967	=cut
913		968
914	#############################################################################	969	#############################################################################
915	# object support	970	# object support
		971	#
		972
		973	sub _can_merge {
		974	my ($ob1, $ob2) = @_;
		975
		976	return 1;#d#
		977
		978	#todo#d# kill yourself and do some recursive checking manually without storable
		979	sync_job {
		980	my $guard = Coro::Storable::guard;
		981	local $Storable::canonical = 1;
		982	my $fob1 = Storable::freeze $ob1;
		983	my $fob2 = Storable::freeze $ob2;
		984	$fob1 eq $fob2
		985	}
		986	}
916		987
917	sub reattach {	988	sub reattach {
918	# basically do the same as instantiate, without calling instantiate	989	# basically do the same as instantiate, without calling instantiate
919	my ($obj) = @_;	990	my ($obj) = @_;
920		991
…		…
967	sub object_freezer_save {	1038	sub object_freezer_save {
968	my ($filename, $rdata, $objs) = @_;	1039	my ($filename, $rdata, $objs) = @_;
969		1040
970	sync_job {	1041	sync_job {
971	if (length $$rdata) {	1042	if (length $$rdata) {
		1043	utf8::decode (my $decname = $filename);
972	warn sprintf "saving %s (%d,%d)\n",	1044	warn sprintf "saving %s (%d,%d)\n",
973	$filename, length $$rdata, scalar @$objs;	1045	$decname, length $$rdata, scalar @$objs;
974		1046
975	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1047	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
976	chmod SAVE_MODE, $fh;	1048	chmod SAVE_MODE, $fh;
977	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1049	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
978	aio_fsync $fh if $cf::USE_FSYNC;	1050	aio_fsync $fh if $cf::USE_FSYNC;
979	close $fh;	1051	close $fh;
980		1052
981	if (@$objs) {	1053	if (@$objs) {
982	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {	1054	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {
983	chmod SAVE_MODE, $fh;	1055	chmod SAVE_MODE, $fh;
984	my $data = Storable::nfreeze { version => 1, objs => $objs };	1056	my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
985	aio_write $fh, 0, (length $data), $data, 0;	1057	aio_write $fh, 0, (length $data), $data, 0;
986	aio_fsync $fh if $cf::USE_FSYNC;	1058	aio_fsync $fh if $cf::USE_FSYNC;
987	close $fh;	1059	close $fh;
988	aio_rename "$filename.pst~", "$filename.pst";	1060	aio_rename "$filename.pst~", "$filename.pst";
989	}	1061	}
…		…
997	}	1069	}
998	} else {	1070	} else {
999	aio_unlink $filename;	1071	aio_unlink $filename;
1000	aio_unlink "$filename.pst";	1072	aio_unlink "$filename.pst";
1001	}	1073	}
1002	}	1074	};
1003	}	1075	}
1004		1076
1005	sub object_freezer_as_string {	1077	sub object_freezer_as_string {
1006	my ($rdata, $objs) = @_;	1078	my ($rdata, $objs) = @_;
1007		1079
…		…
1019	or return;	1091	or return;
1020		1092
1021	unless (aio_stat "$filename.pst") {	1093	unless (aio_stat "$filename.pst") {
1022	(aio_load "$filename.pst", $av) >= 0	1094	(aio_load "$filename.pst", $av) >= 0
1023	or return;	1095	or return;
1024	$av = eval { (Storable::thaw $av)->{objs} };
1025	}
1026		1096
		1097	my $st = eval { Coro::Storable::thaw $av }
		1098	\|\| eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
		1099	$av = $st->{objs};
		1100	}
		1101
		1102	utf8::decode (my $decname = $filename);
1027	warn sprintf "loading %s (%d)\n",	1103	warn sprintf "loading %s (%d,%d)\n",
1028	$filename, length $data, scalar @{$av \|\| []};	1104	$decname, length $data, scalar @{$av \|\| []};
		1105
1029	return ($data, $av);	1106	($data, $av)
1030	}	1107	}
1031		1108
1032	=head2 COMMAND CALLBACKS	1109	=head2 COMMAND CALLBACKS
1033		1110
1034	=over 4	1111	=over 4
…		…
1107	my ($pl, $buf) = @_;	1184	my ($pl, $buf) = @_;
1108		1185
1109	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1186	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1110		1187
1111	if (ref $msg) {	1188	if (ref $msg) {
		1189	my ($type, $reply, @payload) =
		1190	"ARRAY" eq ref $msg
		1191	? @$msg
		1192	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1193
		1194	my @reply;
		1195
1112	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1196	if (my $cb = $EXTCMD{$type}) {
1113	if (my %reply = $cb->($pl, $msg)) {	1197	@reply = $cb->($pl, @payload);
1114	$pl->ext_reply ($msg->{msgid}, %reply);
1115	}
1116	}	1198	}
		1199
		1200	$pl->ext_reply ($reply, @reply)
		1201	if $reply;
		1202
1117	} else {	1203	} else {
1118	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1204	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1119	}	1205	}
1120		1206
1121	cf::override;	1207	cf::override;
…		…
1211		1297
1212	=head3 cf::player	1298	=head3 cf::player
1213		1299
1214	=over 4	1300	=over 4
1215		1301
		1302	=item cf::player::num_playing
		1303
		1304	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1305
		1306	=cut
		1307
		1308	sub num_playing {
		1309	scalar grep
		1310	$_->ob->map
		1311	&& !$_->hidden
		1312	&& !$_->ob->flag (cf::FLAG_WIZ),
		1313	cf::player::list
		1314	}
		1315
1216	=item cf::player::find $login	1316	=item cf::player::find $login
1217		1317
1218	Returns the given player object, loading it if necessary (might block).	1318	Returns the given player object, loading it if necessary (might block).
1219		1319
1220	=cut	1320	=cut
…		…
1255	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1355	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1256	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1356	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1257	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1357	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1258	aio_unlink +(playerdir $login) . "/$login.pl";	1358	aio_unlink +(playerdir $login) . "/$login.pl";
1259		1359
1260	my $pl = load_pl path $login	1360	my $f = new_from_file cf::object::thawer path $login
1261	or return;	1361	or return;
		1362
		1363	my $pl = cf::player::load_pl $f
		1364	or return;
		1365	local $cf::PLAYER_LOADING{$login} = $pl;
		1366	$f->resolve_delayed_derefs;
1262	$cf::PLAYER{$login} = $pl	1367	$cf::PLAYER{$login} = $pl
1263	}	1368	}
1264	}	1369	}
1265	}	1370	}
1266		1371
…		…
1276		1381
1277	aio_mkdir playerdir $pl, 0770;	1382	aio_mkdir playerdir $pl, 0770;
1278	$pl->{last_save} = $cf::RUNTIME;	1383	$pl->{last_save} = $cf::RUNTIME;
1279		1384
1280	$pl->save_pl ($path);	1385	$pl->save_pl ($path);
1281	Coro::cede;	1386	cf::cede_to_tick;
1282	}	1387	}
1283		1388
1284	sub new($) {	1389	sub new($) {
1285	my ($login) = @_;	1390	my ($login) = @_;
1286		1391
…		…
1290	$self->{deny_save} = 1;	1395	$self->{deny_save} = 1;
1291		1396
1292	$cf::PLAYER{$login} = $self;	1397	$cf::PLAYER{$login} = $self;
1293		1398
1294	$self	1399	$self
		1400	}
		1401
		1402	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1403
		1404	=cut
		1405
		1406	sub send_msg {
		1407	my $ns = shift->ns
		1408	or return;
		1409	$ns->send_msg (@_);
1295	}	1410	}
1296		1411
1297	=item $pl->quit_character	1412	=item $pl->quit_character
1298		1413
1299	Nukes the player without looking back. If logged in, the connection will	1414	Nukes the player without looking back. If logged in, the connection will
…		…
1354	or return [];	1469	or return [];
1355		1470
1356	my @logins;	1471	my @logins;
1357		1472
1358	for my $login (@$dirs) {	1473	for my $login (@$dirs) {
		1474	my $path = path $login;
		1475
		1476	# a .pst is a dead give-away for a valid player
		1477	unless (-e "$path.pst") {
1359	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1478	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1360	aio_read $fh, 0, 512, my $buf, 0 or next;	1479	aio_read $fh, 0, 512, my $buf, 0 or next;
1361	$buf !~ /^password -------------$/m or next; # official not-valid tag	1480	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1481	}
1362		1482
1363	utf8::decode $login;	1483	utf8::decode $login;
1364	push @logins, $login;	1484	push @logins, $login;
1365	}	1485	}
1366		1486
…		…
1404	sub expand_cfpod {	1524	sub expand_cfpod {
1405	((my $self), (local $_)) = @_;	1525	((my $self), (local $_)) = @_;
1406		1526
1407	# escape & and <	1527	# escape & and <
1408	s/&/&/g;	1528	s/&/&/g;
1409	s/(?<![BIUGH])</</g;	1529	s/(?<![BIUGHT])</</g;
1410		1530
1411	# this is buggy, it needs to properly take care of nested <'s	1531	# this is buggy, it needs to properly take care of nested <'s
1412		1532
1413	1 while	1533	1 while
1414	# replace B<>, I<>, U<> etc.	1534	# replace B<>, I<>, U<> etc.
1415	s/B<([^\>]*)>/<b>$1<\/b>/	1535	s/B<([^\>]*)>/<b>$1<\/b>/
1416	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1536	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1417	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1537	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1538	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1418	# replace G<male\|female> tags	1539	# replace G<male\|female> tags
1419	\|\| s{G<([^>\|])\\|([^>])>}{	1540	\|\| s{G<([^>\|])\\|([^>])>}{
1420	$self->gender ? $2 : $1	1541	$self->gender ? $2 : $1
1421	}ge	1542	}ge
1422	# replace H<hint text>	1543	# replace H<hint text>
…		…
1435	s/\s+\n/\n/g; # ws line-ends	1556	s/\s+\n/\n/g; # ws line-ends
1436	s/\n\n+/\n/g; # double lines	1557	s/\n\n+/\n/g; # double lines
1437	s/^\n+//; # beginning lines	1558	s/^\n+//; # beginning lines
1438	s/\n+$//; # ending lines	1559	s/\n+$//; # ending lines
1439		1560
1440	warn $_;#d#
1441	$_	1561	$_
1442	}	1562	}
1443		1563
1444	sub hintmode {	1564	sub hintmode {
1445	$_[0]{hintmode} = $_[1] if @_ > 1;	1565	$_[0]{hintmode} = $_[1] if @_ > 1;
1446	$_[0]{hintmode}	1566	$_[0]{hintmode}
1447	}	1567	}
1448		1568
1449	=item $player->ext_reply ($msgid, %msg)	1569	=item $player->ext_reply ($msgid, @msg)
1450		1570
1451	Sends an ext reply to the player.	1571	Sends an ext reply to the player.
1452		1572
1453	=cut	1573	=cut
1454		1574
1455	sub ext_reply($$%) {	1575	sub ext_reply($$@) {
1456	my ($self, $id, %msg) = @_;	1576	my ($self, $id, @msg) = @_;
1457		1577
1458	$msg{msgid} = $id;	1578	$self->ns->ext_reply ($id, @msg)
1459	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460	}	1579	}
1461		1580
1462	=item $player->ext_event ($type, %msg)	1581	=item $player->ext_msg ($type, @msg)
1463		1582
1464	Sends an ext event to the client.	1583	Sends an ext event to the client.
1465		1584
1466	=cut	1585	=cut
1467		1586
1468	sub ext_event($$%) {	1587	sub ext_msg($$@) {
1469	my ($self, $type, %msg) = @_;	1588	my ($self, $type, @msg) = @_;
1470		1589
1471	$self->ns->ext_event ($type, %msg);	1590	$self->ns->ext_msg ($type, @msg);
1472	}	1591	}
1473		1592
1474	=head3 cf::region	1593	=head3 cf::region
1475		1594
1476	=over 4	1595	=over 4
…		…
1489	my ($path) = @_;	1608	my ($path) = @_;
1490		1609
1491	my ($match, $specificity);	1610	my ($match, $specificity);
1492		1611
1493	for my $region (list) {	1612	for my $region (list) {
1494	if ($region->match && $path =~ $region->match) {	1613	if ($region->{match} && $path =~ $region->{match}) {
1495	($match, $specificity) = ($region, $region->specificity)	1614	($match, $specificity) = ($region, $region->specificity)
1496	if $region->specificity > $specificity;	1615	if $region->specificity > $specificity;
1497	}	1616	}
1498	}	1617	}
1499		1618
…		…
1619	$self->init; # pass $1 etc.	1738	$self->init; # pass $1 etc.
1620	return $self;	1739	return $self;
1621	}	1740	}
1622	}	1741	}
1623		1742
1624	Carp::carp "unable to resolve path '$path' (base '$base').";	1743	Carp::cluck "unable to resolve path '$path' (base '$base').";
1625	()	1744	()
1626	}	1745	}
1627		1746
1628	sub init {	1747	sub init {
1629	my ($self) = @_;	1748	my ($self) = @_;
…		…
1692		1811
1693	sub load_header_from($) {	1812	sub load_header_from($) {
1694	my ($self, $path) = @_;	1813	my ($self, $path) = @_;
1695		1814
1696	utf8::encode $path;	1815	utf8::encode $path;
1697	#aio_open $path, O_RDONLY, 0	1816	my $f = new_from_file cf::object::thawer $path
1698	# or return;
1699
1700	$self->_load_header ($path)
1701	or return;	1817	or return;
		1818
		1819	$self->_load_header ($f)
		1820	or return;
		1821
		1822	local $MAP_LOADING{$self->{path}} = $self;
		1823	$f->resolve_delayed_derefs;
1702		1824
1703	$self->{load_path} = $path;	1825	$self->{load_path} = $path;
1704		1826
1705	1	1827	1
1706	}	1828	}
…		…
1760	sub find {	1882	sub find {
1761	my ($path, $origin) = @_;	1883	my ($path, $origin) = @_;
1762		1884
1763	$path = normalise $path, $origin && $origin->path;	1885	$path = normalise $path, $origin && $origin->path;
1764		1886
		1887	cf::lock_wait "map_data:$path";#d#remove
1765	cf::lock_wait "map_find:$path";	1888	cf::lock_wait "map_find:$path";
1766		1889
1767	$cf::MAP{$path} \|\| do {	1890	$cf::MAP{$path} \|\| do {
1768	my $guard = cf::lock_acquire "map_find:$path";	1891	my $guard1 = cf::lock_acquire "map_find:$path";
		1892	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1893
1769	my $map = new_from_path cf::map $path	1894	my $map = new_from_path cf::map $path
1770	or return;	1895	or return;
1771		1896
1772	$map->{last_save} = $cf::RUNTIME;	1897	$map->{last_save} = $cf::RUNTIME;
1773		1898
…		…
1775	or return;	1900	or return;
1776		1901
1777	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1902	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778	# doing this can freeze the server in a sync job, obviously	1903	# doing this can freeze the server in a sync job, obviously
1779	#$cf::WAIT_FOR_TICK->wait;	1904	#$cf::WAIT_FOR_TICK->wait;
		1905	undef $guard1;
		1906	undef $guard2;
1780	$map->reset;	1907	$map->reset;
1781	undef $guard;
1782	return find $path;	1908	return find $path;
1783	}	1909	}
1784		1910
1785	$cf::MAP{$path} = $map	1911	$cf::MAP{$path} = $map
1786	}	1912	}
…		…
1795	local $self->{deny_reset} = 1; # loading can take a long time	1921	local $self->{deny_reset} = 1; # loading can take a long time
1796		1922
1797	my $path = $self->{path};	1923	my $path = $self->{path};
1798		1924
1799	{	1925	{
1800	my $guard = cf::lock_acquire "map_load:$path";	1926	my $guard = cf::lock_acquire "map_data:$path";
1801		1927
		1928	return unless $self->valid;
1802	return if $self->in_memory != cf::MAP_SWAPPED;	1929	return unless $self->in_memory == cf::MAP_SWAPPED;
1803		1930
1804	$self->in_memory (cf::MAP_LOADING);	1931	$self->in_memory (cf::MAP_LOADING);
1805		1932
1806	$self->alloc;	1933	$self->alloc;
1807		1934
1808	$self->pre_load;	1935	$self->pre_load;
1809	Coro::cede;	1936	cf::cede_to_tick;
1810		1937
		1938	my $f = new_from_file cf::object::thawer $self->{load_path};
		1939	$f->skip_block;
1811	$self->_load_objects ($self->{load_path}, 1)	1940	$self->_load_objects ($f)
1812	or return;	1941	or return;
1813		1942
1814	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1943	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1815	if delete $self->{load_original};	1944	if delete $self->{load_original};
1816		1945
1817	if (my $uniq = $self->uniq_path) {	1946	if (my $uniq = $self->uniq_path) {
1818	utf8::encode $uniq;	1947	utf8::encode $uniq;
1819	if (aio_open $uniq, O_RDONLY, 0) {	1948	unless (aio_stat $uniq) {
		1949	if (my $f = new_from_file cf::object::thawer $uniq) {
1820	$self->clear_unique_items;	1950	$self->clear_unique_items;
1821	$self->_load_objects ($uniq, 0);	1951	$self->_load_objects ($f);
		1952	$f->resolve_delayed_derefs;
		1953	}
1822	}	1954	}
1823	}	1955	}
1824		1956
1825	Coro::cede;	1957	$f->resolve_delayed_derefs;
		1958
		1959	cf::cede_to_tick;
1826	# now do the right thing for maps	1960	# now do the right thing for maps
1827	$self->link_multipart_objects;	1961	$self->link_multipart_objects;
1828	$self->difficulty ($self->estimate_difficulty)	1962	$self->difficulty ($self->estimate_difficulty)
1829	unless $self->difficulty;	1963	unless $self->difficulty;
1830	Coro::cede;	1964	cf::cede_to_tick;
1831		1965
1832	unless ($self->{deny_activate}) {	1966	unless ($self->{deny_activate}) {
1833	$self->decay_objects;	1967	$self->decay_objects;
1834	$self->fix_auto_apply;	1968	$self->fix_auto_apply;
1835	$self->update_buttons;	1969	$self->update_buttons;
1836	Coro::cede;	1970	cf::cede_to_tick;
1837	$self->set_darkness_map;	1971	$self->set_darkness_map;
1838	Coro::cede;	1972	cf::cede_to_tick;
1839	$self->activate;	1973	$self->activate;
1840	}	1974	}
		1975
		1976	$self->{last_save} = $cf::RUNTIME;
		1977	$self->last_access ($cf::RUNTIME);
1841		1978
1842	$self->in_memory (cf::MAP_IN_MEMORY);	1979	$self->in_memory (cf::MAP_IN_MEMORY);
1843	}	1980	}
1844		1981
1845	$self->post_load;	1982	$self->post_load;
…		…
1856		1993
1857	$self	1994	$self
1858	}	1995	}
1859		1996
1860	# find and load all maps in the 3x3 area around a map	1997	# find and load all maps in the 3x3 area around a map
1861	sub load_diag {	1998	sub load_neighbours {
1862	my ($map) = @_;	1999	my ($map) = @_;
1863		2000
1864	my @diag; # diagonal neighbours	2001	my @neigh; # diagonal neighbours
1865		2002
1866	for (0 .. 3) {	2003	for (0 .. 3) {
1867	my $neigh = $map->tile_path ($_)	2004	my $neigh = $map->tile_path ($_)
1868	or next;	2005	or next;
1869	$neigh = find $neigh, $map	2006	$neigh = find $neigh, $map
1870	or next;	2007	or next;
1871	$neigh->load;	2008	$neigh->load;
1872		2009
		2010	push @neigh,
1873	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2011	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1874	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2012	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1875	}	2013	}
1876		2014
1877	for (@diag) {	2015	for (grep defined $_->[0], @neigh) {
		2016	my ($path, $origin) = @$_;
1878	my $neigh = find @$_	2017	my $neigh = find $path, $origin
1879	or next;	2018	or next;
1880	$neigh->load;	2019	$neigh->load;
1881	}	2020	}
1882	}	2021	}
1883		2022
…		…
1888	}	2027	}
1889		2028
1890	sub do_load_sync {	2029	sub do_load_sync {
1891	my ($map) = @_;	2030	my ($map) = @_;
1892		2031
		2032	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2033	if $Coro::current == $Coro::main;
		2034
1893	cf::sync_job { $map->load };	2035	cf::sync_job { $map->load };
1894	}	2036	}
1895		2037
1896	our %MAP_PREFETCH;	2038	our %MAP_PREFETCH;
1897	our $MAP_PREFETCHER = undef;	2039	our $MAP_PREFETCHER = undef;
1898		2040
1899	sub find_async {	2041	sub find_async {
1900	my ($path, $origin) = @_;	2042	my ($path, $origin, $load) = @_;
1901		2043
1902	$path = normalise $path, $origin && $origin->{path};	2044	$path = normalise $path, $origin && $origin->{path};
1903		2045
1904	if (my $map = $cf::MAP{$path}) {	2046	if (my $map = $cf::MAP{$path}) {
1905	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2047	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1906	}	2048	}
1907		2049
1908	undef $MAP_PREFETCH{$path};	2050	$MAP_PREFETCH{$path} \|= $load;
		2051
1909	$MAP_PREFETCHER \|\|= cf::async {	2052	$MAP_PREFETCHER \|\|= cf::async {
		2053	$Coro::current->{desc} = "map prefetcher";
		2054
1910	while (%MAP_PREFETCH) {	2055	while (%MAP_PREFETCH) {
1911	for my $path (keys %MAP_PREFETCH) {	2056	while (my ($k, $v) = each %MAP_PREFETCH) {
1912	my $map = find $path	2057	if (my $map = find $k) {
1913	or next;
1914	$map->load;	2058	$map->load if $v;
		2059	}
1915		2060
1916	delete $MAP_PREFETCH{$path};	2061	delete $MAP_PREFETCH{$k};
1917	}	2062	}
1918	}	2063	}
1919	undef $MAP_PREFETCHER;	2064	undef $MAP_PREFETCHER;
1920	};	2065	};
1921	$MAP_PREFETCHER->prio (6);	2066	$MAP_PREFETCHER->prio (6);
…		…
1924	}	2069	}
1925		2070
1926	sub save {	2071	sub save {
1927	my ($self) = @_;	2072	my ($self) = @_;
1928		2073
1929	my $lock = cf::lock_acquire "map_data:" . $self->path;	2074	my $lock = cf::lock_acquire "map_data:$self->{path}";
1930		2075
1931	$self->{last_save} = $cf::RUNTIME;	2076	$self->{last_save} = $cf::RUNTIME;
1932		2077
1933	return unless $self->dirty;	2078	return unless $self->dirty;
1934		2079
…		…
1940	return if $self->{deny_save};	2085	return if $self->{deny_save};
1941		2086
1942	local $self->{last_access} = $self->last_access;#d#	2087	local $self->{last_access} = $self->last_access;#d#
1943		2088
1944	cf::async {	2089	cf::async {
		2090	$Coro::current->{desc} = "map player save";
1945	$_->contr->save for $self->players;	2091	$_->contr->save for $self->players;
1946	};	2092	};
1947		2093
1948	if ($uniq) {	2094	if ($uniq) {
1949	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	2095	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
…		…
1957	my ($self) = @_;	2103	my ($self) = @_;
1958		2104
1959	# save first because save cedes	2105	# save first because save cedes
1960	$self->save;	2106	$self->save;
1961		2107
1962	my $lock = cf::lock_acquire "map_data:" . $self->path;	2108	my $lock = cf::lock_acquire "map_data:$self->{path}";
1963		2109
1964	return if $self->players;	2110	return if $self->players;
1965	return if $self->in_memory != cf::MAP_IN_MEMORY;	2111	return if $self->in_memory != cf::MAP_IN_MEMORY;
1966	return if $self->{deny_save};	2112	return if $self->{deny_save};
1967		2113
		2114	$self->in_memory (cf::MAP_SWAPPED);
		2115
		2116	$self->deactivate;
		2117	$_->clear_links_to ($self) for values %cf::MAP;
1968	$self->clear;	2118	$self->clear;
1969	$self->in_memory (cf::MAP_SWAPPED);
1970	}	2119	}
1971		2120
1972	sub reset_at {	2121	sub reset_at {
1973	my ($self) = @_;	2122	my ($self) = @_;
1974		2123
…		…
2006	if $uniq;	2155	if $uniq;
2007	}	2156	}
2008		2157
2009	delete $cf::MAP{$self->path};	2158	delete $cf::MAP{$self->path};
2010		2159
		2160	$self->deactivate;
		2161	$_->clear_links_to ($self) for values %cf::MAP;
2011	$self->clear;	2162	$self->clear;
2012
2013	$_->clear_links_to ($self) for values %cf::MAP;
2014		2163
2015	$self->unlink_save;	2164	$self->unlink_save;
2016	$self->destroy;	2165	$self->destroy;
2017	}	2166	}
2018		2167
2019	my $nuke_counter = "aaaa";	2168	my $nuke_counter = "aaaa";
2020		2169
2021	sub nuke {	2170	sub nuke {
2022	my ($self) = @_;	2171	my ($self) = @_;
2023		2172
		2173	{
		2174	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2175
2024	delete $cf::MAP{$self->path};	2176	delete $cf::MAP{$self->path};
2025		2177
2026	$self->unlink_save;	2178	$self->unlink_save;
2027		2179
2028	bless $self, "cf::map";	2180	bless $self, "cf::map";
2029	delete $self->{deny_reset};	2181	delete $self->{deny_reset};
2030	$self->{deny_save} = 1;	2182	$self->{deny_save} = 1;
2031	$self->reset_timeout (1);	2183	$self->reset_timeout (1);
2032	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2184	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033		2185
2034	$cf::MAP{$self->path} = $self;	2186	$cf::MAP{$self->path} = $self;
		2187	}
2035		2188
2036	$self->reset; # polite request, might not happen	2189	$self->reset; # polite request, might not happen
2037	}	2190	}
2038		2191
2039	=item $maps = cf::map::tmp_maps	2192	=item $maps = cf::map::tmp_maps
…		…
2115		2268
2116	sub inv_recursive {	2269	sub inv_recursive {
2117	inv_recursive_ inv $_[0]	2270	inv_recursive_ inv $_[0]
2118	}	2271	}
2119		2272
		2273	=item $ref = $ob->ref
		2274
		2275	creates and returns a persistent reference to an objetc that can be stored as a string.
		2276
		2277	=item $ob = cf::object::deref ($refstring)
		2278
		2279	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2280	even if the object actually exists. May block.
		2281
		2282	=cut
		2283
		2284	sub deref {
		2285	my ($ref) = @_;
		2286
		2287	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2288	my ($uuid, $name) = ($1, $2);
		2289	my $pl = $cf::PLAYER_LOADING{$name} \|\| cf::player::find $name
		2290	or return;
		2291	$pl->ob->uuid eq $uuid
		2292	or return;
		2293
		2294	$pl->ob
		2295	} else {
		2296	warn "$ref: cannot resolve object reference\n";
		2297	undef
		2298	}
		2299	}
		2300
2120	package cf;	2301	package cf;
2121		2302
2122	=back	2303	=back
2123		2304
2124	=head3 cf::object::player	2305	=head3 cf::object::player
…		…
2146		2327
2147	} else {	2328	} else {
2148	my $pl = $self->contr;	2329	my $pl = $self->contr;
2149		2330
2150	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2331	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151	my $diag = $pl->{npc_dialog};	2332	my $dialog = $pl->{npc_dialog};
2152	$diag->{pl}->ext_reply (	2333	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153	$diag->{id},
2154	msgtype => "reply",
2155	msg => $diag->{pl}->expand_cfpod ($msg),
2156	add_topics => []
2157	);
2158		2334
2159	} else {	2335	} else {
2160	$msg = $npc->name . " says: $msg" if $npc;	2336	$msg = $npc->name . " says: $msg" if $npc;
2161	$self->message ($msg, $flags);	2337	$self->message ($msg, $flags);
2162	}	2338	}
2163	}	2339	}
		2340	}
		2341
		2342	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2343
		2344	=cut
		2345
		2346	sub cf::object::send_msg {
		2347	my $pl = shift->contr
		2348	or return;
		2349	$pl->send_msg (@_);
2164	}	2350	}
2165		2351
2166	=item $player_object->may ("access")	2352	=item $player_object->may ("access")
2167		2353
2168	Returns wether the given player is authorized to access resource "access"	2354	Returns wether the given player is authorized to access resource "access"
…		…
2247	# use -1 or undef as default coordinates, not 0, 0	2433	# use -1 or undef as default coordinates, not 0, 0
2248	($x, $y) = ($map->enter_x, $map->enter_y)	2434	($x, $y) = ($map->enter_x, $map->enter_y)
2249	if $x <=0 && $y <= 0;	2435	if $x <=0 && $y <= 0;
2250		2436
2251	$map->load;	2437	$map->load;
2252	$map->load_diag;	2438	$map->load_neighbours;
2253		2439
2254	return unless $self->contr->active;	2440	return unless $self->contr->active;
2255	$self->activate_recursive;	2441	$self->activate_recursive;
2256		2442
2257	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2443	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258	$self->enter_map ($map, $x, $y);	2444	$self->enter_map ($map, $x, $y);
2259	}	2445	}
2260		2446
2261	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2447	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262		2448
2263	Moves the player to the given map-path and coordinates by first freezing	2449	Moves the player to the given map-path and coordinates by first freezing
2264	her, loading and preparing them map, calling the provided $check callback	2450	her, loading and preparing them map, calling the provided $check callback
2265	that has to return the map if sucecssful, and then unfreezes the player on	2451	that has to return the map if sucecssful, and then unfreezes the player on
2266	the new (success) or old (failed) map position.	2452	the new (success) or old (failed) map position. In either case, $done will
		2453	be called at the end of this process.
2267		2454
2268	=cut	2455	=cut
2269		2456
2270	our $GOTOGEN;	2457	our $GOTOGEN;
2271		2458
2272	sub cf::object::player::goto {	2459	sub cf::object::player::goto {
2273	my ($self, $path, $x, $y, $check) = @_;	2460	my ($self, $path, $x, $y, $check, $done) = @_;
2274		2461
2275	# do generation counting so two concurrent goto's will be executed in-order	2462	# do generation counting so two concurrent goto's will be executed in-order
2276	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2463	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277		2464
2278	$self->enter_link;	2465	$self->enter_link;
2279		2466
2280	(async {	2467	(async {
		2468	$Coro::current->{desc} = "player::goto $path $x $y";
		2469
		2470	# *tag paths override both path and x\|y
		2471	if ($path =~ /^\(.)$/) {
		2472	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2473	my $ob = $obs[rand @obs];
		2474
		2475	# see if we actually can go there
		2476	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2477	$ob = $obs[rand @obs];
		2478	} else {
		2479	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE \| cf::NDI_RED);
		2480	}
		2481	# else put us there anyways for now #d#
		2482
		2483	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2484	} else {
		2485	($path, $x, $y) = (undef, undef, undef);
		2486	}
		2487	}
		2488
2281	my $map = eval {	2489	my $map = eval {
2282	my $map = cf::map::find $path;	2490	my $map = defined $path ? cf::map::find $path : undef;
2283		2491
2284	if ($map) {	2492	if ($map) {
2285	$map = $map->customise_for ($self);	2493	$map = $map->customise_for ($self);
2286	$map = $check->($map) if $check && $map;	2494	$map = $check->($map) if $check && $map;
2287	} else {	2495	} else {
2288	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);	2496	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE \| cf::NDI_RED);
2289	}	2497	}
2290		2498
2291	$map	2499	$map
2292	};	2500	};
2293		2501
…		…
2298		2506
2299	if ($gen == $self->{_goto_generation}) {	2507	if ($gen == $self->{_goto_generation}) {
2300	delete $self->{_goto_generation};	2508	delete $self->{_goto_generation};
2301	$self->leave_link ($map, $x, $y);	2509	$self->leave_link ($map, $x, $y);
2302	}	2510	}
		2511
		2512	$done->() if $done;
2303	})->prio (1);	2513	})->prio (1);
2304	}	2514	}
2305		2515
2306	=item $player_object->enter_exit ($exit_object)	2516	=item $player_object->enter_exit ($exit_object)
2307		2517
…		…
2381	# if exit is damned, update players death & WoR home-position	2591	# if exit is damned, update players death & WoR home-position
2382	$self->contr->savebed ($slaying, $hp, $sp)	2592	$self->contr->savebed ($slaying, $hp, $sp)
2383	if $exit->flag (FLAG_DAMNED);	2593	if $exit->flag (FLAG_DAMNED);
2384		2594
2385	(async {	2595	(async {
		2596	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2597
2386	$self->deactivate_recursive; # just to be sure	2598	$self->deactivate_recursive; # just to be sure
2387	unless (eval {	2599	unless (eval {
2388	$self->goto ($slaying, $hp, $sp);	2600	$self->goto ($slaying, $hp, $sp);
2389		2601
2390	1;	2602	1;
…		…
2416		2628
2417	utf8::encode $text;	2629	utf8::encode $text;
2418	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2630	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2419	}	2631	}
2420		2632
2421	=item $client->send_msg ($color, $type, $msg, [extra...])	2633	=item $client->send_msg ($channel, $msg, $color, [extra...])
2422		2634
2423	Send a drawinfo or msg packet to the client, formatting the msg for the	2635	Send a drawinfo or msg packet to the client, formatting the msg for the
2424	client if neccessary. C<$type> should be a string identifying the type of	2636	client if neccessary. C<$type> should be a string identifying the type of
2425	the message, with C<log> being the default. If C<$color> is negative, suppress	2637	the message, with C<log> being the default. If C<$color> is negative, suppress
2426	the message unless the client supports the msg packet.	2638	the message unless the client supports the msg packet.
2427		2639
2428	=cut	2640	=cut
2429		2641
		2642	our %CHANNEL = (
		2643	"c/identify" => {
		2644	id => "infobox",
		2645	title => "Identify",
		2646	reply => undef,
		2647	tooltip => "Items recently identified",
		2648	},
		2649	"c/examine" => {
		2650	id => "infobox",
		2651	title => "Examine",
		2652	reply => undef,
		2653	tooltip => "Signs and other items you examined",
		2654	},
		2655	"c/lookat" => {
		2656	id => "infobox",
		2657	title => "Look",
		2658	reply => undef,
		2659	tooltip => "What you saw there",
		2660	},
		2661	);
		2662
2430	sub cf::client::send_msg {	2663	sub cf::client::send_msg {
2431	my ($self, $color, $type, $msg, @extra) = @_;	2664	my ($self, $channel, $msg, $color, @extra) = @_;
2432		2665
2433	$msg = $self->pl->expand_cfpod ($msg);	2666	$msg = $self->pl->expand_cfpod ($msg);
2434		2667
		2668	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2669
		2670	# check predefined channels, for the benefit of C
		2671	if ($CHANNEL{$channel}) {
		2672	$channel = $CHANNEL{$channel};
		2673
		2674	$self->ext_msg (channel_info => $channel)
		2675	if $self->can_msg;
		2676
		2677	$channel = $channel->{id};
		2678
		2679	} elsif (ref $channel) {
		2680	# send meta info to client, if not yet sent
		2681	unless (exists $self->{channel}{$channel->{id}}) {
		2682	$self->{channel}{$channel->{id}} = $channel;
		2683	$self->ext_msg (channel_info => $channel)
		2684	if $self->can_msg;
		2685	}
		2686
		2687	$channel = $channel->{id};
		2688	}
		2689
2435	return unless @extra \|\| length $msg;	2690	return unless @extra \|\| length $msg;
2436		2691
2437	if ($self->can_msg) {	2692	if ($self->can_msg) {
		2693	# default colour, mask it out
		2694	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2695	if $color & cf::NDI_DEF;
		2696
2438	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));	2697	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2698	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2439	} else {	2699	} else {
2440	# replace some tags by gcfclient-compatible ones
2441	for ($msg) {
2442	1 while
2443	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448	}
2449
2450	if ($color >= 0) {	2700	if ($color >= 0) {
		2701	# replace some tags by gcfclient-compatible ones
		2702	for ($msg) {
		2703	1 while
		2704	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2705	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2706	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2707	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2708	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2709	}
		2710
		2711	$color &= cf::NDI_COLOR_MASK;
		2712
		2713	utf8::encode $msg;
		2714
2451	if (0 && $msg =~ /\[/) {	2715	if (0 && $msg =~ /\[/) {
		2716	# COMMAND/INFO
2452	$self->send_packet ("drawextinfo $color 4 0 $msg")	2717	$self->send_packet ("drawextinfo $color 10 8 $msg")
2453	} else {	2718	} else {
2454	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2719	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2455	$self->send_packet ("drawinfo $color $msg")	2720	$self->send_packet ("drawinfo $color $msg")
2456	}	2721	}
2457	}	2722	}
2458	}	2723	}
2459	}	2724	}
2460		2725
2461	=item $client->ext_event ($type, %msg)	2726	=item $client->ext_msg ($type, @msg)
2462		2727
2463	Sends an ext event to the client.	2728	Sends an ext event to the client.
2464		2729
2465	=cut	2730	=cut
2466		2731
2467	sub cf::client::ext_event($$%) {	2732	sub cf::client::ext_msg($$@) {
2468	my ($self, $type, %msg) = @_;	2733	my ($self, $type, @msg) = @_;
2469		2734
		2735	if ($self->extcmd == 2) {
		2736	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2737	} elsif ($self->extcmd == 1) { # TODO: remove
2470	$msg{msgtype} = "event_$type";	2738	push @msg, msgtype => "event_$type";
2471	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2739	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2740	}
		2741	}
		2742
		2743	=item $client->ext_reply ($msgid, @msg)
		2744
		2745	Sends an ext reply to the client.
		2746
		2747	=cut
		2748
		2749	sub cf::client::ext_reply($$@) {
		2750	my ($self, $id, @msg) = @_;
		2751
		2752	if ($self->extcmd == 2) {
		2753	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2754	} elsif ($self->extcmd == 1) {
		2755	#TODO: version 1, remove
		2756	unshift @msg, msgtype => "reply", msgid => $id;
		2757	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2758	}
2472	}	2759	}
2473		2760
2474	=item $success = $client->query ($flags, "text", \&cb)	2761	=item $success = $client->query ($flags, "text", \&cb)
2475		2762
2476	Queues a query to the client, calling the given callback with	2763	Queues a query to the client, calling the given callback with
…		…
2531	my ($ns, $buf) = @_;	2818	my ($ns, $buf) = @_;
2532		2819
2533	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2820	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2534		2821
2535	if (ref $msg) {	2822	if (ref $msg) {
		2823	my ($type, $reply, @payload) =
		2824	"ARRAY" eq ref $msg
		2825	? @$msg
		2826	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2827
		2828	my @reply;
		2829
2536	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2830	if (my $cb = $EXTICMD{$type}) {
2537	if (my %reply = $cb->($ns, $msg)) {	2831	@reply = $cb->($ns, @payload);
2538	$reply{msgid} = $msg->{msgid};
2539	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2540	}
2541	}	2832	}
		2833
		2834	$ns->ext_reply ($reply, @reply)
		2835	if $reply;
		2836
2542	} else {	2837	} else {
2543	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2838	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2544	}	2839	}
2545		2840
2546	cf::override;	2841	cf::override;
…		…
2593	our $safe = new Safe "safe";	2888	our $safe = new Safe "safe";
2594	our $safe_hole = new Safe::Hole;	2889	our $safe_hole = new Safe::Hole;
2595		2890
2596	$SIG{FPE} = 'IGNORE';	2891	$SIG{FPE} = 'IGNORE';
2597		2892
2598	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2893	$safe->permit_only (Opcode::opset qw(
		2894	:base_core :base_mem :base_orig :base_math
		2895	grepstart grepwhile mapstart mapwhile
		2896	sort time
		2897	));
2599		2898
2600	# here we export the classes and methods available to script code	2899	# here we export the classes and methods available to script code
2601		2900
2602	=pod	2901	=pod
2603		2902
2604	The following functions and methods are available within a safe environment:	2903	The following functions and methods are available within a safe environment:
2605		2904
2606	cf::object	2905	cf::object
2607	contr pay_amount pay_player map x y force_find force_add	2906	contr pay_amount pay_player map x y force_find force_add destroy
2608	insert remove	2907	insert remove name archname title slaying race decrease_ob_nr
2609		2908
2610	cf::object::player	2909	cf::object::player
2611	player	2910	player
2612		2911
2613	cf::player	2912	cf::player
…		…
2618		2917
2619	=cut	2918	=cut
2620		2919
2621	for (	2920	for (
2622	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	2921	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2922	insert remove inv name archname title slaying race
2623	insert remove)],	2923	decrease_ob_nr destroy)],
2624	["cf::object::player" => qw(player)],	2924	["cf::object::player" => qw(player)],
2625	["cf::player" => qw(peaceful)],	2925	["cf::player" => qw(peaceful)],
2626	["cf::map" => qw(trigger)],	2926	["cf::map" => qw(trigger)],
2627	) {	2927	) {
2628	no strict 'refs';	2928	no strict 'refs';
…		…
2704	# the server's init and main functions	3004	# the server's init and main functions
2705		3005
2706	sub load_facedata($) {	3006	sub load_facedata($) {
2707	my ($path) = @_;	3007	my ($path) = @_;
2708		3008
		3009	# HACK to clear player env face cache, we need some signal framework
		3010	# for this (global event?)
		3011	%ext::player_env::MUSIC_FACE_CACHE = ();
		3012
		3013	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3014
2709	warn "loading facedata from $path\n";	3015	warn "loading facedata from $path\n";
2710		3016
2711	my $facedata;	3017	my $facedata;
2712	0 < aio_load $path, $facedata	3018	0 < aio_load $path, $facedata
2713	or die "$path: $!";	3019	or die "$path: $!";
…		…
2715	$facedata = Coro::Storable::thaw $facedata;	3021	$facedata = Coro::Storable::thaw $facedata;
2716		3022
2717	$facedata->{version} == 2	3023	$facedata->{version} == 2
2718	or cf::cleanup "$path: version mismatch, cannot proceed.";	3024	or cf::cleanup "$path: version mismatch, cannot proceed.";
2719		3025
		3026	# patch in the exptable
		3027	$facedata->{resource}{"res/exp_table"} = {
		3028	type => FT_RSRC,
		3029	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3030	};
		3031	cf::cede_to_tick;
		3032
2720	{	3033	{
2721	my $faces = $facedata->{faceinfo};	3034	my $faces = $facedata->{faceinfo};
2722		3035
2723	while (my ($face, $info) = each %$faces) {	3036	while (my ($face, $info) = each %$faces) {
2724	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3037	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2725	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3038	cf::face::set_visibility $idx, $info->{visibility};
		3039	cf::face::set_magicmap $idx, $info->{magicmap};
2726	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3040	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2727	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3041	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2728	Coro::cede;	3042
		3043	cf::cede_to_tick;
2729	}	3044	}
2730		3045
2731	while (my ($face, $info) = each %$faces) {	3046	while (my ($face, $info) = each %$faces) {
2732	next unless $info->{smooth};	3047	next unless $info->{smooth};
2733	my $idx = cf::face::find $face	3048	my $idx = cf::face::find $face
2734	or next;	3049	or next;
2735	if (my $smooth = cf::face::find $info->{smooth}) {	3050	if (my $smooth = cf::face::find $info->{smooth}) {
		3051	cf::face::set_smooth $idx, $smooth;
2736	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3052	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2737	} else {	3053	} else {
2738	warn "smooth face '$info->{smooth}' not found for face '$face'";	3054	warn "smooth face '$info->{smooth}' not found for face '$face'";
2739	}	3055	}
2740	Coro::cede;	3056
		3057	cf::cede_to_tick;
2741	}	3058	}
2742	}	3059	}
2743		3060
2744	{	3061	{
2745	my $anims = $facedata->{animinfo};	3062	my $anims = $facedata->{animinfo};
2746		3063
2747	while (my ($anim, $info) = each %$anims) {	3064	while (my ($anim, $info) = each %$anims) {
2748	cf::anim::set $anim, $info->{frames}, $info->{facings};	3065	cf::anim::set $anim, $info->{frames}, $info->{facings};
2749	Coro::cede;	3066	cf::cede_to_tick;
2750	}	3067	}
2751		3068
2752	cf::anim::invalidate_all; # d'oh	3069	cf::anim::invalidate_all; # d'oh
2753	}	3070	}
2754		3071
		3072	{
		3073	# TODO: for gcfclient pleasure, we should give resources
		3074	# that gcfclient doesn't grok a >10000 face index.
		3075	my $res = $facedata->{resource};
		3076
		3077	my $soundconf = delete $res->{"res/sound.conf"};
		3078
		3079	while (my ($name, $info) = each %$res) {
		3080	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3081	my $data;
		3082
		3083	if ($info->{type} & 1) {
		3084	# prepend meta info
		3085
		3086	my $meta = $enc->encode ({
		3087	name => $name,
		3088	%{ $info->{meta} \|\| {} },
		3089	});
		3090
		3091	$data = pack "(w/a)", $meta, $info->{data};
		3092	} else {
		3093	$data = $info->{data};
		3094	}
		3095
		3096	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3097	cf::face::set_type $idx, $info->{type};
		3098
		3099	cf::cede_to_tick;
		3100	}
		3101
		3102	if ($soundconf) {
		3103	$soundconf = $enc->decode (delete $soundconf->{data});
		3104
		3105	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3106	my $sound = $soundconf->{compat}[$_]
		3107	or next;
		3108
		3109	my $face = cf::face::find "sound/$sound->[1]";
		3110	cf::sound::set $sound->[0] => $face;
		3111	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3112	}
		3113
		3114	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3115	my $face = cf::face::find "sound/$v";
		3116	cf::sound::set $k => $face;
		3117	}
		3118	}
		3119	}
		3120
2755	1	3121	1
2756	}	3122	}
2757		3123
		3124	register_exticmd fx_want => sub {
		3125	my ($ns, $want) = @_;
		3126
		3127	while (my ($k, $v) = each %$want) {
		3128	$ns->fx_want ($k, $v);
		3129	}
		3130	};
		3131
2758	sub reload_regions {	3132	sub reload_regions {
		3133	# HACK to clear player env face cache, we need some signal framework
		3134	# for this (global event?)
		3135	%ext::player_env::MUSIC_FACE_CACHE = ();
		3136
2759	load_resource_file "$MAPDIR/regions"	3137	load_resource_file "$MAPDIR/regions"
2760	or die "unable to load regions file\n";	3138	or die "unable to load regions file\n";
		3139
		3140	for (cf::region::list) {
		3141	$_->{match} = qr/$_->{match}/
		3142	if exists $_->{match};
		3143	}
2761	}	3144	}
2762		3145
2763	sub reload_facedata {	3146	sub reload_facedata {
2764	load_facedata "$DATADIR/facedata"	3147	load_facedata "$DATADIR/facedata"
2765	or die "unable to load facedata\n";	3148	or die "unable to load facedata\n";
…		…
2794		3177
2795	sub init {	3178	sub init {
2796	reload_resources;	3179	reload_resources;
2797	}	3180	}
2798		3181
2799	sub cfg_load {	3182	sub reload_config {
2800	open my $fh, "<:utf8", "$CONFDIR/config"	3183	open my $fh, "<:utf8", "$CONFDIR/config"
2801	or return;	3184	or return;
2802		3185
2803	local $/;	3186	local $/;
2804	*CFG = YAML::Syck::Load <$fh>;	3187	*CFG = YAML::Syck::Load <$fh>;
…		…
2820	sub main {	3203	sub main {
2821	# we must not ever block the main coroutine	3204	# we must not ever block the main coroutine
2822	local $Coro::idle = sub {	3205	local $Coro::idle = sub {
2823	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3206	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2824	(async {	3207	(async {
		3208	$Coro::current->{desc} = "IDLE BUG HANDLER";
2825	Event::one_event;	3209	Event::one_event;
2826	})->prio (Coro::PRIO_MAX);	3210	})->prio (Coro::PRIO_MAX);
2827	};	3211	};
2828		3212
2829	cfg_load;	3213	reload_config;
2830	db_init;	3214	db_init;
2831	load_extensions;	3215	load_extensions;
2832		3216
2833	$TICK_WATCHER->start;	3217	$TICK_WATCHER->start;
2834	Event::loop;	3218	Event::loop;
…		…
2901	# and maps saved/destroyed asynchronously.	3285	# and maps saved/destroyed asynchronously.
2902	warn "begin emergency player save\n";	3286	warn "begin emergency player save\n";
2903	for my $login (keys %cf::PLAYER) {	3287	for my $login (keys %cf::PLAYER) {
2904	my $pl = $cf::PLAYER{$login} or next;	3288	my $pl = $cf::PLAYER{$login} or next;
2905	$pl->valid or next;	3289	$pl->valid or next;
		3290	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2906	$pl->save;	3291	$pl->save;
2907	}	3292	}
2908	warn "end emergency player save\n";	3293	warn "end emergency player save\n";
2909		3294
2910	warn "begin emergency map save\n";	3295	warn "begin emergency map save\n";
…		…
3027	warn "reloading cf.pm";	3412	warn "reloading cf.pm";
3028	require cf;	3413	require cf;
3029	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3414	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3030		3415
3031	warn "loading config and database again";	3416	warn "loading config and database again";
3032	cf::cfg_load;	3417	cf::reload_config;
3033		3418
3034	warn "loading extensions";	3419	warn "loading extensions";
3035	cf::load_extensions;	3420	cf::load_extensions;
3036		3421
3037	warn "reattaching attachments to objects/players";	3422	warn "reattaching attachments to objects/players";
…		…
3073	register_command "reload" => sub {	3458	register_command "reload" => sub {
3074	my ($who, $arg) = @_;	3459	my ($who, $arg) = @_;
3075		3460
3076	if ($who->flag (FLAG_WIZ)) {	3461	if ($who->flag (FLAG_WIZ)) {
3077	$who->message ("reloading server.");	3462	$who->message ("reloading server.");
		3463	async {
		3464	$Coro::current->{desc} = "perl_reload";
3078	async { reload_perl };	3465	reload_perl;
		3466	};
3079	}	3467	}
3080	};	3468	};
3081		3469
3082	unshift @INC, $LIBDIR;	3470	unshift @INC, $LIBDIR;
3083		3471
…		…
3102	my $signal = new Coro::Signal;	3490	my $signal = new Coro::Signal;
3103	push @WAIT_FOR_TICK_BEGIN, $signal;	3491	push @WAIT_FOR_TICK_BEGIN, $signal;
3104	$signal->wait;	3492	$signal->wait;
3105	}	3493	}
3106		3494
3107	my $min = 1e6;#d#
3108	my $avg = 10;
3109	$TICK_WATCHER = Event->timer (	3495	$TICK_WATCHER = Event->timer (
3110	reentrant => 0,	3496	reentrant => 0,
3111	parked => 1,	3497	parked => 1,
3112	prio => 0,	3498	prio => 0,
3113	at => $NEXT_TICK \|\| $TICK,	3499	at => $NEXT_TICK \|\| $TICK,
…		…
3121		3507
3122	$NOW = $tick_start = Event::time;	3508	$NOW = $tick_start = Event::time;
3123		3509
3124	cf::server_tick; # one server iteration	3510	cf::server_tick; # one server iteration
3125		3511
3126	0 && sync_job {#d#
3127	for(1..10) {
3128	my $t = Event::time;
3129	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3130	or die;
3131
3132	$map->width (50);
3133	$map->height (50);
3134	$map->alloc;
3135	$map->_load_objects ("/tmp/x.map", 1);
3136	my $t = Event::time - $t;
3137
3138	#next unless $t < 0.0013;#d#
3139	if ($t < $min) {
3140	$min = $t;
3141	}
3142	$avg = $avg * 0.99 + $t * 0.01;
3143	}
3144	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3145	exit 0;
3146	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3147	};
3148
3149	$RUNTIME += $TICK;	3512	$RUNTIME += $TICK;
3150	$NEXT_TICK += $TICK;	3513	$NEXT_TICK += $TICK;
3151		3514
3152	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3515	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3153	$NEXT_RUNTIME_WRITE = $NOW + 10;	3516	$NEXT_RUNTIME_WRITE = $NOW + 10;
3154	Coro::async_pool {	3517	Coro::async_pool {
		3518	$Coro::current->{desc} = "runtime saver";
3155	write_runtime	3519	write_runtime
3156	or warn "ERROR: unable to write runtime file: $!";	3520	or warn "ERROR: unable to write runtime file: $!";
3157	};	3521	};
3158	}	3522	}
3159		3523
3160	# my $AFTER = Event::time;
3161	# warn $AFTER - $NOW;#d#
3162
3163	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3524	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3164	$sig->send;	3525	$sig->send;
3165	}	3526	}
3166	while (my $sig = shift @WAIT_FOR_TICK) {	3527	while (my $sig = shift @WAIT_FOR_TICK) {
3167	$sig->send;	3528	$sig->send;
…		…
3177		3538
3178	$LOAD = ($NOW - $tick_start) / $TICK;	3539	$LOAD = ($NOW - $tick_start) / $TICK;
3179	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3540	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3180		3541
3181	_post_tick;	3542	_post_tick;
3182
3183
3184	},	3543	},
3185	);	3544	);
3186		3545
3187	{	3546	{
		3547	BDB::min_parallel 8;
3188	BDB::max_poll_time $TICK * 0.1;	3548	BDB::max_poll_time $TICK * 0.1;
3189	$BDB_POLL_WATCHER = Event->io (	3549	$BDB_POLL_WATCHER = Event->io (
3190	reentrant => 0,	3550	reentrant => 0,
3191	fd => BDB::poll_fileno,	3551	fd => BDB::poll_fileno,
3192	poll => 'r',	3552	poll => 'r',
3193	prio => 0,	3553	prio => 0,
3194	data => WF_AUTOCANCEL,	3554	data => WF_AUTOCANCEL,
3195	cb => \&BDB::poll_cb,	3555	cb => \&BDB::poll_cb,
3196	);	3556	);
3197	BDB::min_parallel 8;
3198		3557
3199	BDB::set_sync_prepare {	3558	BDB::set_sync_prepare {
3200	my $status;	3559	my $status;
3201	my $current = $Coro::current;	3560	my $current = $Coro::current;
3202	(	3561	(
…		…
3211	)	3570	)
3212	};	3571	};
3213		3572
3214	unless ($DB_ENV) {	3573	unless ($DB_ENV) {
3215	$DB_ENV = BDB::db_env_create;	3574	$DB_ENV = BDB::db_env_create;
		3575	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC
		3576	\| BDB::LOG_AUTOREMOVE, 1);
		3577	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3578	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3216		3579
3217	cf::sync_job {	3580	cf::sync_job {
3218	eval {	3581	eval {
3219	BDB::db_env_open	3582	BDB::db_env_open
3220	$DB_ENV,	3583	$DB_ENV,
…		…
3222	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN	3585	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN
3223	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3586	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3224	0666;	3587	0666;
3225		3588
3226	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3589	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3227
3228	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
3229	$DB_ENV->set_lk_detect;
3230	};	3590	};
3231		3591
3232	cf::cleanup "db_env_open(db): $@" if $@;	3592	cf::cleanup "db_env_open(db): $@" if $@;
3233	};	3593	};
3234	}	3594	}
		3595
		3596	$BDB_DEADLOCK_WATCHER = Event->timer (
		3597	after => 3,
		3598	interval => 1,
		3599	hard => 1,
		3600	prio => 0,
		3601	data => WF_AUTOCANCEL,
		3602	cb => sub {
		3603	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3604	},
		3605	);
		3606	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3607	after => 11,
		3608	interval => 60,
		3609	hard => 1,
		3610	prio => 0,
		3611	data => WF_AUTOCANCEL,
		3612	cb => sub {
		3613	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3614	},
		3615	);
		3616	$BDB_TRICKLE_WATCHER = Event->timer (
		3617	after => 5,
		3618	interval => 10,
		3619	hard => 1,
		3620	prio => 0,
		3621	data => WF_AUTOCANCEL,
		3622	cb => sub {
		3623	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3624	},
		3625	);
3235	}	3626	}
3236		3627
3237	{	3628	{
3238	IO::AIO::min_parallel 8;	3629	IO::AIO::min_parallel 8;
3239		3630
…		…
3242	$AIO_POLL_WATCHER = Event->io (	3633	$AIO_POLL_WATCHER = Event->io (
3243	reentrant => 0,	3634	reentrant => 0,
3244	data => WF_AUTOCANCEL,	3635	data => WF_AUTOCANCEL,
3245	fd => IO::AIO::poll_fileno,	3636	fd => IO::AIO::poll_fileno,
3246	poll => 'r',	3637	poll => 'r',
3247	prio => 6,	3638	prio => 0,
3248	cb => \&IO::AIO::poll_cb,	3639	cb => \&IO::AIO::poll_cb,
3249	);	3640	);
3250	}	3641	}
3251		3642
3252	my $_log_backtrace;	3643	my $_log_backtrace;
…		…
3258		3649
3259	# limit the # of concurrent backtraces	3650	# limit the # of concurrent backtraces
3260	if ($_log_backtrace < 2) {	3651	if ($_log_backtrace < 2) {
3261	++$_log_backtrace;	3652	++$_log_backtrace;
3262	async {	3653	async {
		3654	$Coro::current->{desc} = "abt $msg";
		3655
3263	my @bt = fork_call {	3656	my @bt = fork_call {
3264	@addr = map { sprintf "%x", $_ } @addr;	3657	@addr = map { sprintf "%x", $_ } @addr;
3265	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3658	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3266	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"	3659	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"
3267	or die "addr2line: $!";	3660	or die "addr2line: $!";

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.300 by root, Tue Jul 10 06:44:29 2007 UTC vs. Revision 1.385 by root, Fri Oct 12 19:13:26 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.300 by root, Tue Jul 10 06:44:29 2007 UTC vs.
Revision 1.385 by root, Fri Oct 12 19:13:26 2007 UTC