ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.289 by root, Sat Jun 30 03:00:54 2007 UTC vs.
Revision 1.375 by root, Sun Sep 30 20:22:21 2007 UTC

…		…
10	use Event;	10	use Event;
11	use Opcode;	11	use Opcode;
12	use Safe;	12	use Safe;
13	use Safe::Hole;	13	use Safe::Hole;
14		14
15	use Coro 3.61 ();	15	use Coro 3.64 ();
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.32 ();
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';
…		…
248		258
249	Converts a perl data structure into its JSON representation.	259	Converts a perl data structure into its JSON representation.
250		260
251	=cut	261	=cut
252		262
253	our $json_coder = JSON::XS->new->convert_blessed->utf8->max_size (1e6); # accept ~1mb max	263	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254		264
255	sub to_json ($) { $json_coder->encode ($_[0]) }	265	sub to_json ($) { $json_coder->encode ($_[0]) }
256	sub from_json ($) { $json_coder->decode ($_[0]) }	266	sub from_json ($) { $json_coder->decode ($_[0]) }
257		267
258	=item cf::lock_wait $string	268	=item cf::lock_wait $string
…		…
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
…		…
313	my $guard = Coro::guard {	334	my $guard = Coro::guard {
314	$TICK_WATCHER->start;	335	$TICK_WATCHER->start;
315	};	336	};
316	$TICK_WATCHER->stop;	337	$TICK_WATCHER->stop;
317	$guard	338	$guard
		339	}
		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;
318	}	397	}
319		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
…		…
356		435
357	my $busy = 1;	436	my $busy = 1;
358	my @res;	437	my @res;
359		438
360	(async {	439	(async {
		440	$Coro::current->desc ("sync job coro");
361	@res = eval { $job->() };	441	@res = eval { $job->() };
362	warn $@ if $@;	442	warn $@ if $@;
363	undef $busy;	443	undef $busy;
364	})->prio (Coro::PRIO_MAX);	444	})->prio (Coro::PRIO_MAX);
365		445
…		…
412	=cut	492	=cut
413		493
414	sub fork_call(&@) {	494	sub fork_call(&@) {
415	my ($cb, @args) = @_;	495	my ($cb, @args) = @_;
416		496
417	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	497	# we seemingly have to make a local copy of the whole thing,
418	# or die "socketpair: $!";	498	# otherwise perl prematurely frees the stuff :/
419	pipe my $fh1, my $fh2	499	# TODO: investigate and fix (likely this will be rather laborious)
420	or die "pipe: $!";
421		500
422	if (my $pid = fork) {	501	my @res = Coro::Util::fork_eval {
423	close $fh2;
424
425	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426	$res = Coro::Storable::thaw $res;
427
428	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430	die $$res unless "ARRAY" eq ref $res;
431
432	return wantarray ? @$res : $res->[-1];
433	} else {
434	reset_signals;	502	reset_signals;
435	local $SIG{__WARN__};	503	&$cb
436	local $SIG{__DIE__};	504	}, @args;
437	eval {
438	close $fh1;
439		505
440	my @res = eval { $cb->(@args) };	506	wantarray ? @res : $res[-1]
441	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442	};
443
444	warn $@ if $@;
445	_exit 0;
446	}
447	}	507	}
448		508
449	=item $value = cf::db_get $family => $key	509	=item $value = cf::db_get $family => $key
450		510
451	Returns a single value from the environment database.	511	Returns a single value from the environment database.
…		…
453	=item cf::db_put $family => $key => $value	513	=item cf::db_put $family => $key => $value
454		514
455	Stores the given C<$value> in the family. It can currently store binary	515	Stores the given C<$value> in the family. It can currently store binary
456	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).	516	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
457		517
		518	=item $db = cf::db_table "name"
		519
		520	Create and/or open a new database table. The string must not be "db" and must be unique
		521	within each server.
		522
458	=cut	523	=cut
		524
		525	sub db_table($) {
		526	my ($name) = @_;
		527	my $db = BDB::db_create $DB_ENV;
		528
		529	eval {
		530	$db->set_flags (BDB::CHKSUM);
		531
		532	utf8::encode $name;
		533	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		534	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		535	cf::cleanup "db_open(db): $!" if $!;
		536	};
		537	cf::cleanup "db_open(db): $@" if $@;
		538
		539	$db
		540	}
