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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.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
…		…
412	=cut	494	=cut
413		495
414	sub fork_call(&@) {	496	sub fork_call(&@) {
415	my ($cb, @args) = @_;	497	my ($cb, @args) = @_;
416		498
417	# 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,
418	# or die "socketpair: $!";	500	# otherwise perl prematurely frees the stuff :/
419	pipe my $fh1, my $fh2	501	# TODO: investigate and fix (likely this will be rather laborious)
420	or die "pipe: $!";
421		502
422	if (my $pid = fork) {	503	my @res = Coro::Util::fork_eval {
423	close $fh2;
424
425	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426	warn "pst<$res>" unless $res =~ /^pst/;
427	$res = Coro::Storable::thaw $res;
428
429	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431	Carp::confess $$res unless "ARRAY" eq ref $res;
432
433	return wantarray ? @$res : $res->[-1];
434	} else {
435	reset_signals;	504	reset_signals;
436	local $SIG{__WARN__};	505	&$cb
437	local $SIG{__DIE__};	506	}, @args;
438	local $Coro::idle;
439	$Coro::current->prio (Coro::PRIO_MAX);
440	eval {
441	close $fh1;
442		507
443	my @res = eval { $cb->(@args) };	508	wantarray ? @res : $res[-1]
444
445	open my $fh, ">", \my $buf
446	or die "fork_call: cannot open fh-to-buf in child : $!";
447	Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448	close $fh;
449
450	warn "writing ", length $buf;
451	my $x;
452	(length $buf) == ($x = syswrite $fh2, $buf)
453	or warn "error writing ".(length $buf)." != $x\n";
454	close $fh2;
455	};
456
457	warn $@ if $@;
458	_exit 0;
459	}
460	}	509	}
461		510
462	=item $value = cf::db_get $family => $key	511	=item $value = cf::db_get $family => $key
463		512
464	Returns a single value from the environment database.	513	Returns a single value from the environment database.
…		…
466	=item cf::db_put $family => $key => $value	515	=item cf::db_put $family => $key => $value
467		516
468	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
469	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).
470		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
471	=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	}
472		543
473	our $DB;	544	our $DB;
474		545
475	sub db_init {	546	sub db_init {
476	unless ($DB) {
477	$DB = BDB::db_create $DB_ENV;
478
479	cf::sync_job {	547	cf::sync_job {
480	eval {	548	$DB \|\|= db_table "db";
481	$DB->set_flags (BDB::CHKSUM);
482
483	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
484	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
485	cf::cleanup "db_open(db): $!" if $!;
486	};
487	cf::cleanup "db_open(db): $@" if $@;
488	};
489	}	549	};
490	}	550	}
491		551
492	sub db_get($$) {	552	sub db_get($$) {
493	my $key = "$_[0]/$_[1]";	553	my $key = "$_[0]/$_[1]";
494		554
…		…
544	if (1) {	604	if (1) {
545	$md5 =	605	$md5 =
546	join "\x00",	606	join "\x00",
547	$processversion,	607	$processversion,
548	map {	608	map {
549	Coro::cede;	609	cf::cede_to_tick;
550	($src->[$_], Digest::MD5::md5_hex $data[$_])	610	($src->[$_], Digest::MD5::md5_hex $data[$_])
551	} 0.. $#$src;	611	} 0.. $#$src;
552		612
553		613
554	my $dbmd5 = db_get cache => "$id/md5";	614	my $dbmd5 = db_get cache => "$id/md5";
…		…
860	";	920	";
861	die if $@;	921	die if $@;
862	}	922	}
863		923
864	our $override;	924	our $override;
865	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?
866		926
867	sub override {	927	sub override {
868	$override = 1;	928	$override = 1;
869	@invoke_results = ();	929	@INVOKE_RESULTS = (@_);
870	}	930	}
871		931
872	sub do_invoke {	932	sub do_invoke {
873	my $event = shift;	933	my $event = shift;
874	my $callbacks = shift;	934	my $callbacks = shift;
875		935
876	@invoke_results = ();	936	@INVOKE_RESULTS = ();
877		937
878	local $override;	938	local $override;
879		939
880	for (@$callbacks) {	940	for (@$callbacks) {
881	eval { &{$_->[1]} };	941	eval { &{$_->[1]} };
…		…
898		958
899	Generate an object-specific event with the given arguments.	959	Generate an object-specific event with the given arguments.
900		960
901	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
902	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
903	results (if you must, access C<@cf::invoke_results> directly).	963	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904		964
905	=back	965	=back
906		966
907	=cut	967	=cut
908		968
909	#############################################################################	969	#############################################################################
910	# 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	}
911		987
912	sub reattach {	988	sub reattach {
913	# basically do the same as instantiate, without calling instantiate	989	# basically do the same as instantiate, without calling instantiate
914	my ($obj) = @_;	990	my ($obj) = @_;
915		991
…		…
962	sub object_freezer_save {	1038	sub object_freezer_save {
963	my ($filename, $rdata, $objs) = @_;	1039	my ($filename, $rdata, $objs) = @_;
964		1040
965	sync_job {	1041	sync_job {
966	if (length $$rdata) {	1042	if (length $$rdata) {
		1043	utf8::decode (my $decname = $filename);
967	warn sprintf "saving %s (%d,%d)\n",	1044	warn sprintf "saving %s (%d,%d)\n",
968	$filename, length $$rdata, scalar @$objs;	1045	$decname, length $$rdata, scalar @$objs;
969		1046
970	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1047	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
971	chmod SAVE_MODE, $fh;	1048	chmod SAVE_MODE, $fh;
972	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1049	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
973	aio_fsync $fh if $cf::USE_FSYNC;	1050	aio_fsync $fh if $cf::USE_FSYNC;
974	close $fh;	1051	close $fh;
975		1052
976	if (@$objs) {	1053	if (@$objs) {
977	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) {
978	chmod SAVE_MODE, $fh;	1055	chmod SAVE_MODE, $fh;
979	my $data = Storable::nfreeze { version => 1, objs => $objs };	1056	my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
980	aio_write $fh, 0, (length $data), $data, 0;	1057	aio_write $fh, 0, (length $data), $data, 0;
981	aio_fsync $fh if $cf::USE_FSYNC;	1058	aio_fsync $fh if $cf::USE_FSYNC;
982	close $fh;	1059	close $fh;
983	aio_rename "$filename.pst~", "$filename.pst";	1060	aio_rename "$filename.pst~", "$filename.pst";
984	}	1061	}
…		…
992	}	1069	}
993	} else {	1070	} else {
994	aio_unlink $filename;	1071	aio_unlink $filename;
995	aio_unlink "$filename.pst";	1072	aio_unlink "$filename.pst";
996	}	1073	}
997	}	1074	};
998	}	1075	}
999		1076
1000	sub object_freezer_as_string {	1077	sub object_freezer_as_string {
1001	my ($rdata, $objs) = @_;	1078	my ($rdata, $objs) = @_;
1002		1079
…		…
1014	or return;	1091	or return;
1015		1092
1016	unless (aio_stat "$filename.pst") {	1093	unless (aio_stat "$filename.pst") {
1017	(aio_load "$filename.pst", $av) >= 0	1094	(aio_load "$filename.pst", $av) >= 0
1018	or return;	1095	or return;
1019	$av = eval { (Storable::thaw $av)->{objs} };
1020	}
1021		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);
1022	warn sprintf "loading %s (%d)\n",	1103	warn sprintf "loading %s (%d,%d)\n",
1023	$filename, length $data, scalar @{$av \|\| []};	1104	$decname, length $data, scalar @{$av \|\| []};
		1105
1024	return ($data, $av);	1106	($data, $av)
1025	}	1107	}
1026		1108
1027	=head2 COMMAND CALLBACKS	1109	=head2 COMMAND CALLBACKS
1028		1110
1029	=over 4	1111	=over 4
…		…
1102	my ($pl, $buf) = @_;	1184	my ($pl, $buf) = @_;
1103		1185
1104	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1186	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105		1187
1106	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
1107	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1196	if (my $cb = $EXTCMD{$type}) {
1108	if (my %reply = $cb->($pl, $msg)) {	1197	@reply = $cb->($pl, @payload);
1109	$pl->ext_reply ($msg->{msgid}, %reply);
1110	}
1111	}	1198	}
		1199
		1200	$pl->ext_reply ($reply, @reply)
		1201	if $reply;
		1202
1112	} else {	1203	} else {
1113	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1204	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114	}	1205	}
1115		1206
1116	cf::override;	1207	cf::override;
…		…
1206		1297
1207	=head3 cf::player	1298	=head3 cf::player
1208		1299
1209	=over 4	1300	=over 4
1210		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
1211	=item cf::player::find $login	1316	=item cf::player::find $login
1212		1317
1213	Returns the given player object, loading it if necessary (might block).	1318	Returns the given player object, loading it if necessary (might block).
1214		1319
1215	=cut	1320	=cut
…		…
1250	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1355	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1251	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1356	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1252	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1357	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1253	aio_unlink +(playerdir $login) . "/$login.pl";	1358	aio_unlink +(playerdir $login) . "/$login.pl";
1254		1359
1255	my $pl = load_pl path $login	1360	my $f = new_from_file cf::object::thawer path $login
1256	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;
1257	$cf::PLAYER{$login} = $pl	1367	$cf::PLAYER{$login} = $pl
1258	}	1368	}
1259	}	1369	}
1260	}	1370	}
1261		1371
…		…
1271		1381
1272	aio_mkdir playerdir $pl, 0770;	1382	aio_mkdir playerdir $pl, 0770;
1273	$pl->{last_save} = $cf::RUNTIME;	1383	$pl->{last_save} = $cf::RUNTIME;
1274		1384
1275	$pl->save_pl ($path);	1385	$pl->save_pl ($path);
1276	Coro::cede;	1386	cf::cede_to_tick;
1277	}	1387	}
1278		1388
1279	sub new($) {	1389	sub new($) {
1280	my ($login) = @_;	1390	my ($login) = @_;
1281		1391
…		…
1285	$self->{deny_save} = 1;	1395	$self->{deny_save} = 1;
1286		1396
1287	$cf::PLAYER{$login} = $self;	1397	$cf::PLAYER{$login} = $self;
1288		1398
1289	$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 (@_);
1290	}	1410	}
1291		1411
1292	=item $pl->quit_character	1412	=item $pl->quit_character
1293		1413
1294	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
…		…
1349	or return [];	1469	or return [];
1350		1470
1351	my @logins;	1471	my @logins;
1352		1472
1353	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") {
1354	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1478	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1355	aio_read $fh, 0, 512, my $buf, 0 or next;	1479	aio_read $fh, 0, 512, my $buf, 0 or next;
1356	$buf !~ /^password -------------$/m or next; # official not-valid tag	1480	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1481	}
1357		1482
1358	utf8::decode $login;	1483	utf8::decode $login;
1359	push @logins, $login;	1484	push @logins, $login;
1360	}	1485	}
1361		1486
…		…
1399	sub expand_cfpod {	1524	sub expand_cfpod {
1400	((my $self), (local $_)) = @_;	1525	((my $self), (local $_)) = @_;
1401		1526
1402	# escape & and <	1527	# escape & and <
1403	s/&/&/g;	1528	s/&/&/g;
1404	s/(?<![BIUGH])</</g;	1529	s/(?<![BIUGHT])</</g;
1405		1530
1406	# 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
1407		1532
1408	1 while	1533	1 while
1409	# replace B<>, I<>, U<> etc.	1534	# replace B<>, I<>, U<> etc.
1410	s/B<([^\>]*)>/<b>$1<\/b>/	1535	s/B<([^\>]*)>/<b>$1<\/b>/
1411	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1536	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1412	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1537	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1538	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1413	# replace G<male\|female> tags	1539	# replace G<male\|female> tags
1414	\|\| s{G<([^>\|])\\|([^>])>}{	1540	\|\| s{G<([^>\|])\\|([^>])>}{
1415	$self->gender ? $2 : $1	1541	$self->gender ? $2 : $1
1416	}ge	1542	}ge
1417	# replace H<hint text>	1543	# replace H<hint text>
…		…
1438	sub hintmode {	1564	sub hintmode {
1439	$_[0]{hintmode} = $_[1] if @_ > 1;	1565	$_[0]{hintmode} = $_[1] if @_ > 1;
1440	$_[0]{hintmode}	1566	$_[0]{hintmode}
1441	}	1567	}
1442		1568
1443	=item $player->ext_reply ($msgid, %msg)	1569	=item $player->ext_reply ($msgid, @msg)
1444		1570
1445	Sends an ext reply to the player.	1571	Sends an ext reply to the player.
1446		1572
1447	=cut	1573	=cut
1448		1574
1449	sub ext_reply($$%) {	1575	sub ext_reply($$@) {
1450	my ($self, $id, %msg) = @_;	1576	my ($self, $id, @msg) = @_;
1451		1577
1452	$msg{msgid} = $id;	1578	$self->ns->ext_reply ($id, @msg)
1453	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1454	}	1579	}
1455		1580
1456	=item $player->ext_event ($type, %msg)	1581	=item $player->ext_msg ($type, @msg)
1457		1582
1458	Sends an ext event to the client.	1583	Sends an ext event to the client.
1459		1584
1460	=cut	1585	=cut
1461		1586
1462	sub ext_event($$%) {	1587	sub ext_msg($$@) {
1463	my ($self, $type, %msg) = @_;	1588	my ($self, $type, @msg) = @_;
1464		1589
1465	$self->ns->ext_event ($type, %msg);	1590	$self->ns->ext_msg ($type, @msg);
1466	}	1591	}
1467		1592
1468	=head3 cf::region	1593	=head3 cf::region
1469		1594
1470	=over 4	1595	=over 4
…		…
1483	my ($path) = @_;	1608	my ($path) = @_;
1484		1609
1485	my ($match, $specificity);	1610	my ($match, $specificity);
1486		1611
1487	for my $region (list) {	1612	for my $region (list) {
1488	if ($region->match && $path =~ $region->match) {	1613	if ($region->{match} && $path =~ $region->{match}) {
1489	($match, $specificity) = ($region, $region->specificity)	1614	($match, $specificity) = ($region, $region->specificity)
1490	if $region->specificity > $specificity;	1615	if $region->specificity > $specificity;
1491	}	1616	}
1492	}	1617	}
1493		1618
…		…
1613	$self->init; # pass $1 etc.	1738	$self->init; # pass $1 etc.
1614	return $self;	1739	return $self;
1615	}	1740	}
1616	}	1741	}
1617		1742
1618	Carp::carp "unable to resolve path '$path' (base '$base').";	1743	Carp::cluck "unable to resolve path '$path' (base '$base').";
1619	()	1744	()
1620	}	1745	}
1621		1746
1622	sub init {	1747	sub init {
1623	my ($self) = @_;	1748	my ($self) = @_;
…		…
1686		1811
1687	sub load_header_from($) {	1812	sub load_header_from($) {
1688	my ($self, $path) = @_;	1813	my ($self, $path) = @_;
1689		1814
1690	utf8::encode $path;	1815	utf8::encode $path;
1691	#aio_open $path, O_RDONLY, 0	1816	my $f = new_from_file cf::object::thawer $path
1692	# or return;
1693
1694	$self->_load_header ($path)
1695	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;
1696		1824
1697	$self->{load_path} = $path;	1825	$self->{load_path} = $path;
1698		1826
1699	1	1827	1
1700	}	1828	}
…		…
1754	sub find {	1882	sub find {
1755	my ($path, $origin) = @_;	1883	my ($path, $origin) = @_;
1756		1884
1757	$path = normalise $path, $origin && $origin->path;	1885	$path = normalise $path, $origin && $origin->path;
1758		1886
		1887	cf::lock_wait "map_data:$path";#d#remove
1759	cf::lock_wait "map_find:$path";	1888	cf::lock_wait "map_find:$path";
1760		1889
1761	$cf::MAP{$path} \|\| do {	1890	$cf::MAP{$path} \|\| do {
1762	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
1763	my $map = new_from_path cf::map $path	1894	my $map = new_from_path cf::map $path
1764	or return;	1895	or return;
1765		1896
1766	$map->{last_save} = $cf::RUNTIME;	1897	$map->{last_save} = $cf::RUNTIME;
1767		1898
…		…
1769	or return;	1900	or return;
1770		1901
1771	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1902	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1772	# doing this can freeze the server in a sync job, obviously	1903	# doing this can freeze the server in a sync job, obviously
1773	#$cf::WAIT_FOR_TICK->wait;	1904	#$cf::WAIT_FOR_TICK->wait;
		1905	undef $guard1;
		1906	undef $guard2;
1774	$map->reset;	1907	$map->reset;
1775	undef $guard;
1776	return find $path;	1908	return find $path;
1777	}	1909	}
1778		1910
1779	$cf::MAP{$path} = $map	1911	$cf::MAP{$path} = $map
1780	}	1912	}
…		…
1789	local $self->{deny_reset} = 1; # loading can take a long time	1921	local $self->{deny_reset} = 1; # loading can take a long time
1790		1922
1791	my $path = $self->{path};	1923	my $path = $self->{path};
1792		1924
1793	{	1925	{
1794	my $guard = cf::lock_acquire "map_load:$path";	1926	my $guard = cf::lock_acquire "map_data:$path";
1795		1927
		1928	return unless $self->valid;
1796	return if $self->in_memory != cf::MAP_SWAPPED;	1929	return unless $self->in_memory == cf::MAP_SWAPPED;
1797		1930
1798	$self->in_memory (cf::MAP_LOADING);	1931	$self->in_memory (cf::MAP_LOADING);
1799		1932
1800	$self->alloc;	1933	$self->alloc;
1801		1934
1802	$self->pre_load;	1935	$self->pre_load;
1803	Coro::cede;	1936	cf::cede_to_tick;
1804		1937
		1938	my $f = new_from_file cf::object::thawer $self->{load_path};
		1939	$f->skip_block;
1805	$self->_load_objects ($self->{load_path}, 1)	1940	$self->_load_objects ($f)
1806	or return;	1941	or return;
1807		1942
1808	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1943	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1809	if delete $self->{load_original};	1944	if delete $self->{load_original};
1810		1945
1811	if (my $uniq = $self->uniq_path) {	1946	if (my $uniq = $self->uniq_path) {
1812	utf8::encode $uniq;	1947	utf8::encode $uniq;
1813	if (aio_open $uniq, O_RDONLY, 0) {	1948	unless (aio_stat $uniq) {
		1949	if (my $f = new_from_file cf::object::thawer $uniq) {
1814	$self->clear_unique_items;	1950	$self->clear_unique_items;
1815	$self->_load_objects ($uniq, 0);	1951	$self->_load_objects ($f);
		1952	$f->resolve_delayed_derefs;
		1953	}
1816	}	1954	}
1817	}	1955	}
1818		1956
1819	Coro::cede;	1957	$f->resolve_delayed_derefs;
		1958
		1959	cf::cede_to_tick;
1820	# now do the right thing for maps	1960	# now do the right thing for maps
1821	$self->link_multipart_objects;	1961	$self->link_multipart_objects;
1822	$self->difficulty ($self->estimate_difficulty)	1962	$self->difficulty ($self->estimate_difficulty)
1823	unless $self->difficulty;	1963	unless $self->difficulty;
1824	Coro::cede;	1964	cf::cede_to_tick;
1825		1965
1826	unless ($self->{deny_activate}) {	1966	unless ($self->{deny_activate}) {
1827	$self->decay_objects;	1967	$self->decay_objects;
1828	$self->fix_auto_apply;	1968	$self->fix_auto_apply;
1829	$self->update_buttons;	1969	$self->update_buttons;
1830	Coro::cede;	1970	cf::cede_to_tick;
1831	$self->set_darkness_map;	1971	$self->set_darkness_map;
1832	Coro::cede;	1972	cf::cede_to_tick;
1833	$self->activate;	1973	$self->activate;
1834	}	1974	}
		1975
		1976	$self->{last_save} = $cf::RUNTIME;
		1977	$self->last_access ($cf::RUNTIME);
1835		1978
1836	$self->in_memory (cf::MAP_IN_MEMORY);	1979	$self->in_memory (cf::MAP_IN_MEMORY);
1837	}	1980	}
1838		1981
1839	$self->post_load;	1982	$self->post_load;
…		…
1850		1993
1851	$self	1994	$self
1852	}	1995	}
1853		1996
1854	# 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
1855	sub load_diag {	1998	sub load_neighbours {
1856	my ($map) = @_;	1999	my ($map) = @_;
1857		2000
1858	my @diag; # diagonal neighbours	2001	my @neigh; # diagonal neighbours
1859		2002
1860	for (0 .. 3) {	2003	for (0 .. 3) {
1861	my $neigh = $map->tile_path ($_)	2004	my $neigh = $map->tile_path ($_)
1862	or next;	2005	or next;
1863	$neigh = find $neigh, $map	2006	$neigh = find $neigh, $map
1864	or next;	2007	or next;
1865	$neigh->load;	2008	$neigh->load;
1866		2009
		2010	push @neigh,
1867	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2011	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1868	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2012	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1869	}	2013	}
1870		2014
1871	for (@diag) {	2015	for (grep defined $_->[0], @neigh) {
		2016	my ($path, $origin) = @$_;
1872	my $neigh = find @$_	2017	my $neigh = find $path, $origin
1873	or next;	2018	or next;
1874	$neigh->load;	2019	$neigh->load;
1875	}	2020	}
1876	}	2021	}
1877		2022
…		…
1882	}	2027	}
1883		2028
1884	sub do_load_sync {	2029	sub do_load_sync {
1885	my ($map) = @_;	2030	my ($map) = @_;
1886		2031
		2032	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2033	if $Coro::current == $Coro::main;
		2034
1887	cf::sync_job { $map->load };	2035	cf::sync_job { $map->load };
1888	}	2036	}
1889		2037
1890	our %MAP_PREFETCH;	2038	our %MAP_PREFETCH;
1891	our $MAP_PREFETCHER = undef;	2039	our $MAP_PREFETCHER = undef;
1892		2040
1893	sub find_async {	2041	sub find_async {
1894	my ($path, $origin) = @_;	2042	my ($path, $origin, $load) = @_;
1895		2043
1896	$path = normalise $path, $origin && $origin->{path};	2044	$path = normalise $path, $origin && $origin->{path};
1897		2045
1898	if (my $map = $cf::MAP{$path}) {	2046	if (my $map = $cf::MAP{$path}) {
1899	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2047	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1900	}	2048	}
1901		2049
1902	undef $MAP_PREFETCH{$path};	2050	$MAP_PREFETCH{$path} \|= $load;
		2051
1903	$MAP_PREFETCHER \|\|= cf::async {	2052	$MAP_PREFETCHER \|\|= cf::async {
		2053	$Coro::current->{desc} = "map prefetcher";
		2054
1904	while (%MAP_PREFETCH) {	2055	while (%MAP_PREFETCH) {
1905	for my $path (keys %MAP_PREFETCH) {	2056	while (my ($k, $v) = each %MAP_PREFETCH) {
1906	my $map = find $path	2057	if (my $map = find $k) {
1907	or next;
1908	$map->load;	2058	$map->load if $v;
		2059	}
1909		2060
1910	delete $MAP_PREFETCH{$path};	2061	delete $MAP_PREFETCH{$k};
1911	}	2062	}
1912	}	2063	}
1913	undef $MAP_PREFETCHER;	2064	undef $MAP_PREFETCHER;
1914	};	2065	};
1915	$MAP_PREFETCHER->prio (6);	2066	$MAP_PREFETCHER->prio (6);
…		…
1918	}	2069	}
1919		2070
1920	sub save {	2071	sub save {
1921	my ($self) = @_;	2072	my ($self) = @_;
1922		2073
1923	my $lock = cf::lock_acquire "map_data:" . $self->path;	2074	my $lock = cf::lock_acquire "map_data:$self->{path}";
1924		2075
1925	$self->{last_save} = $cf::RUNTIME;	2076	$self->{last_save} = $cf::RUNTIME;
1926		2077
1927	return unless $self->dirty;	2078	return unless $self->dirty;
1928		2079
…		…
1934	return if $self->{deny_save};	2085	return if $self->{deny_save};
1935		2086
1936	local $self->{last_access} = $self->last_access;#d#	2087	local $self->{last_access} = $self->last_access;#d#
1937		2088
1938	cf::async {	2089	cf::async {
		2090	$Coro::current->{desc} = "map player save";
1939	$_->contr->save for $self->players;	2091	$_->contr->save for $self->players;
1940	};	2092	};
1941		2093
1942	if ($uniq) {	2094	if ($uniq) {
1943	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	2095	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
…		…
1951	my ($self) = @_;	2103	my ($self) = @_;
1952		2104
1953	# save first because save cedes	2105	# save first because save cedes
1954	$self->save;	2106	$self->save;
1955		2107
1956	my $lock = cf::lock_acquire "map_data:" . $self->path;	2108	my $lock = cf::lock_acquire "map_data:$self->{path}";
1957		2109
1958	return if $self->players;	2110	return if $self->players;
1959	return if $self->in_memory != cf::MAP_IN_MEMORY;	2111	return if $self->in_memory != cf::MAP_IN_MEMORY;
1960	return if $self->{deny_save};	2112	return if $self->{deny_save};
1961		2113
		2114	$self->in_memory (cf::MAP_SWAPPED);
		2115
		2116	$self->deactivate;
		2117	$_->clear_links_to ($self) for values %cf::MAP;
1962	$self->clear;	2118	$self->clear;
1963	$self->in_memory (cf::MAP_SWAPPED);
1964	}	2119	}
1965		2120
1966	sub reset_at {	2121	sub reset_at {
1967	my ($self) = @_;	2122	my ($self) = @_;
1968		2123
…		…
2000	if $uniq;	2155	if $uniq;
2001	}	2156	}
2002		2157
2003	delete $cf::MAP{$self->path};	2158	delete $cf::MAP{$self->path};
2004		2159
		2160	$self->deactivate;
		2161	$_->clear_links_to ($self) for values %cf::MAP;
2005	$self->clear;	2162	$self->clear;
2006
2007	$_->clear_links_to ($self) for values %cf::MAP;
2008		2163
2009	$self->unlink_save;	2164	$self->unlink_save;
2010	$self->destroy;	2165	$self->destroy;
2011	}	2166	}
2012		2167
2013	my $nuke_counter = "aaaa";	2168	my $nuke_counter = "aaaa";
2014		2169
2015	sub nuke {	2170	sub nuke {
2016	my ($self) = @_;	2171	my ($self) = @_;
2017		2172
		2173	{
		2174	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2175
2018	delete $cf::MAP{$self->path};	2176	delete $cf::MAP{$self->path};
2019		2177
2020	$self->unlink_save;	2178	$self->unlink_save;
2021		2179
2022	bless $self, "cf::map";	2180	bless $self, "cf::map";
2023	delete $self->{deny_reset};	2181	delete $self->{deny_reset};
2024	$self->{deny_save} = 1;	2182	$self->{deny_save} = 1;
2025	$self->reset_timeout (1);	2183	$self->reset_timeout (1);
2026	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2184	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2027		2185
2028	$cf::MAP{$self->path} = $self;	2186	$cf::MAP{$self->path} = $self;
		2187	}
2029		2188
2030	$self->reset; # polite request, might not happen	2189	$self->reset; # polite request, might not happen
2031	}	2190	}
2032		2191
2033	=item $maps = cf::map::tmp_maps	2192	=item $maps = cf::map::tmp_maps
…		…
2109		2268
2110	sub inv_recursive {	2269	sub inv_recursive {
2111	inv_recursive_ inv $_[0]	2270	inv_recursive_ inv $_[0]
2112	}	2271	}
2113		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
2114	package cf;	2301	package cf;
2115		2302
2116	=back	2303	=back
2117		2304
2118	=head3 cf::object::player	2305	=head3 cf::object::player
…		…
2140		2327
2141	} else {	2328	} else {
2142	my $pl = $self->contr;	2329	my $pl = $self->contr;
2143		2330
2144	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2331	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145	my $diag = $pl->{npc_dialog};	2332	my $dialog = $pl->{npc_dialog};
2146	$diag->{pl}->ext_reply (	2333	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2147	$diag->{id},
2148	msgtype => "reply",
2149	msg => $diag->{pl}->expand_cfpod ($msg),
2150	add_topics => []
2151	);
2152		2334
2153	} else {	2335	} else {
2154	$msg = $npc->name . " says: $msg" if $npc;	2336	$msg = $npc->name . " says: $msg" if $npc;
2155	$self->message ($msg, $flags);	2337	$self->message ($msg, $flags);
2156	}	2338	}
2157	}	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 (@_);
2158	}	2350	}
2159		2351
2160	=item $player_object->may ("access")	2352	=item $player_object->may ("access")
2161		2353
2162	Returns wether the given player is authorized to access resource "access"	2354	Returns wether the given player is authorized to access resource "access"
…		…
2241	# use -1 or undef as default coordinates, not 0, 0	2433	# use -1 or undef as default coordinates, not 0, 0
2242	($x, $y) = ($map->enter_x, $map->enter_y)	2434	($x, $y) = ($map->enter_x, $map->enter_y)
2243	if $x <=0 && $y <= 0;	2435	if $x <=0 && $y <= 0;
2244		2436
2245	$map->load;	2437	$map->load;
2246	$map->load_diag;	2438	$map->load_neighbours;
2247		2439
2248	return unless $self->contr->active;	2440	return unless $self->contr->active;
2249	$self->activate_recursive;	2441	$self->activate_recursive;
2250		2442
2251	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2443	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252	$self->enter_map ($map, $x, $y);	2444	$self->enter_map ($map, $x, $y);
2253	}	2445	}
2254		2446
2255	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2447	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256		2448
2257	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
2258	her, loading and preparing them map, calling the provided $check callback	2450	her, loading and preparing them map, calling the provided $check callback
2259	that has to return the map if sucecssful, and then unfreezes the player on	2451	that has to return the map if sucecssful, and then unfreezes the player on
2260	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.
2261		2454
2262	=cut	2455	=cut
2263		2456
2264	our $GOTOGEN;	2457	our $GOTOGEN;
2265		2458
2266	sub cf::object::player::goto {	2459	sub cf::object::player::goto {
2267	my ($self, $path, $x, $y, $check) = @_;	2460	my ($self, $path, $x, $y, $check, $done) = @_;
2268		2461
2269	# 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
2270	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2463	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271		2464
2272	$self->enter_link;	2465	$self->enter_link;
2273		2466
2274	(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
2275	my $map = eval {	2489	my $map = eval {
2276	my $map = cf::map::find $path;	2490	my $map = defined $path ? cf::map::find $path : undef;
2277		2491
2278	if ($map) {	2492	if ($map) {
2279	$map = $map->customise_for ($self);	2493	$map = $map->customise_for ($self);
2280	$map = $check->($map) if $check && $map;	2494	$map = $check->($map) if $check && $map;
2281	} else {	2495	} else {
2282	$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);
2283	}	2497	}
2284		2498
2285	$map	2499	$map
2286	};	2500	};
2287		2501
…		…
2292		2506
2293	if ($gen == $self->{_goto_generation}) {	2507	if ($gen == $self->{_goto_generation}) {
2294	delete $self->{_goto_generation};	2508	delete $self->{_goto_generation};
2295	$self->leave_link ($map, $x, $y);	2509	$self->leave_link ($map, $x, $y);
2296	}	2510	}
		2511
		2512	$done->() if $done;
2297	})->prio (1);	2513	})->prio (1);
2298	}	2514	}
2299		2515
2300	=item $player_object->enter_exit ($exit_object)	2516	=item $player_object->enter_exit ($exit_object)
2301		2517
…		…
2375	# if exit is damned, update players death & WoR home-position	2591	# if exit is damned, update players death & WoR home-position
2376	$self->contr->savebed ($slaying, $hp, $sp)	2592	$self->contr->savebed ($slaying, $hp, $sp)
2377	if $exit->flag (FLAG_DAMNED);	2593	if $exit->flag (FLAG_DAMNED);
2378		2594
2379	(async {	2595	(async {
		2596	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2597
2380	$self->deactivate_recursive; # just to be sure	2598	$self->deactivate_recursive; # just to be sure
2381	unless (eval {	2599	unless (eval {
2382	$self->goto ($slaying, $hp, $sp);	2600	$self->goto ($slaying, $hp, $sp);
2383		2601
2384	1;	2602	1;
…		…
2410		2628
2411	utf8::encode $text;	2629	utf8::encode $text;
2412	$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);
2413	}	2631	}
2414		2632
2415	=item $client->send_msg ($color, $type, $msg, [extra...])	2633	=item $client->send_msg ($channel, $msg, $color, [extra...])
2416		2634
2417	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
2418	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
2419	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
2420	the message unless the client supports the msg packet.	2638	the message unless the client supports the msg packet.
2421		2639
2422	=cut	2640	=cut
2423		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
2424	sub cf::client::send_msg {	2663	sub cf::client::send_msg {
2425	my ($self, $color, $type, $msg, @extra) = @_;	2664	my ($self, $channel, $msg, $color, @extra) = @_;
2426		2665
2427	$msg = $self->pl->expand_cfpod ($msg);	2666	$msg = $self->pl->expand_cfpod ($msg);
2428		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
2429	return unless @extra \|\| length $msg;	2690	return unless @extra \|\| length $msg;
2430		2691
2431	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
2432	$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]));
2433	} else {	2699	} else {
2434	# replace some tags by gcfclient-compatible ones
2435	for ($msg) {
2436	1 while
2437	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2438	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2439	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2440	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2441	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2442	}
2443
2444	if ($color >= 0) {	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
2445	if (0 && $msg =~ /\[/) {	2715	if (0 && $msg =~ /\[/) {
		2716	# COMMAND/INFO
2446	$self->send_packet ("drawextinfo $color 4 0 $msg")	2717	$self->send_packet ("drawextinfo $color 10 8 $msg")
2447	} else {	2718	} else {
2448	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2719	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2449	$self->send_packet ("drawinfo $color $msg")	2720	$self->send_packet ("drawinfo $color $msg")
2450	}	2721	}
2451	}	2722	}
2452	}	2723	}
2453	}	2724	}
2454		2725
2455	=item $client->ext_event ($type, %msg)	2726	=item $client->ext_msg ($type, @msg)
2456		2727
2457	Sends an ext event to the client.	2728	Sends an ext event to the client.
2458		2729
2459	=cut	2730	=cut
2460		2731
2461	sub cf::client::ext_event($$%) {	2732	sub cf::client::ext_msg($$@) {
2462	my ($self, $type, %msg) = @_;	2733	my ($self, $type, @msg) = @_;
2463		2734
		2735	if ($self->extcmd == 2) {
		2736	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2737	} elsif ($self->extcmd == 1) { # TODO: remove
2464	$msg{msgtype} = "event_$type";	2738	push @msg, msgtype => "event_$type";
2465	$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	}
2466	}	2759	}
2467		2760
2468	=item $success = $client->query ($flags, "text", \&cb)	2761	=item $success = $client->query ($flags, "text", \&cb)
2469		2762
2470	Queues a query to the client, calling the given callback with	2763	Queues a query to the client, calling the given callback with
…		…
2525	my ($ns, $buf) = @_;	2818	my ($ns, $buf) = @_;
2526		2819
2527	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2820	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528		2821
2529	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
2530	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2830	if (my $cb = $EXTICMD{$type}) {
2531	if (my %reply = $cb->($ns, $msg)) {	2831	@reply = $cb->($ns, @payload);
2532	$reply{msgid} = $msg->{msgid};
2533	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534	}
2535	}	2832	}
		2833
		2834	$ns->ext_reply ($reply, @reply)
		2835	if $reply;
		2836