459		541
460	our $DB;	542	our $DB;
461		543
462	sub db_init {	544	sub db_init {
463	unless ($DB) {
464	$DB = BDB::db_create $DB_ENV;
465
466	cf::sync_job {	545	cf::sync_job {
467	eval {	546	$DB ||= db_table "db";
468	$DB->set_flags (BDB::CHKSUM);
469
470	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472	cf::cleanup "db_open(db): $!" if $!;
473	};
474	cf::cleanup "db_open(db): $@" if $@;
475	};
476	}	547	};
477	}	548	}
478		549
479	sub db_get($$) {	550	sub db_get($$) {
480	my $key = "$_[0]/$_[1]";	551	my $key = "$_[0]/$_[1]";
481		552
…		…
531	if (1) {	602	if (1) {
532	$md5 =	603	$md5 =
533	join "\x00",	604	join "\x00",
534	$processversion,	605	$processversion,
535	map {	606	map {
536	Coro::cede;	607	cf::cede_to_tick;
537	($src->[$_], Digest::MD5::md5_hex $data[$_])	608	($src->[$_], Digest::MD5::md5_hex $data[$_])
538	} 0.. $#$src;	609	} 0.. $#$src;
539		610
540		611
541	my $dbmd5 = db_get cache => "$id/md5";	612	my $dbmd5 = db_get cache => "$id/md5";
…		…
847	";	918	";
848	die if $@;	919	die if $@;
849	}	920	}
850		921
851	our $override;	922	our $override;
852	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	923	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
853		924
854	sub override {	925	sub override {
855	$override = 1;	926	$override = 1;
856	@invoke_results = ();	927	@INVOKE_RESULTS = (@_);
857	}	928	}
858		929
859	sub do_invoke {	930	sub do_invoke {
860	my $event = shift;	931	my $event = shift;
861	my $callbacks = shift;	932	my $callbacks = shift;
862		933
863	@invoke_results = ();	934	@INVOKE_RESULTS = ();
864		935
865	local $override;	936	local $override;
866		937
867	for (@$callbacks) {	938	for (@$callbacks) {
868	eval { &{$_->[1]} };	939	eval { &{$_->[1]} };
…		…
885		956
886	Generate an object-specific event with the given arguments.	957	Generate an object-specific event with the given arguments.
887		958
888	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	959	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
889	removed in future versions), and there is no public API to access override	960	removed in future versions), and there is no public API to access override
890	results (if you must, access C<@cf::invoke_results> directly).	961	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891		962
892	=back	963	=back
893		964
894	=cut	965	=cut
895		966
896	#############################################################################	967	#############################################################################
897	# object support	968	# object support
		969	#
		970
		971	sub _can_merge {
		972	my ($ob1, $ob2) = @_;
		973
		974	local $Storable::canonical = 1;
		975	my $fob1 = Storable::freeze $ob1;
		976	my $fob2 = Storable::freeze $ob2;
		977
		978	$fob1 eq $fob2
		979	}
898		980
899	sub reattach {	981	sub reattach {
900	# basically do the same as instantiate, without calling instantiate	982	# basically do the same as instantiate, without calling instantiate
901	my ($obj) = @_;	983	my ($obj) = @_;
902		984
…		…
949	sub object_freezer_save {	1031	sub object_freezer_save {
950	my ($filename, $rdata, $objs) = @_;	1032	my ($filename, $rdata, $objs) = @_;
951		1033
952	sync_job {	1034	sync_job {
953	if (length $$rdata) {	1035	if (length $$rdata) {
		1036	utf8::decode (my $decname = $filename);
954	warn sprintf "saving %s (%d,%d)\n",	1037	warn sprintf "saving %s (%d,%d)\n",
955	$filename, length $$rdata, scalar @$objs;	1038	$decname, length $$rdata, scalar @$objs;
956		1039
957	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1040	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
958	chmod SAVE_MODE, $fh;	1041	chmod SAVE_MODE, $fh;
959	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1042	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960	aio_fsync $fh if $cf::USE_FSYNC;	1043	aio_fsync $fh if $cf::USE_FSYNC;
…		…
979	}	1062	}
980	} else {	1063	} else {
981	aio_unlink $filename;	1064	aio_unlink $filename;
982	aio_unlink "$filename.pst";	1065	aio_unlink "$filename.pst";
983	}	1066	}
984	}	1067	};
985	}	1068	}
986		1069
987	sub object_freezer_as_string {	1070	sub object_freezer_as_string {
988	my ($rdata, $objs) = @_;	1071	my ($rdata, $objs) = @_;
989		1072
…		…
1001	or return;	1084	or return;
1002		1085
1003	unless (aio_stat "$filename.pst") {	1086	unless (aio_stat "$filename.pst") {
1004	(aio_load "$filename.pst", $av) >= 0	1087	(aio_load "$filename.pst", $av) >= 0
1005	or return;	1088	or return;
		1089
1006	$av = eval { (Storable::thaw $av)->{objs} };	1090	$av = eval { (Storable::thaw $av)->{objs} };
1007	}	1091	}
1008		1092
		1093	utf8::decode (my $decname = $filename);
1009	warn sprintf "loading %s (%d)\n",	1094	warn sprintf "loading %s (%d,%d)\n",
1010	$filename, length $data, scalar @{$av || []};	1095	$decname, length $data, scalar @{$av || []};
		1096
1011	return ($data, $av);	1097	($data, $av)
1012	}	1098	}
1013		1099
1014	=head2 COMMAND CALLBACKS	1100	=head2 COMMAND CALLBACKS
1015		1101
1016	=over 4	1102	=over 4
…		…
1086	cf::override;	1172	cf::override;
1087	},	1173	},
1088	on_extcmd => sub {	1174	on_extcmd => sub {
1089	my ($pl, $buf) = @_;	1175	my ($pl, $buf) = @_;
1090		1176
1091	my $msg = eval { from_json $buf };	1177	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092		1178
1093	if (ref $msg) {	1179	if (ref $msg) {
		1180	my ($type, $reply, @payload) =
		1181	"ARRAY" eq ref $msg
		1182	? @$msg
		1183	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1184
		1185	my @reply;
		1186
1094	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1187	if (my $cb = $EXTCMD{$type}) {
1095	if (my %reply = $cb->($pl, $msg)) {	1188	@reply = $cb->($pl, @payload);
1096	$pl->ext_reply ($msg->{msgid}, %reply);
1097	}
1098	}	1189	}
		1190
		1191	$pl->ext_reply ($reply, @reply)
		1192	if $reply;
		1193
1099	} else {	1194	} else {
1100	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1195	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101	}	1196	}
1102		1197
1103	cf::override;	1198	cf::override;
…		…
1193		1288
1194	=head3 cf::player	1289	=head3 cf::player
1195		1290
1196	=over 4	1291	=over 4
1197		1292
		1293	=item cf::player::num_playing
		1294
		1295	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1296
		1297	=cut
		1298
		1299	sub num_playing {
		1300	scalar grep
		1301	$_->ob->map
		1302	&& !$_->hidden
		1303	&& !$_->ob->flag (cf::FLAG_WIZ),
		1304	cf::player::list
		1305	}
		1306
1198	=item cf::player::find $login	1307	=item cf::player::find $login
1199		1308
1200	Returns the given player object, loading it if necessary (might block).	1309	Returns the given player object, loading it if necessary (might block).
1201		1310
1202	=cut	1311	=cut
…		…
1237	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1346	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1347	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1348	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240	aio_unlink +(playerdir $login) . "/$login.pl";	1349	aio_unlink +(playerdir $login) . "/$login.pl";
1241		1350
1242	my $pl = load_pl path $login	1351	my $f = new_from_file cf::object::thawer path $login
1243	or return;	1352	or return;
		1353
		1354	my $pl = cf::player::load_pl $f
		1355	or return;
		1356	local $cf::PLAYER_LOADING{$login} = $pl;
		1357	$f->resolve_delayed_derefs;
1244	$cf::PLAYER{$login} = $pl	1358	$cf::PLAYER{$login} = $pl
1245	}	1359	}
1246	}	1360	}
1247	}	1361	}
1248		1362
…		…
1258		1372
1259	aio_mkdir playerdir $pl, 0770;	1373	aio_mkdir playerdir $pl, 0770;
1260	$pl->{last_save} = $cf::RUNTIME;	1374	$pl->{last_save} = $cf::RUNTIME;
1261		1375
1262	$pl->save_pl ($path);	1376	$pl->save_pl ($path);
1263	Coro::cede;	1377	cf::cede_to_tick;
1264	}	1378	}
1265		1379
1266	sub new($) {	1380	sub new($) {
1267	my ($login) = @_;	1381	my ($login) = @_;
1268		1382
…		…
1272	$self->{deny_save} = 1;	1386	$self->{deny_save} = 1;
1273		1387
1274	$cf::PLAYER{$login} = $self;	1388	$cf::PLAYER{$login} = $self;
1275		1389
1276	$self	1390	$self
		1391	}
		1392
		1393	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1394
		1395	=cut
		1396
		1397	sub send_msg {
		1398	my $ns = shift->ns
		1399	or return;
		1400	$ns->send_msg (@_);
1277	}	1401	}
1278		1402
1279	=item $pl->quit_character	1403	=item $pl->quit_character
1280		1404
1281	Nukes the player without looking back. If logged in, the connection will	1405	Nukes the player without looking back. If logged in, the connection will
…		…
1336	or return [];	1460	or return [];
1337		1461
1338	my @logins;	1462	my @logins;
1339		1463
1340	for my $login (@$dirs) {	1464	for my $login (@$dirs) {
		1465	my $path = path $login;
		1466
		1467	# a .pst is a dead give-away for a valid player
		1468	unless (-e "$path.pst") {
1341	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1469	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342	aio_read $fh, 0, 512, my $buf, 0 or next;	1470	aio_read $fh, 0, 512, my $buf, 0 or next;
1343	$buf !~ /^password -------------$/m or next; # official not-valid tag	1471	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1472	}
1344		1473
1345	utf8::decode $login;	1474	utf8::decode $login;
1346	push @logins, $login;	1475	push @logins, $login;
1347	}	1476	}
1348		1477
…		…
1386	sub expand_cfpod {	1515	sub expand_cfpod {
1387	((my $self), (local $_)) = @_;	1516	((my $self), (local $_)) = @_;
1388		1517
1389	# escape & and <	1518	# escape & and <
1390	s/&/&amp;/g;	1519	s/&/&amp;/g;
1391	s/(?<![BIUGH])</&lt;/g;	1520	s/(?<![BIUGHT])</&lt;/g;
1392		1521
1393	# this is buggy, it needs to properly take care of nested <'s	1522	# this is buggy, it needs to properly take care of nested <'s
1394		1523
1395	1 while	1524	1 while
1396	# replace B<>, I<>, U<> etc.	1525	# replace B<>, I<>, U<> etc.
1397	s/B<([^\>]*)>/<b>$1<\/b>/	1526	s/B<([^\>]*)>/<b>$1<\/b>/
1398	|| s/I<([^\>]*)>/<i>$1<\/i>/	1527	|| s/I<([^\>]*)>/<i>$1<\/i>/
1399	|| s/U<([^\>]*)>/<u>$1<\/u>/	1528	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1529	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1400	# replace G<male|female> tags	1530	# replace G<male|female> tags
1401	|| s{G<([^>|]*)\|([^>]*)>}{	1531	|| s{G<([^>|]*)\|([^>]*)>}{
1402	$self->gender ? $2 : $1	1532	$self->gender ? $2 : $1
1403	}ge	1533	}ge
1404	# replace H<hint text>	1534	# replace H<hint text>
1405	|| s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;	1535	|| s{H<([^\>]*)>}
		1536	{
		1537	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1538	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1539	"")
		1540	[$self->{hintmode}]
		1541	}ge;
1406		1542
1407	# create single paragraphs (very hackish)	1543	# create single paragraphs (very hackish)
1408	s/(?<=\S)\n(?=\w)/ /g;	1544	s/(?<=\S)\n(?=\w)/ /g;
1409		1545
		1546	# compress some whitespace
		1547	s/\s+\n/\n/g; # ws line-ends
		1548	s/\n\n+/\n/g; # double lines
		1549	s/^\n+//; # beginning lines
		1550	s/\n+$//; # ending lines
		1551
1410	$_	1552	$_
1411	}	1553	}
1412		1554
		1555	sub hintmode {
		1556	$_[0]{hintmode} = $_[1] if @_ > 1;
		1557	$_[0]{hintmode}
		1558	}
		1559
1413	=item $player->ext_reply ($msgid, %msg)	1560	=item $player->ext_reply ($msgid, @msg)
1414		1561
1415	Sends an ext reply to the player.	1562	Sends an ext reply to the player.
1416		1563
1417	=cut	1564	=cut
1418		1565
1419	sub ext_reply($$%) {	1566	sub ext_reply($$@) {
1420	my ($self, $id, %msg) = @_;	1567	my ($self, $id, @msg) = @_;
1421		1568
1422	$msg{msgid} = $id;	1569	$self->ns->ext_reply ($id, @msg)
1423	$self->send ("ext " . cf::to_json \%msg);
1424	}	1570	}
1425		1571
1426	=item $player->ext_event ($type, %msg)	1572	=item $player->ext_msg ($type, @msg)
1427		1573
1428	Sends an ext event to the client.	1574	Sends an ext event to the client.
1429		1575
1430	=cut	1576	=cut
1431		1577
1432	sub ext_event($$%) {	1578	sub ext_msg($$@) {
1433	my ($self, $type, %msg) = @_;	1579	my ($self, $type, @msg) = @_;
1434		1580
1435	$self->ns->ext_event ($type, %msg);	1581	$self->ns->ext_msg ($type, @msg);
1436	}	1582	}
1437		1583
1438	=head3 cf::region	1584	=head3 cf::region
1439		1585
1440	=over 4	1586	=over 4
…		…
1453	my ($path) = @_;	1599	my ($path) = @_;
1454		1600
1455	my ($match, $specificity);	1601	my ($match, $specificity);
1456		1602
1457	for my $region (list) {	1603	for my $region (list) {
1458	if ($region->match && $path =~ $region->match) {	1604	if ($region->{match} && $path =~ $region->{match}) {
1459	($match, $specificity) = ($region, $region->specificity)	1605	($match, $specificity) = ($region, $region->specificity)
1460	if $region->specificity > $specificity;	1606	if $region->specificity > $specificity;
1461	}	1607	}
1462	}	1608	}
1463		1609
…		…
1583	$self->init; # pass $1 etc.	1729	$self->init; # pass $1 etc.
1584	return $self;	1730	return $self;
1585	}	1731	}
1586	}	1732	}
1587		1733
1588	Carp::carp "unable to resolve path '$path' (base '$base').";	1734	Carp::cluck "unable to resolve path '$path' (base '$base').";
1589	()	1735	()
1590	}	1736	}
1591		1737
1592	sub init {	1738	sub init {
1593	my ($self) = @_;	1739	my ($self) = @_;
…		…
1656		1802
1657	sub load_header_from($) {	1803	sub load_header_from($) {
1658	my ($self, $path) = @_;	1804	my ($self, $path) = @_;
1659		1805
1660	utf8::encode $path;	1806	utf8::encode $path;
1661	#aio_open $path, O_RDONLY, 0	1807	my $f = new_from_file cf::object::thawer $path
1662	# or return;
1663
1664	$self->_load_header ($path)
1665	or return;	1808	or return;
		1809
		1810	$self->_load_header ($f)
		1811	or return;
		1812
		1813	local $MAP_LOADING{$self->{path}} = $self;
		1814	$f->resolve_delayed_derefs;
1666		1815
1667	$self->{load_path} = $path;	1816	$self->{load_path} = $path;
1668		1817
1669	1	1818	1
1670	}	1819	}
…		…
1724	sub find {	1873	sub find {
1725	my ($path, $origin) = @_;	1874	my ($path, $origin) = @_;
1726		1875
1727	$path = normalise $path, $origin && $origin->path;	1876	$path = normalise $path, $origin && $origin->path;
1728		1877
		1878	cf::lock_wait "map_data:$path";#d#remove
1729	cf::lock_wait "map_find:$path";	1879	cf::lock_wait "map_find:$path";
1730		1880
1731	$cf::MAP{$path} || do {	1881	$cf::MAP{$path} || do {
1732	my $guard = cf::lock_acquire "map_find:$path";	1882	my $guard1 = cf::lock_acquire "map_find:$path";
		1883	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1884
1733	my $map = new_from_path cf::map $path	1885	my $map = new_from_path cf::map $path
1734	or return;	1886	or return;
1735		1887
1736	$map->{last_save} = $cf::RUNTIME;	1888	$map->{last_save} = $cf::RUNTIME;
1737		1889
…		…
1739	or return;	1891	or return;
1740		1892
1741	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1893	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1742	# doing this can freeze the server in a sync job, obviously	1894	# doing this can freeze the server in a sync job, obviously
1743	#$cf::WAIT_FOR_TICK->wait;	1895	#$cf::WAIT_FOR_TICK->wait;
		1896	undef $guard1;
		1897	undef $guard2;
1744	$map->reset;	1898	$map->reset;
1745	undef $guard;
1746	return find $path;	1899	return find $path;
1747	}	1900	}
1748		1901
1749	$cf::MAP{$path} = $map	1902	$cf::MAP{$path} = $map
1750	}	1903	}
…		…
1759	local $self->{deny_reset} = 1; # loading can take a long time	1912	local $self->{deny_reset} = 1; # loading can take a long time
1760		1913
1761	my $path = $self->{path};	1914	my $path = $self->{path};
1762		1915
1763	{	1916	{
1764	my $guard = cf::lock_acquire "map_load:$path";	1917	my $guard = cf::lock_acquire "map_data:$path";
1765		1918
		1919	return unless $self->valid;
1766	return if $self->in_memory != cf::MAP_SWAPPED;	1920	return unless $self->in_memory == cf::MAP_SWAPPED;
1767		1921
1768	$self->in_memory (cf::MAP_LOADING);	1922	$self->in_memory (cf::MAP_LOADING);
1769		1923
1770	$self->alloc;	1924	$self->alloc;
1771		1925
1772	$self->pre_load;	1926	$self->pre_load;
1773	Coro::cede;	1927	cf::cede_to_tick;
1774		1928
		1929	my $f = new_from_file cf::object::thawer $self->{load_path};
		1930	$f->skip_block;
1775	$self->_load_objects ($self->{load_path}, 1)	1931	$self->_load_objects ($f)
1776	or return;	1932	or return;
1777		1933
1778	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1934	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1779	if delete $self->{load_original};	1935	if delete $self->{load_original};
1780		1936
1781	if (my $uniq = $self->uniq_path) {	1937	if (my $uniq = $self->uniq_path) {
1782	utf8::encode $uniq;	1938	utf8::encode $uniq;
1783	if (aio_open $uniq, O_RDONLY, 0) {	1939	unless (aio_stat $uniq) {
		1940	if (my $f = new_from_file cf::object::thawer $uniq) {
1784	$self->clear_unique_items;	1941	$self->clear_unique_items;
1785	$self->_load_objects ($uniq, 0);	1942	$self->_load_objects ($f);
		1943	$f->resolve_delayed_derefs;
		1944	}
1786	}	1945	}
1787	}	1946	}
1788		1947
1789	Coro::cede;	1948	$f->resolve_delayed_derefs;
		1949
		1950	cf::cede_to_tick;
1790	# now do the right thing for maps	1951	# now do the right thing for maps
1791	$self->link_multipart_objects;	1952	$self->link_multipart_objects;
1792	$self->difficulty ($self->estimate_difficulty)	1953	$self->difficulty ($self->estimate_difficulty)
1793	unless $self->difficulty;	1954	unless $self->difficulty;
1794	Coro::cede;	1955	cf::cede_to_tick;
1795		1956
1796	unless ($self->{deny_activate}) {	1957	unless ($self->{deny_activate}) {
1797	$self->decay_objects;	1958	$self->decay_objects;
1798	$self->fix_auto_apply;	1959	$self->fix_auto_apply;
1799	$self->update_buttons;	1960	$self->update_buttons;
1800	Coro::cede;	1961	cf::cede_to_tick;
1801	$self->set_darkness_map;	1962	$self->set_darkness_map;
1802	Coro::cede;	1963	cf::cede_to_tick;
1803	$self->activate;	1964	$self->activate;
1804	}	1965	}
		1966
		1967	$self->{last_save} = $cf::RUNTIME;
		1968	$self->last_access ($cf::RUNTIME);
1805		1969
1806	$self->in_memory (cf::MAP_IN_MEMORY);	1970	$self->in_memory (cf::MAP_IN_MEMORY);
1807	}	1971	}
1808		1972
1809	$self->post_load;	1973	$self->post_load;
…		…
1820		1984
1821	$self	1985	$self
1822	}	1986	}
1823		1987
1824	# find and load all maps in the 3x3 area around a map	1988	# find and load all maps in the 3x3 area around a map
1825	sub load_diag {	1989	sub load_neighbours {
1826	my ($map) = @_;	1990	my ($map) = @_;
1827		1991
1828	my @diag; # diagonal neighbours	1992	my @neigh; # diagonal neighbours
1829		1993
1830	for (0 .. 3) {	1994	for (0 .. 3) {
1831	my $neigh = $map->tile_path ($_)	1995	my $neigh = $map->tile_path ($_)
1832	or next;	1996	or next;
1833	$neigh = find $neigh, $map	1997	$neigh = find $neigh, $map
1834	or next;	1998	or next;
1835	$neigh->load;	1999	$neigh->load;
1836		2000
		2001	push @neigh,
1837	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2002	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1838	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2003	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1839	}	2004	}
1840		2005
1841	for (@diag) {	2006	for (grep defined $_->[0], @neigh) {
		2007	my ($path, $origin) = @$_;
1842	my $neigh = find @$_	2008	my $neigh = find $path, $origin
1843	or next;	2009	or next;
1844	$neigh->load;	2010	$neigh->load;
1845	}	2011	}
1846	}	2012	}
1847		2013
…		…
1852	}	2018	}
1853		2019
1854	sub do_load_sync {	2020	sub do_load_sync {
1855	my ($map) = @_;	2021	my ($map) = @_;
1856		2022
		2023	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2024	if $Coro::current == $Coro::main;
		2025
1857	cf::sync_job { $map->load };	2026	cf::sync_job { $map->load };
1858	}	2027	}
1859		2028
1860	our %MAP_PREFETCH;	2029	our %MAP_PREFETCH;
1861	our $MAP_PREFETCHER = undef;	2030	our $MAP_PREFETCHER = undef;
1862		2031
1863	sub find_async {	2032	sub find_async {
1864	my ($path, $origin) = @_;	2033	my ($path, $origin, $load) = @_;
1865		2034
1866	$path = normalise $path, $origin && $origin->{path};	2035	$path = normalise $path, $origin && $origin->{path};
1867		2036
1868	if (my $map = $cf::MAP{$path}) {	2037	if (my $map = $cf::MAP{$path}) {
1869	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2038	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1870	}	2039	}
1871		2040
1872	undef $MAP_PREFETCH{$path};	2041	$MAP_PREFETCH{$path} |= $load;
		2042
1873	$MAP_PREFETCHER ||= cf::async {	2043	$MAP_PREFETCHER ||= cf::async {
		2044	$Coro::current->{desc} = "map prefetcher";
		2045
1874	while (%MAP_PREFETCH) {	2046	while (%MAP_PREFETCH) {
1875	for my $path (keys %MAP_PREFETCH) {	2047	while (my ($k, $v) = each %MAP_PREFETCH) {
1876	my $map = find $path	2048	if (my $map = find $k) {
1877	or next;
1878	$map->load;	2049	$map->load if $v;
		2050	}
1879		2051
1880	delete $MAP_PREFETCH{$path};	2052	delete $MAP_PREFETCH{$k};
1881	}	2053	}
1882	}	2054	}
1883	undef $MAP_PREFETCHER;	2055	undef $MAP_PREFETCHER;
1884	};	2056	};
1885	$MAP_PREFETCHER->prio (6);	2057	$MAP_PREFETCHER->prio (6);
…		…
1888	}	2060	}
1889		2061
1890	sub save {	2062	sub save {
1891	my ($self) = @_;	2063	my ($self) = @_;
1892		2064
1893	my $lock = cf::lock_acquire "map_data:" . $self->path;	2065	my $lock = cf::lock_acquire "map_data:$self->{path}";
1894		2066
1895	$self->{last_save} = $cf::RUNTIME;	2067	$self->{last_save} = $cf::RUNTIME;
1896		2068
1897	return unless $self->dirty;	2069	return unless $self->dirty;
1898		2070
…		…
1904	return if $self->{deny_save};	2076	return if $self->{deny_save};
1905		2077
1906	local $self->{last_access} = $self->last_access;#d#	2078	local $self->{last_access} = $self->last_access;#d#
1907		2079
1908	cf::async {	2080	cf::async {
		2081	$Coro::current->{desc} = "map player save";
1909	$_->contr->save for $self->players;	2082	$_->contr->save for $self->players;
1910	};	2083	};
1911		2084
1912	if ($uniq) {	2085	if ($uniq) {
1913	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2086	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
1921	my ($self) = @_;	2094	my ($self) = @_;
1922		2095
1923	# save first because save cedes	2096	# save first because save cedes
1924	$self->save;	2097	$self->save;
1925		2098
1926	my $lock = cf::lock_acquire "map_data:" . $self->path;	2099	my $lock = cf::lock_acquire "map_data:$self->{path}";
1927		2100
1928	return if $self->players;	2101	return if $self->players;
1929	return if $self->in_memory != cf::MAP_IN_MEMORY;	2102	return if $self->in_memory != cf::MAP_IN_MEMORY;
1930	return if $self->{deny_save};	2103	return if $self->{deny_save};
1931		2104
		2105	$self->in_memory (cf::MAP_SWAPPED);
		2106
		2107	$self->deactivate;
		2108	$_->clear_links_to ($self) for values %cf::MAP;
1932	$self->clear;	2109	$self->clear;
1933	$self->in_memory (cf::MAP_SWAPPED);
1934	}	2110	}
1935		2111
1936	sub reset_at {	2112	sub reset_at {
1937	my ($self) = @_;	2113	my ($self) = @_;
1938		2114
…		…
1970	if $uniq;	2146	if $uniq;
1971	}	2147	}
1972		2148
1973	delete $cf::MAP{$self->path};	2149	delete $cf::MAP{$self->path};
1974		2150
		2151	$self->deactivate;
		2152	$_->clear_links_to ($self) for values %cf::MAP;
1975	$self->clear;	2153	$self->clear;
1976
1977	$_->clear_links_to ($self) for values %cf::MAP;
1978		2154
1979	$self->unlink_save;	2155	$self->unlink_save;
1980	$self->destroy;	2156	$self->destroy;
1981	}	2157	}
1982		2158
1983	my $nuke_counter = "aaaa";	2159	my $nuke_counter = "aaaa";
1984		2160
1985	sub nuke {	2161	sub nuke {
1986	my ($self) = @_;	2162	my ($self) = @_;
1987		2163
		2164	{
		2165	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2166
1988	delete $cf::MAP{$self->path};	2167	delete $cf::MAP{$self->path};
1989		2168
1990	$self->unlink_save;	2169	$self->unlink_save;
1991		2170
1992	bless $self, "cf::map";	2171	bless $self, "cf::map";
1993	delete $self->{deny_reset};	2172	delete $self->{deny_reset};
1994	$self->{deny_save} = 1;	2173	$self->{deny_save} = 1;
1995	$self->reset_timeout (1);	2174	$self->reset_timeout (1);
1996	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2175	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1997		2176
1998	$cf::MAP{$self->path} = $self;	2177	$cf::MAP{$self->path} = $self;
		2178	}
1999		2179
2000	$self->reset; # polite request, might not happen	2180	$self->reset; # polite request, might not happen
2001	}	2181	}
2002		2182
2003	=item $maps = cf::map::tmp_maps	2183	=item $maps = cf::map::tmp_maps
…		…
2079		2259
2080	sub inv_recursive {	2260	sub inv_recursive {
2081	inv_recursive_ inv $_[0]	2261	inv_recursive_ inv $_[0]
2082	}	2262	}
2083		2263
		2264	=item $ref = $ob->ref
		2265
		2266	creates and returns a persistent reference to an objetc that can be stored as a string.
		2267
		2268	=item $ob = cf::object::deref ($refstring)
		2269
		2270	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2271	even if the object actually exists. May block.
		2272
		2273	=cut
		2274
		2275	sub deref {
		2276	my ($ref) = @_;
		2277
		2278	# temporary compatibility#TODO#remove
		2279	$ref =~ s{^<}{player/<};
		2280
		2281	if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
		2282	my ($uuid, $name) = ($1, $2);
		2283	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2284	or return;
		2285	$pl->ob->uuid eq $uuid
		2286	or return;
		2287
		2288	$pl->ob
		2289	} else {
		2290	warn "$ref: cannot resolve object reference\n";
		2291	undef
		2292	}
		2293	}
		2294