2536	} else {	2837	} else {
2537	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";
2538	}	2839	}
2539		2840
2540	cf::override;	2841	cf::override;
…		…
2587	our $safe = new Safe "safe";	2888	our $safe = new Safe "safe";
2588	our $safe_hole = new Safe::Hole;	2889	our $safe_hole = new Safe::Hole;
2589		2890
2590	$SIG{FPE} = 'IGNORE';	2891	$SIG{FPE} = 'IGNORE';
2591		2892
2592	$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	));
2593		2898
2594	# here we export the classes and methods available to script code	2899	# here we export the classes and methods available to script code
2595		2900
2596	=pod	2901	=pod
2597		2902
2598	The following functions and methods are available within a safe environment:	2903	The following functions and methods are available within a safe environment:
2599		2904
2600	cf::object	2905	cf::object
2601	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
2602	insert remove	2907	insert remove name archname title slaying race decrease_ob_nr
2603		2908
2604	cf::object::player	2909	cf::object::player
2605	player	2910	player
2606		2911
2607	cf::player	2912	cf::player
…		…
2612		2917
2613	=cut	2918	=cut
2614		2919
2615	for (	2920	for (
2616	["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
2617	insert remove)],	2923	decrease_ob_nr destroy)],
2618	["cf::object::player" => qw(player)],	2924	["cf::object::player" => qw(player)],
2619	["cf::player" => qw(peaceful)],	2925	["cf::player" => qw(peaceful)],
2620	["cf::map" => qw(trigger)],	2926	["cf::map" => qw(trigger)],
2621	) {	2927	) {
2622	no strict 'refs';	2928	no strict 'refs';
…		…
2698	# the server's init and main functions	3004	# the server's init and main functions
2699		3005
2700	sub load_facedata($) {	3006	sub load_facedata($) {
2701	my ($path) = @_;	3007	my ($path) = @_;
2702		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
2703	warn "loading facedata from $path\n";	3015	warn "loading facedata from $path\n";
2704		3016
2705	my $facedata;	3017	my $facedata;
2706	0 < aio_load $path, $facedata	3018	0 < aio_load $path, $facedata
2707	or die "$path: $!";	3019	or die "$path: $!";
…		…
2709	$facedata = Coro::Storable::thaw $facedata;	3021	$facedata = Coro::Storable::thaw $facedata;
2710		3022
2711	$facedata->{version} == 2	3023	$facedata->{version} == 2
2712	or cf::cleanup "$path: version mismatch, cannot proceed.";	3024	or cf::cleanup "$path: version mismatch, cannot proceed.";
2713		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
2714	{	3033	{
2715	my $faces = $facedata->{faceinfo};	3034	my $faces = $facedata->{faceinfo};
2716		3035
2717	while (my ($face, $info) = each %$faces) {	3036	while (my ($face, $info) = each %$faces) {
2718	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3037	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2719	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3038	cf::face::set_visibility $idx, $info->{visibility};
		3039	cf::face::set_magicmap $idx, $info->{magicmap};
2720	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3040	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2721	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3041	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2722	Coro::cede;	3042
		3043	cf::cede_to_tick;
2723	}	3044	}
2724		3045
2725	while (my ($face, $info) = each %$faces) {	3046	while (my ($face, $info) = each %$faces) {
2726	next unless $info->{smooth};	3047	next unless $info->{smooth};
2727	my $idx = cf::face::find $face	3048	my $idx = cf::face::find $face
2728	or next;	3049	or next;
2729	if (my $smooth = cf::face::find $info->{smooth}) {	3050	if (my $smooth = cf::face::find $info->{smooth}) {
		3051	cf::face::set_smooth $idx, $smooth;
2730	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3052	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731	} else {	3053	} else {
2732	warn "smooth face '$info->{smooth}' not found for face '$face'";	3054	warn "smooth face '$info->{smooth}' not found for face '$face'";
2733	}	3055	}
2734	Coro::cede;	3056
		3057	cf::cede_to_tick;
2735	}	3058	}
2736	}	3059	}
2737		3060
2738	{	3061	{
2739	my $anims = $facedata->{animinfo};	3062	my $anims = $facedata->{animinfo};
2740		3063
2741	while (my ($anim, $info) = each %$anims) {	3064	while (my ($anim, $info) = each %$anims) {
2742	cf::anim::set $anim, $info->{frames}, $info->{facings};	3065	cf::anim::set $anim, $info->{frames}, $info->{facings};
2743	Coro::cede;	3066	cf::cede_to_tick;
2744	}	3067	}
2745		3068
2746	cf::anim::invalidate_all; # d'oh	3069	cf::anim::invalidate_all; # d'oh
2747	}	3070	}
2748		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
2749	1	3121	1
2750	}	3122	}
2751		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
2752	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
2753	load_resource_file "$MAPDIR/regions"	3137	load_resource_file "$MAPDIR/regions"
2754	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	}
2755	}	3144	}
2756		3145
2757	sub reload_facedata {	3146	sub reload_facedata {
2758	load_facedata "$DATADIR/facedata"	3147	load_facedata "$DATADIR/facedata"
2759	or die "unable to load facedata\n";	3148	or die "unable to load facedata\n";
…		…
2788		3177
2789	sub init {	3178	sub init {
2790	reload_resources;	3179	reload_resources;
2791	}	3180	}
2792		3181
2793	sub cfg_load {	3182	sub reload_config {
2794	open my $fh, "<:utf8", "$CONFDIR/config"	3183	open my $fh, "<:utf8", "$CONFDIR/config"
2795	or return;	3184	or return;
2796		3185
2797	local $/;	3186	local $/;
2798	*CFG = YAML::Syck::Load <$fh>;	3187	*CFG = YAML::Syck::Load <$fh>;
…		…
2814	sub main {	3203	sub main {
2815	# we must not ever block the main coroutine	3204	# we must not ever block the main coroutine
2816	local $Coro::idle = sub {	3205	local $Coro::idle = sub {
2817	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#
2818	(async {	3207	(async {
		3208	$Coro::current->{desc} = "IDLE BUG HANDLER";
2819	Event::one_event;	3209	Event::one_event;
2820	})->prio (Coro::PRIO_MAX);	3210	})->prio (Coro::PRIO_MAX);
2821	};	3211	};
2822		3212
2823	cfg_load;	3213	reload_config;
2824	db_init;	3214	db_init;
2825	load_extensions;	3215	load_extensions;
2826		3216
2827	$TICK_WATCHER->start;	3217	$TICK_WATCHER->start;
2828	Event::loop;	3218	Event::loop;
…		…
2895	# and maps saved/destroyed asynchronously.	3285	# and maps saved/destroyed asynchronously.
2896	warn "begin emergency player save\n";	3286	warn "begin emergency player save\n";
2897	for my $login (keys %cf::PLAYER) {	3287	for my $login (keys %cf::PLAYER) {
2898	my $pl = $cf::PLAYER{$login} or next;	3288	my $pl = $cf::PLAYER{$login} or next;
2899	$pl->valid or next;	3289	$pl->valid or next;
		3290	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2900	$pl->save;	3291	$pl->save;
2901	}	3292	}
2902	warn "end emergency player save\n";	3293	warn "end emergency player save\n";
2903		3294
2904	warn "begin emergency map save\n";	3295	warn "begin emergency map save\n";
…		…
3021	warn "reloading cf.pm";	3412	warn "reloading cf.pm";
3022	require cf;	3413	require cf;
3023	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3414	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3024		3415
3025	warn "loading config and database again";	3416	warn "loading config and database again";
3026	cf::cfg_load;	3417	cf::reload_config;
3027		3418
3028	warn "loading extensions";	3419	warn "loading extensions";
3029	cf::load_extensions;	3420	cf::load_extensions;
3030		3421
3031	warn "reattaching attachments to objects/players";	3422	warn "reattaching attachments to objects/players";
…		…
3067	register_command "reload" => sub {	3458	register_command "reload" => sub {
3068	my ($who, $arg) = @_;	3459	my ($who, $arg) = @_;
3069		3460
3070	if ($who->flag (FLAG_WIZ)) {	3461	if ($who->flag (FLAG_WIZ)) {
3071	$who->message ("reloading server.");	3462	$who->message ("reloading server.");
		3463	async {
		3464	$Coro::current->{desc} = "perl_reload";
3072	async { reload_perl };	3465	reload_perl;
		3466	};
3073	}	3467	}
3074	};	3468	};
3075		3469
3076	unshift @INC, $LIBDIR;	3470	unshift @INC, $LIBDIR;
3077		3471
…		…
3096	my $signal = new Coro::Signal;	3490	my $signal = new Coro::Signal;
3097	push @WAIT_FOR_TICK_BEGIN, $signal;	3491	push @WAIT_FOR_TICK_BEGIN, $signal;
3098	$signal->wait;	3492	$signal->wait;
3099	}	3493	}
3100		3494
3101	my $min = 1e6;#d#
3102	my $avg = 10;
3103	$TICK_WATCHER = Event->timer (	3495	$TICK_WATCHER = Event->timer (
3104	reentrant => 0,	3496	reentrant => 0,
3105	parked => 1,	3497	parked => 1,
3106	prio => 0,	3498	prio => 0,
3107	at => $NEXT_TICK \|\| $TICK,	3499	at => $NEXT_TICK \|\| $TICK,
…		…
3115		3507
3116	$NOW = $tick_start = Event::time;	3508	$NOW = $tick_start = Event::time;
3117		3509
3118	cf::server_tick; # one server iteration	3510	cf::server_tick; # one server iteration
3119		3511
3120	0 && sync_job {#d#
3121	for(1..10) {
3122	my $t = Event::time;
3123	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3124	or die;
3125
3126	$map->width (50);
3127	$map->height (50);
3128	$map->alloc;
3129	$map->_load_objects ("/tmp/x.map", 1);
3130	my $t = Event::time - $t;
3131
3132	#next unless $t < 0.0013;#d#
3133	if ($t < $min) {
3134	$min = $t;
3135	}
3136	$avg = $avg * 0.99 + $t * 0.01;
3137	}
3138	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3139	exit 0;
3140	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3141	};
3142
3143	$RUNTIME += $TICK;	3512	$RUNTIME += $TICK;
3144	$NEXT_TICK += $TICK;	3513	$NEXT_TICK += $TICK;
3145		3514
3146	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3515	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3147	$NEXT_RUNTIME_WRITE = $NOW + 10;	3516	$NEXT_RUNTIME_WRITE = $NOW + 10;
3148	Coro::async_pool {	3517	Coro::async_pool {
		3518	$Coro::current->{desc} = "runtime saver";
3149	write_runtime	3519	write_runtime
3150	or warn "ERROR: unable to write runtime file: $!";	3520	or warn "ERROR: unable to write runtime file: $!";
3151	};	3521	};
3152	}	3522	}
3153		3523
3154	# my $AFTER = Event::time;
3155	# warn $AFTER - $NOW;#d#
3156
3157	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3524	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3158	$sig->send;	3525	$sig->send;
3159	}	3526	}
3160	while (my $sig = shift @WAIT_FOR_TICK) {	3527	while (my $sig = shift @WAIT_FOR_TICK) {
3161	$sig->send;	3528	$sig->send;
…		…
3171		3538
3172	$LOAD = ($NOW - $tick_start) / $TICK;	3539	$LOAD = ($NOW - $tick_start) / $TICK;
3173	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3540	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3174		3541
3175	_post_tick;	3542	_post_tick;
3176
3177
3178	},	3543	},
3179	);	3544	);
3180		3545
3181	{	3546	{
		3547	BDB::min_parallel 8;
3182	BDB::max_poll_time $TICK * 0.1;	3548	BDB::max_poll_time $TICK * 0.1;
3183	$BDB_POLL_WATCHER = Event->io (	3549	$BDB_POLL_WATCHER = Event->io (
3184	reentrant => 0,	3550	reentrant => 0,
3185	fd => BDB::poll_fileno,	3551	fd => BDB::poll_fileno,
3186	poll => 'r',	3552	poll => 'r',
3187	prio => 0,	3553	prio => 0,
3188	data => WF_AUTOCANCEL,	3554	data => WF_AUTOCANCEL,
3189	cb => \&BDB::poll_cb,	3555	cb => \&BDB::poll_cb,
3190	);	3556	);
3191	BDB::min_parallel 8;
3192		3557
3193	BDB::set_sync_prepare {	3558	BDB::set_sync_prepare {
3194	my $status;	3559	my $status;
3195	my $current = $Coro::current;	3560	my $current = $Coro::current;
3196	(	3561	(
…		…
3205	)	3570	)
3206	};	3571	};
3207		3572
3208	unless ($DB_ENV) {	3573	unless ($DB_ENV) {
3209	$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);
3210		3579
3211	cf::sync_job {	3580	cf::sync_job {
3212	eval {	3581	eval {
3213	BDB::db_env_open	3582	BDB::db_env_open
3214	$DB_ENV,	3583	$DB_ENV,
…		…
3216	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
3217	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3586	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3218	0666;	3587	0666;
3219		3588
3220	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3589	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3221
3222	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
3223	$DB_ENV->set_lk_detect;
3224	};	3590	};
3225		3591
3226	cf::cleanup "db_env_open(db): $@" if $@;	3592	cf::cleanup "db_env_open(db): $@" if $@;
3227	};	3593	};
3228	}	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	);
3229	}	3626	}
3230		3627
3231	{	3628	{
3232	IO::AIO::min_parallel 8;	3629	IO::AIO::min_parallel 8;
3233		3630
…		…
3236	$AIO_POLL_WATCHER = Event->io (	3633	$AIO_POLL_WATCHER = Event->io (
3237	reentrant => 0,	3634	reentrant => 0,
3238	data => WF_AUTOCANCEL,	3635	data => WF_AUTOCANCEL,
3239	fd => IO::AIO::poll_fileno,	3636	fd => IO::AIO::poll_fileno,
3240	poll => 'r',	3637	poll => 'r',
3241	prio => 6,	3638	prio => 0,
3242	cb => \&IO::AIO::poll_cb,	3639	cb => \&IO::AIO::poll_cb,
3243	);	3640	);
3244	}	3641	}
3245		3642
3246	my $_log_backtrace;	3643	my $_log_backtrace;
…		…
3252		3649
3253	# limit the # of concurrent backtraces	3650	# limit the # of concurrent backtraces
3254	if ($_log_backtrace < 2) {	3651	if ($_log_backtrace < 2) {
3255	++$_log_backtrace;	3652	++$_log_backtrace;
3256	async {	3653	async {
		3654	$Coro::current->{desc} = "abt $msg";
		3655
3257	my @bt = fork_call {	3656	my @bt = fork_call {
3258	@addr = map { sprintf "%x", $_ } @addr;	3657	@addr = map { sprintf "%x", $_ } @addr;
3259	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3658	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3260	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 \|"
3261	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.298 by root, Sun Jul 8 14:50:07 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.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.385 by root, Fri Oct 12 19:13:26 2007 UTC