2084	package cf;	2295	package cf;
2085		2296
2086	=back	2297	=back
2087		2298
2088	=head3 cf::object::player	2299	=head3 cf::object::player
…		…
2110		2321
2111	} else {	2322	} else {
2112	my $pl = $self->contr;	2323	my $pl = $self->contr;
2113		2324
2114	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2325	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2115	my $diag = $pl->{npc_dialog};	2326	my $dialog = $pl->{npc_dialog};
2116	$diag->{pl}->ext_reply (	2327	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2117	$diag->{id},
2118	msgtype => "reply",
2119	msg => $diag->{pl}->expand_cfpod ($msg),
2120	add_topics => []
2121	);
2122		2328
2123	} else {	2329	} else {
2124	$msg = $npc->name . " says: $msg" if $npc;	2330	$msg = $npc->name . " says: $msg" if $npc;
2125	$self->message ($msg, $flags);	2331	$self->message ($msg, $flags);
2126	}	2332	}
2127	}	2333	}
		2334	}
		2335
		2336	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2337
		2338	=cut
		2339
		2340	sub cf::object::send_msg {
		2341	my $pl = shift->contr
		2342	or return;
		2343	$pl->send_msg (@_);
2128	}	2344	}
2129		2345
2130	=item $player_object->may ("access")	2346	=item $player_object->may ("access")
2131		2347
2132	Returns wether the given player is authorized to access resource "access"	2348	Returns wether the given player is authorized to access resource "access"
…		…
2211	# use -1 or undef as default coordinates, not 0, 0	2427	# use -1 or undef as default coordinates, not 0, 0
2212	($x, $y) = ($map->enter_x, $map->enter_y)	2428	($x, $y) = ($map->enter_x, $map->enter_y)
2213	if $x <=0 && $y <= 0;	2429	if $x <=0 && $y <= 0;
2214		2430
2215	$map->load;	2431	$map->load;
2216	$map->load_diag;	2432	$map->load_neighbours;
2217		2433
2218	return unless $self->contr->active;	2434	return unless $self->contr->active;
2219	$self->activate_recursive;	2435	$self->activate_recursive;
2220		2436
2221	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2437	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2222	$self->enter_map ($map, $x, $y);	2438	$self->enter_map ($map, $x, $y);
2223	}	2439	}
2224		2440
2225	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2441	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2226		2442
2227	Moves the player to the given map-path and coordinates by first freezing	2443	Moves the player to the given map-path and coordinates by first freezing
2228	her, loading and preparing them map, calling the provided $check callback	2444	her, loading and preparing them map, calling the provided $check callback
2229	that has to return the map if sucecssful, and then unfreezes the player on	2445	that has to return the map if sucecssful, and then unfreezes the player on
2230	the new (success) or old (failed) map position.	2446	the new (success) or old (failed) map position. In either case, $done will
		2447	be called at the end of this process.
2231		2448
2232	=cut	2449	=cut
2233		2450
2234	our $GOTOGEN;	2451	our $GOTOGEN;
2235		2452
2236	sub cf::object::player::goto {	2453	sub cf::object::player::goto {
2237	my ($self, $path, $x, $y, $check) = @_;	2454	my ($self, $path, $x, $y, $check, $done) = @_;
2238		2455
2239	# do generation counting so two concurrent goto's will be executed in-order	2456	# do generation counting so two concurrent goto's will be executed in-order
2240	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2457	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2241		2458
2242	$self->enter_link;	2459	$self->enter_link;
2243		2460
2244	(async {	2461	(async {
		2462	$Coro::current->{desc} = "player::goto $path $x $y";
		2463
		2464	# *tag paths override both path and x|y
		2465	if ($path =~ /^\*(.*)$/) {
		2466	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2467	my $ob = $obs[rand @obs];
		2468
		2469	# see if we actually can go there
		2470	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2471	$ob = $obs[rand @obs];
		2472	} else {
		2473	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2474	}
		2475	# else put us there anyways for now #d#
		2476
		2477	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2478	} else {
		2479	($path, $x, $y) = (undef, undef, undef);
		2480	}
		2481	}
		2482
2245	my $map = eval {	2483	my $map = eval {
2246	my $map = cf::map::find $path;	2484	my $map = defined $path ? cf::map::find $path : undef;
2247		2485
2248	if ($map) {	2486	if ($map) {
2249	$map = $map->customise_for ($self);	2487	$map = $map->customise_for ($self);
2250	$map = $check->($map) if $check && $map;	2488	$map = $check->($map) if $check && $map;
2251	} else {	2489	} else {
2252	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2490	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2253	}	2491	}
2254		2492
2255	$map	2493	$map
2256	};	2494	};
2257		2495
…		…
2262		2500
2263	if ($gen == $self->{_goto_generation}) {	2501	if ($gen == $self->{_goto_generation}) {
2264	delete $self->{_goto_generation};	2502	delete $self->{_goto_generation};
2265	$self->leave_link ($map, $x, $y);	2503	$self->leave_link ($map, $x, $y);
2266	}	2504	}
		2505
		2506	$done->() if $done;
2267	})->prio (1);	2507	})->prio (1);
2268	}	2508	}
2269		2509
2270	=item $player_object->enter_exit ($exit_object)	2510	=item $player_object->enter_exit ($exit_object)
2271		2511
…		…
2340	my $hp = $exit->stats->hp;	2580	my $hp = $exit->stats->hp;
2341	my $sp = $exit->stats->sp;	2581	my $sp = $exit->stats->sp;
2342		2582
2343	$self->enter_link;	2583	$self->enter_link;
2344		2584
		2585	# if exit is damned, update players death & WoR home-position
		2586	$self->contr->savebed ($slaying, $hp, $sp)
		2587	if $exit->flag (FLAG_DAMNED);
		2588
2345	(async {	2589	(async {
		2590	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2591
2346	$self->deactivate_recursive; # just to be sure	2592	$self->deactivate_recursive; # just to be sure
2347	unless (eval {	2593	unless (eval {
2348	$self->goto ($slaying, $hp, $sp);	2594	$self->goto ($slaying, $hp, $sp);
2349		2595
2350	1;	2596	1;
…		…
2376		2622
2377	utf8::encode $text;	2623	utf8::encode $text;
2378	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2624	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2379	}	2625	}
2380		2626
2381	=item $client->send_msg ($color, $type, $msg, [extra...])	2627	=item $client->send_msg ($channel, $msg, $color, [extra...])
2382		2628
2383	Send a drawinfo or msg packet to the client, formatting the msg for the	2629	Send a drawinfo or msg packet to the client, formatting the msg for the
2384	client if neccessary. C<$type> should be a string identifying the type of	2630	client if neccessary. C<$type> should be a string identifying the type of
2385	the message, with C<log> being the default. If C<$color> is negative, suppress	2631	the message, with C<log> being the default. If C<$color> is negative, suppress
2386	the message unless the client supports the msg packet.	2632	the message unless the client supports the msg packet.
2387		2633
2388	=cut	2634	=cut
2389		2635
		2636	our %CHANNEL = (
		2637	"c/identify" => {
		2638	id => "infobox",
		2639	title => "Identify",
		2640	reply => undef,
		2641	tooltip => "Items recently identified",
		2642	},
		2643	"c/examine" => {
		2644	id => "infobox",
		2645	title => "Examine",
		2646	reply => undef,
		2647	tooltip => "Signs and other items you examined",
		2648	},
		2649	"c/lookat" => {
		2650	id => "infobox",
		2651	title => "Look",
		2652	reply => undef,
		2653	tooltip => "What you saw there",
		2654	},
		2655	);
		2656
2390	sub cf::client::send_msg {	2657	sub cf::client::send_msg {
2391	my ($self, $color, $type, $msg, @extra) = @_;	2658	my ($self, $channel, $msg, $color, @extra) = @_;
2392		2659
2393	$msg = $self->pl->expand_cfpod ($msg);	2660	$msg = $self->pl->expand_cfpod ($msg);
2394		2661
		2662	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2663
		2664	# check predefined channels, for the benefit of C
		2665	if ($CHANNEL{$channel}) {
		2666	$channel = $CHANNEL{$channel};
		2667
		2668	$self->ext_msg (channel_info => $channel)
		2669	if $self->can_msg;
		2670
		2671	$channel = $channel->{id};
		2672
		2673	} elsif (ref $channel) {
		2674	# send meta info to client, if not yet sent
		2675	unless (exists $self->{channel}{$channel->{id}}) {
		2676	$self->{channel}{$channel->{id}} = $channel;
		2677	$self->ext_msg (channel_info => $channel)
		2678	if $self->can_msg;
		2679	}
		2680
		2681	$channel = $channel->{id};
		2682	}
		2683
		2684	return unless @extra || length $msg;
		2685
2395	if ($self->can_msg) {	2686	if ($self->can_msg) {
2396	$self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);	2687	# default colour, mask it out
		2688	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2689	if $color & cf::NDI_DEF;
		2690
		2691	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2692	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2397	} else {	2693	} else {
2398	# replace some tags by gcfclient-compatible ones
2399	for ($msg) {
2400	1 while
2401	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2402	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2403	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2404	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2405	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2406	}
2407
2408	if ($color >= 0) {	2694	if ($color >= 0) {
		2695	# replace some tags by gcfclient-compatible ones
		2696	for ($msg) {
		2697	1 while
		2698	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2699	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2700	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2701	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2702	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2703	}
		2704
		2705	$color &= cf::NDI_COLOR_MASK;
		2706
		2707	utf8::encode $msg;
		2708
2409	if (0 && $msg =~ /\[/) {	2709	if (0 && $msg =~ /\[/) {
		2710	# COMMAND/INFO
2410	$self->send_packet ("drawextinfo $color 4 0 $msg")	2711	$self->send_packet ("drawextinfo $color 10 8 $msg")
2411	} else {	2712	} else {
2412	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	2713	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2413	$self->send_packet ("drawinfo $color $msg")	2714	$self->send_packet ("drawinfo $color $msg")
2414	}	2715	}
2415	}	2716	}
2416	}	2717	}
2417	}	2718	}
2418		2719
2419	=item $client->ext_event ($type, %msg)	2720	=item $client->ext_msg ($type, @msg)
2420		2721
2421	Sends an ext event to the client.	2722	Sends an ext event to the client.
2422		2723
2423	=cut	2724	=cut
2424		2725
2425	sub cf::client::ext_event($$%) {	2726	sub cf::client::ext_msg($$@) {
2426	my ($self, $type, %msg) = @_;	2727	my ($self, $type, @msg) = @_;
2427		2728
		2729	if ($self->extcmd == 2) {
		2730	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2731	} elsif ($self->extcmd == 1) { # TODO: remove
2428	$msg{msgtype} = "event_$type";	2732	push @msg, msgtype => "event_$type";
2429	$self->send_packet ("ext " . cf::to_json \%msg);	2733	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2734	}
		2735	}
		2736
		2737	=item $client->ext_reply ($msgid, @msg)
		2738
		2739	Sends an ext reply to the client.
		2740
		2741	=cut
		2742
		2743	sub cf::client::ext_reply($$@) {
		2744	my ($self, $id, @msg) = @_;
		2745
		2746	if ($self->extcmd == 2) {
		2747	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2748	} elsif ($self->extcmd == 1) {
		2749	#TODO: version 1, remove
		2750	unshift @msg, msgtype => "reply", msgid => $id;
		2751	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2752	}
2430	}	2753	}
2431		2754
2432	=item $success = $client->query ($flags, "text", \&cb)	2755	=item $success = $client->query ($flags, "text", \&cb)
2433		2756
2434	Queues a query to the client, calling the given callback with	2757	Queues a query to the client, calling the given callback with
…		…
2457		2780
2458	1	2781	1
2459	}	2782	}
2460		2783
2461	cf::client->attach (	2784	cf::client->attach (
		2785	on_connect => sub {
		2786	my ($ns) = @_;
		2787
		2788	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2789	},
2462	on_reply => sub {	2790	on_reply => sub {
2463	my ($ns, $msg) = @_;	2791	my ($ns, $msg) = @_;
2464		2792
2465	# this weird shuffling is so that direct followup queries	2793	# this weird shuffling is so that direct followup queries
2466	# get handled first	2794	# get handled first
…		…
2481	}	2809	}
2482	},	2810	},
2483	on_exticmd => sub {	2811	on_exticmd => sub {
2484	my ($ns, $buf) = @_;	2812	my ($ns, $buf) = @_;
2485		2813
2486	my $msg = eval { from_json $buf };	2814	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2487		2815
2488	if (ref $msg) {	2816	if (ref $msg) {
		2817	my ($type, $reply, @payload) =
		2818	"ARRAY" eq ref $msg
		2819	? @$msg
		2820	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2821
		2822	my @reply;
		2823
2489	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2824	if (my $cb = $EXTICMD{$type}) {
2490	if (my %reply = $cb->($ns, $msg)) {	2825	@reply = $cb->($ns, @payload);
2491	$reply{msgid} = $msg->{msgid};
2492	$ns->send ("ext " . cf::to_json \%reply);
2493	}
2494	}	2826	}
		2827
		2828	$ns->ext_reply ($reply, @reply)
		2829	if $reply;
		2830
2495	} else {	2831	} else {
2496	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2832	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2497	}	2833	}
2498		2834
2499	cf::override;	2835	cf::override;
…		…
2546	our $safe = new Safe "safe";	2882	our $safe = new Safe "safe";
2547	our $safe_hole = new Safe::Hole;	2883	our $safe_hole = new Safe::Hole;
2548		2884
2549	$SIG{FPE} = 'IGNORE';	2885	$SIG{FPE} = 'IGNORE';
2550		2886
2551	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2887	$safe->permit_only (Opcode::opset qw(
		2888	:base_core :base_mem :base_orig :base_math
		2889	grepstart grepwhile mapstart mapwhile
		2890	sort time
		2891	));
2552		2892
2553	# here we export the classes and methods available to script code	2893	# here we export the classes and methods available to script code
2554		2894
2555	=pod	2895	=pod
2556		2896
2557	The following functions and methods are available within a safe environment:	2897	The following functions and methods are available within a safe environment:
2558		2898
2559	cf::object contr pay_amount pay_player map	2899	cf::object
		2900	contr pay_amount pay_player map x y force_find force_add
		2901	insert remove name archname title slaying race decrease_ob_nr
		2902
2560	cf::object::player player	2903	cf::object::player
2561	cf::player peaceful	2904	player
2562	cf::map trigger	2905
		2906	cf::player
		2907	peaceful
		2908
		2909	cf::map
		2910	trigger
2563		2911
2564	=cut	2912	=cut
2565		2913
2566	for (	2914	for (
2567	["cf::object" => qw(contr pay_amount pay_player map)],	2915	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2916	insert remove inv name archname title slaying race
		2917	decrease_ob_nr)],
2568	["cf::object::player" => qw(player)],	2918	["cf::object::player" => qw(player)],
2569	["cf::player" => qw(peaceful)],	2919	["cf::player" => qw(peaceful)],
2570	["cf::map" => qw(trigger)],	2920	["cf::map" => qw(trigger)],
2571	) {	2921	) {
2572	no strict 'refs';	2922	no strict 'refs';
…		…
2648	# the server's init and main functions	2998	# the server's init and main functions
2649		2999
2650	sub load_facedata($) {	3000	sub load_facedata($) {
2651	my ($path) = @_;	3001	my ($path) = @_;
2652		3002
		3003	# HACK to clear player env face cache, we need some signal framework
		3004	# for this (global event?)
		3005	%ext::player_env::MUSIC_FACE_CACHE = ();
		3006
		3007	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3008
2653	warn "loading facedata from $path\n";	3009	warn "loading facedata from $path\n";
2654		3010
2655	my $facedata;	3011	my $facedata;
2656	0 < aio_load $path, $facedata	3012	0 < aio_load $path, $facedata
2657	or die "$path: $!";	3013	or die "$path: $!";
…		…
2659	$facedata = Coro::Storable::thaw $facedata;	3015	$facedata = Coro::Storable::thaw $facedata;
2660		3016
2661	$facedata->{version} == 2	3017	$facedata->{version} == 2
2662	or cf::cleanup "$path: version mismatch, cannot proceed.";	3018	or cf::cleanup "$path: version mismatch, cannot proceed.";
2663		3019
		3020	# patch in the exptable
		3021	$facedata->{resource}{"res/exp_table"} = {
		3022	type => FT_RSRC,
		3023	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3024	};
		3025	cf::cede_to_tick;
		3026
2664	{	3027	{
2665	my $faces = $facedata->{faceinfo};	3028	my $faces = $facedata->{faceinfo};
2666		3029
2667	while (my ($face, $info) = each %$faces) {	3030	while (my ($face, $info) = each %$faces) {
2668	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3031	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2669	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3032	cf::face::set_visibility $idx, $info->{visibility};
		3033	cf::face::set_magicmap $idx, $info->{magicmap};
2670	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3034	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2671	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3035	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2672	Coro::cede;	3036
		3037	cf::cede_to_tick;
2673	}	3038	}
2674		3039
2675	while (my ($face, $info) = each %$faces) {	3040	while (my ($face, $info) = each %$faces) {
2676	next unless $info->{smooth};	3041	next unless $info->{smooth};
2677	my $idx = cf::face::find $face	3042	my $idx = cf::face::find $face
2678	or next;	3043	or next;
2679	if (my $smooth = cf::face::find $info->{smooth}) {	3044	if (my $smooth = cf::face::find $info->{smooth}) {
		3045	cf::face::set_smooth $idx, $smooth;
2680	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3046	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2681	} else {	3047	} else {
2682	warn "smooth face '$info->{smooth}' not found for face '$face'";	3048	warn "smooth face '$info->{smooth}' not found for face '$face'";
2683	}	3049	}
2684	Coro::cede;	3050
		3051	cf::cede_to_tick;
2685	}	3052	}
2686	}	3053	}
2687		3054
2688	{	3055	{
2689	my $anims = $facedata->{animinfo};	3056	my $anims = $facedata->{animinfo};
2690		3057
2691	while (my ($anim, $info) = each %$anims) {	3058	while (my ($anim, $info) = each %$anims) {
2692	cf::anim::set $anim, $info->{frames}, $info->{facings};	3059	cf::anim::set $anim, $info->{frames}, $info->{facings};
2693	Coro::cede;	3060	cf::cede_to_tick;
2694	}	3061	}
2695		3062
2696	cf::anim::invalidate_all; # d'oh	3063	cf::anim::invalidate_all; # d'oh
2697	}	3064	}
2698		3065
		3066	{
		3067	# TODO: for gcfclient pleasure, we should give resources
		3068	# that gcfclient doesn't grok a >10000 face index.
		3069	my $res = $facedata->{resource};
		3070
		3071	my $soundconf = delete $res->{"res/sound.conf"};
		3072
		3073	while (my ($name, $info) = each %$res) {
		3074	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3075	my $data;
		3076
		3077	if ($info->{type} & 1) {
		3078	# prepend meta info
		3079
		3080	my $meta = $enc->encode ({
		3081	name => $name,
		3082	%{ $info->{meta} || {} },
		3083	});
		3084
		3085	$data = pack "(w/a*)*", $meta, $info->{data};
		3086	} else {
		3087	$data = $info->{data};
		3088	}
		3089
		3090	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3091	cf::face::set_type $idx, $info->{type};
		3092
		3093	cf::cede_to_tick;
		3094	}
		3095
		3096	if ($soundconf) {
		3097	$soundconf = $enc->decode (delete $soundconf->{data});
		3098
		3099	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3100	my $sound = $soundconf->{compat}[$_]
		3101	or next;
		3102
		3103	my $face = cf::face::find "sound/$sound->[1]";
		3104	cf::sound::set $sound->[0] => $face;
		3105	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3106	}
		3107
		3108	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3109	my $face = cf::face::find "sound/$v";
		3110	cf::sound::set $k => $face;
		3111	}
		3112	}
		3113	}
		3114
2699	1	3115	1
2700	}	3116	}
2701		3117
		3118	register_exticmd fx_want => sub {
		3119	my ($ns, $want) = @_;
		3120
		3121	while (my ($k, $v) = each %$want) {
		3122	$ns->fx_want ($k, $v);
		3123	}
		3124	};
		3125
2702	sub reload_regions {	3126	sub reload_regions {
		3127	# HACK to clear player env face cache, we need some signal framework
		3128	# for this (global event?)
		3129	%ext::player_env::MUSIC_FACE_CACHE = ();
		3130
2703	load_resource_file "$MAPDIR/regions"	3131	load_resource_file "$MAPDIR/regions"
2704	or die "unable to load regions file\n";	3132	or die "unable to load regions file\n";
		3133
		3134	for (cf::region::list) {
		3135	$_->{match} = qr/$_->{match}/
		3136	if exists $_->{match};
		3137	}
2705	}	3138	}
2706		3139
2707	sub reload_facedata {	3140	sub reload_facedata {
2708	load_facedata "$DATADIR/facedata"	3141	load_facedata "$DATADIR/facedata"
2709	or die "unable to load facedata\n";	3142	or die "unable to load facedata\n";
…		…
2738		3171
2739	sub init {	3172	sub init {
2740	reload_resources;	3173	reload_resources;
2741	}	3174	}
2742		3175
2743	sub cfg_load {	3176	sub reload_config {
2744	open my $fh, "<:utf8", "$CONFDIR/config"	3177	open my $fh, "<:utf8", "$CONFDIR/config"
2745	or return;	3178	or return;
2746		3179
2747	local $/;	3180	local $/;
2748	*CFG = YAML::Syck::Load <$fh>;	3181	*CFG = YAML::Syck::Load <$fh>;
…		…
2764	sub main {	3197	sub main {
2765	# we must not ever block the main coroutine	3198	# we must not ever block the main coroutine
2766	local $Coro::idle = sub {	3199	local $Coro::idle = sub {
2767	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3200	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2768	(async {	3201	(async {
		3202	$Coro::current->{desc} = "IDLE BUG HANDLER";
2769	Event::one_event;	3203	Event::one_event;
2770	})->prio (Coro::PRIO_MAX);	3204	})->prio (Coro::PRIO_MAX);
2771	};	3205	};
2772		3206
2773	cfg_load;	3207	reload_config;
2774	db_init;	3208	db_init;
2775	load_extensions;	3209	load_extensions;
2776		3210
2777	$TICK_WATCHER->start;	3211	$TICK_WATCHER->start;
2778	Event::loop;	3212	Event::loop;
…		…
2971	warn "reloading cf.pm";	3405	warn "reloading cf.pm";
2972	require cf;	3406	require cf;
2973	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3407	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2974		3408
2975	warn "loading config and database again";	3409	warn "loading config and database again";
2976	cf::cfg_load;	3410	cf::reload_config;
2977		3411
2978	warn "loading extensions";	3412	warn "loading extensions";
2979	cf::load_extensions;	3413	cf::load_extensions;
2980		3414
2981	warn "reattaching attachments to objects/players";	3415	warn "reattaching attachments to objects/players";
…		…
3017	register_command "reload" => sub {	3451	register_command "reload" => sub {
3018	my ($who, $arg) = @_;	3452	my ($who, $arg) = @_;
3019		3453
3020	if ($who->flag (FLAG_WIZ)) {	3454	if ($who->flag (FLAG_WIZ)) {
3021	$who->message ("reloading server.");	3455	$who->message ("reloading server.");
		3456	async {
		3457	$Coro::current->{desc} = "perl_reload";
3022	async { reload_perl };	3458	reload_perl;
		3459	};
3023	}	3460	}
3024	};	3461	};
3025		3462
3026	unshift @INC, $LIBDIR;	3463	unshift @INC, $LIBDIR;
3027		3464
…		…
3046	my $signal = new Coro::Signal;	3483	my $signal = new Coro::Signal;
3047	push @WAIT_FOR_TICK_BEGIN, $signal;	3484	push @WAIT_FOR_TICK_BEGIN, $signal;
3048	$signal->wait;	3485	$signal->wait;
3049	}	3486	}
3050		3487
3051	my $min = 1e6;#d#
3052	my $avg = 10;
3053	$TICK_WATCHER = Event->timer (	3488	$TICK_WATCHER = Event->timer (
3054	reentrant => 0,	3489	reentrant => 0,
3055	parked => 1,	3490	parked => 1,
3056	prio => 0,	3491	prio => 0,
3057	at => $NEXT_TICK || $TICK,	3492	at => $NEXT_TICK || $TICK,
…		…
3065		3500
3066	$NOW = $tick_start = Event::time;	3501	$NOW = $tick_start = Event::time;
3067		3502
3068	cf::server_tick; # one server iteration	3503	cf::server_tick; # one server iteration
3069		3504
3070	0 && sync_job {#d#
3071	for(1..10) {
3072	my $t = Event::time;
3073	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3074	or die;
3075
3076	$map->width (50);
3077	$map->height (50);
3078	$map->alloc;
3079	$map->_load_objects ("/tmp/x.map", 1);
3080	my $t = Event::time - $t;
3081
3082	#next unless $t < 0.0013;#d#
3083	if ($t < $min) {
3084	$min = $t;
3085	}
3086	$avg = $avg * 0.99 + $t * 0.01;
3087	}
3088	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3089	exit 0;
3090	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3091	};
3092
3093	$RUNTIME += $TICK;	3505	$RUNTIME += $TICK;
3094	$NEXT_TICK += $TICK;	3506	$NEXT_TICK += $TICK;
3095		3507
3096	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3508	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3097	$NEXT_RUNTIME_WRITE = $NOW + 10;	3509	$NEXT_RUNTIME_WRITE = $NOW + 10;
3098	Coro::async_pool {	3510	Coro::async_pool {
		3511	$Coro::current->{desc} = "runtime saver";
3099	write_runtime	3512	write_runtime
3100	or warn "ERROR: unable to write runtime file: $!";	3513	or warn "ERROR: unable to write runtime file: $!";
3101	};	3514	};
3102	}	3515	}
3103		3516
3104	# my $AFTER = Event::time;
3105	# warn $AFTER - $NOW;#d#
3106
3107	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3517	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3108	$sig->send;	3518	$sig->send;
3109	}	3519	}
3110	while (my $sig = shift @WAIT_FOR_TICK) {	3520	while (my $sig = shift @WAIT_FOR_TICK) {
3111	$sig->send;	3521	$sig->send;
…		…
3121		3531
3122	$LOAD = ($NOW - $tick_start) / $TICK;	3532	$LOAD = ($NOW - $tick_start) / $TICK;
3123	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3533	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3124		3534
3125	_post_tick;	3535	_post_tick;
3126
3127
3128	},	3536	},
3129	);	3537	);
3130		3538
3131	{	3539	{
		3540	BDB::min_parallel 8;
3132	BDB::max_poll_time $TICK * 0.1;	3541	BDB::max_poll_time $TICK * 0.1;
3133	$BDB_POLL_WATCHER = Event->io (	3542	$BDB_POLL_WATCHER = Event->io (
3134	reentrant => 0,	3543	reentrant => 0,
3135	fd => BDB::poll_fileno,	3544	fd => BDB::poll_fileno,
3136	poll => 'r',	3545	poll => 'r',
3137	prio => 0,	3546	prio => 0,
3138	data => WF_AUTOCANCEL,	3547	data => WF_AUTOCANCEL,
3139	cb => \&BDB::poll_cb,	3548	cb => \&BDB::poll_cb,
3140	);	3549	);
3141	BDB::min_parallel 8;
3142		3550
3143	BDB::set_sync_prepare {	3551	BDB::set_sync_prepare {
3144	my $status;	3552	my $status;
3145	my $current = $Coro::current;	3553	my $current = $Coro::current;
3146	(	3554	(
…		…
3155	)	3563	)
3156	};	3564	};
3157		3565
3158	unless ($DB_ENV) {	3566	unless ($DB_ENV) {
3159	$DB_ENV = BDB::db_env_create;	3567	$DB_ENV = BDB::db_env_create;
		3568	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3569	| BDB::LOG_AUTOREMOVE, 1);
		3570	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3571	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3160		3572
3161	cf::sync_job {	3573	cf::sync_job {
3162	eval {	3574	eval {
3163	BDB::db_env_open	3575	BDB::db_env_open
3164	$DB_ENV,	3576	$DB_ENV,
…		…
3166	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3578	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3167	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3579	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3168	0666;	3580	0666;
3169		3581
3170	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3582	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3171
3172	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3173	$DB_ENV->set_lk_detect;
3174	};	3583	};
3175		3584
3176	cf::cleanup "db_env_open(db): $@" if $@;	3585	cf::cleanup "db_env_open(db): $@" if $@;
3177	};	3586	};
3178	}	3587	}
		3588
		3589	$BDB_DEADLOCK_WATCHER = Event->timer (
		3590	after => 3,
		3591	interval => 1,
		3592	hard => 1,
		3593	prio => 0,
		3594	data => WF_AUTOCANCEL,
		3595	cb => sub {
		3596	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3597	},
		3598	);
		3599	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3600	after => 11,
		3601	interval => 60,
		3602	hard => 1,
		3603	prio => 0,
		3604	data => WF_AUTOCANCEL,
		3605	cb => sub {
		3606	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3607	},
		3608	);
		3609	$BDB_TRICKLE_WATCHER = Event->timer (
		3610	after => 5,
		3611	interval => 10,
		3612	hard => 1,
		3613	prio => 0,
		3614	data => WF_AUTOCANCEL,
		3615	cb => sub {
		3616	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3617	},
		3618	);
3179	}	3619	}
3180		3620
3181	{	3621	{
3182	IO::AIO::min_parallel 8;	3622	IO::AIO::min_parallel 8;
3183		3623
…		…
3202		3642
3203	# limit the # of concurrent backtraces	3643	# limit the # of concurrent backtraces
3204	if ($_log_backtrace < 2) {	3644	if ($_log_backtrace < 2) {
3205	++$_log_backtrace;	3645	++$_log_backtrace;
3206	async {	3646	async {
		3647	$Coro::current->{desc} = "abt $msg";
		3648
3207	my @bt = fork_call {	3649	my @bt = fork_call {
3208	@addr = map { sprintf "%x", $_ } @addr;	3650	@addr = map { sprintf "%x", $_ } @addr;
3209	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3651	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3210	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	3652	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3211	or die "addr2line: $!";	3653	or die "addr2line: $!";

Diff Legend

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