[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.374 by root, Wed Sep 19 22:07:16 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';
…		…
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	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;	502	reset_signals;
436	local $SIG{__WARN__};	503	&$cb
437	local $SIG{__DIE__};	504	}, @args;
438	local $Coro::idle;
439	$Coro::current->prio (Coro::PRIO_MAX);
440	eval {
441	close $fh1;
442		505
443	my @res = eval { $cb->(@args) };	506	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	}	507	}
461		508
462	=item $value = cf::db_get $family => $key	509	=item $value = cf::db_get $family => $key
463		510
464	Returns a single value from the environment database.	511	Returns a single value from the environment database.
…		…
466	=item cf::db_put $family => $key => $value	513	=item cf::db_put $family => $key => $value
467		514
468	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
469	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).
470		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
471	=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	}
472		541
473	our $DB;	542	our $DB;
474		543
475	sub db_init {	544	sub db_init {
476	unless ($DB) {
477	$DB = BDB::db_create $DB_ENV;
478
479	cf::sync_job {	545	cf::sync_job {
480	eval {	546	$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	}	547	};
490	}	548	}
491		549
492	sub db_get($$) {	550	sub db_get($$) {
493	my $key = "$_[0]/$_[1]";	551	my $key = "$_[0]/$_[1]";
494		552
…		…
544	if (1) {	602	if (1) {
545	$md5 =	603	$md5 =
546	join "\x00",	604	join "\x00",
547	$processversion,	605	$processversion,
548	map {	606	map {
549	Coro::cede;	607	cf::cede_to_tick;
550	($src->[$_], Digest::MD5::md5_hex $data[$_])	608	($src->[$_], Digest::MD5::md5_hex $data[$_])
551	} 0.. $#$src;	609	} 0.. $#$src;
552		610
553		611
554	my $dbmd5 = db_get cache => "$id/md5";	612	my $dbmd5 = db_get cache => "$id/md5";
…		…
860	";	918	";
861	die if $@;	919	die if $@;
862	}	920	}
863		921
864	our $override;	922	our $override;
865	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?
866		924
867	sub override {	925	sub override {
868	$override = 1;	926	$override = 1;
869	@invoke_results = ();	927	@INVOKE_RESULTS = (@_);
870	}	928	}
871		929
872	sub do_invoke {	930	sub do_invoke {
873	my $event = shift;	931	my $event = shift;
874	my $callbacks = shift;	932	my $callbacks = shift;
875		933
876	@invoke_results = ();	934	@INVOKE_RESULTS = ();
877		935
878	local $override;	936	local $override;
879		937
880	for (@$callbacks) {	938	for (@$callbacks) {
881	eval { &{$_->[1]} };	939	eval { &{$_->[1]} };
…		…
898		956
899	Generate an object-specific event with the given arguments.	957	Generate an object-specific event with the given arguments.
900		958
901	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
902	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
903	results (if you must, access C<@cf::invoke_results> directly).	961	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904		962
905	=back	963	=back
906		964
907	=cut	965	=cut
908		966
909	#############################################################################	967	#############################################################################
910	# 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	}
911		980
912	sub reattach {	981	sub reattach {
913	# basically do the same as instantiate, without calling instantiate	982	# basically do the same as instantiate, without calling instantiate
914	my ($obj) = @_;	983	my ($obj) = @_;
915		984
…		…
962	sub object_freezer_save {	1031	sub object_freezer_save {
963	my ($filename, $rdata, $objs) = @_;	1032	my ($filename, $rdata, $objs) = @_;
964		1033
965	sync_job {	1034	sync_job {
966	if (length $$rdata) {	1035	if (length $$rdata) {
		1036	utf8::decode (my $decname = $filename);
967	warn sprintf "saving %s (%d,%d)\n",	1037	warn sprintf "saving %s (%d,%d)\n",
968	$filename, length $$rdata, scalar @$objs;	1038	$decname, length $$rdata, scalar @$objs;
969		1039
970	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1040	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
971	chmod SAVE_MODE, $fh;	1041	chmod SAVE_MODE, $fh;
972	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1042	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
973	aio_fsync $fh if $cf::USE_FSYNC;	1043	aio_fsync $fh if $cf::USE_FSYNC;
…		…
992	}	1062	}
993	} else {	1063	} else {
994	aio_unlink $filename;	1064	aio_unlink $filename;
995	aio_unlink "$filename.pst";	1065	aio_unlink "$filename.pst";
996	}	1066	}
997	}	1067	};
998	}	1068	}
999		1069
1000	sub object_freezer_as_string {	1070	sub object_freezer_as_string {
1001	my ($rdata, $objs) = @_;	1071	my ($rdata, $objs) = @_;
1002		1072
…		…
1014	or return;	1084	or return;
1015		1085
1016	unless (aio_stat "$filename.pst") {	1086	unless (aio_stat "$filename.pst") {
1017	(aio_load "$filename.pst", $av) >= 0	1087	(aio_load "$filename.pst", $av) >= 0
1018	or return;	1088	or return;
		1089
1019	$av = eval { (Storable::thaw $av)->{objs} };	1090	$av = eval { (Storable::thaw $av)->{objs} };
1020	}	1091	}
1021		1092
		1093	utf8::decode (my $decname = $filename);
1022	warn sprintf "loading %s (%d)\n",	1094	warn sprintf "loading %s (%d,%d)\n",
1023	$filename, length $data, scalar @{$av \|\| []};	1095	$decname, length $data, scalar @{$av \|\| []};
		1096
1024	return ($data, $av);	1097	($data, $av)
1025	}	1098	}
1026		1099
1027	=head2 COMMAND CALLBACKS	1100	=head2 COMMAND CALLBACKS
1028		1101
1029	=over 4	1102	=over 4
…		…
1102	my ($pl, $buf) = @_;	1175	my ($pl, $buf) = @_;
1103		1176
1104	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1177	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105		1178
1106	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
1107	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1187	if (my $cb = $EXTCMD{$type}) {
1108	if (my %reply = $cb->($pl, $msg)) {	1188	@reply = $cb->($pl, @payload);
1109	$pl->ext_reply ($msg->{msgid}, %reply);
1110	}
1111	}	1189	}
		1190
		1191	$pl->ext_reply ($reply, @reply)
		1192	if $reply;
		1193
1112	} else {	1194	} else {
1113	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1195	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114	}	1196	}
1115		1197
1116	cf::override;	1198	cf::override;
…		…
1206		1288
1207	=head3 cf::player	1289	=head3 cf::player
1208		1290
1209	=over 4	1291	=over 4
1210		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
1211	=item cf::player::find $login	1307	=item cf::player::find $login
1212		1308
1213	Returns the given player object, loading it if necessary (might block).	1309	Returns the given player object, loading it if necessary (might block).
1214		1310
1215	=cut	1311	=cut
…		…
1250	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1346	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1251	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1347	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1252	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1348	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1253	aio_unlink +(playerdir $login) . "/$login.pl";	1349	aio_unlink +(playerdir $login) . "/$login.pl";
1254		1350
1255	my $pl = load_pl path $login	1351	my $f = new_from_file cf::object::thawer path $login
1256	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;
1257	$cf::PLAYER{$login} = $pl	1358	$cf::PLAYER{$login} = $pl
1258	}	1359	}
1259	}	1360	}
1260	}	1361	}
1261		1362
…		…
1271		1372
1272	aio_mkdir playerdir $pl, 0770;	1373	aio_mkdir playerdir $pl, 0770;
1273	$pl->{last_save} = $cf::RUNTIME;	1374	$pl->{last_save} = $cf::RUNTIME;
1274		1375
1275	$pl->save_pl ($path);	1376	$pl->save_pl ($path);
1276	Coro::cede;	1377	cf::cede_to_tick;
1277	}	1378	}
1278		1379
1279	sub new($) {	1380	sub new($) {
1280	my ($login) = @_;	1381	my ($login) = @_;
1281		1382
…		…
1285	$self->{deny_save} = 1;	1386	$self->{deny_save} = 1;
1286		1387
1287	$cf::PLAYER{$login} = $self;	1388	$cf::PLAYER{$login} = $self;
1288		1389
1289	$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 (@_);
1290	}	1401	}
1291		1402
1292	=item $pl->quit_character	1403	=item $pl->quit_character
1293		1404
1294	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
…		…
1349	or return [];	1460	or return [];
1350		1461
1351	my @logins;	1462	my @logins;
1352		1463
1353	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") {
1354	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1469	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1355	aio_read $fh, 0, 512, my $buf, 0 or next;	1470	aio_read $fh, 0, 512, my $buf, 0 or next;
1356	$buf !~ /^password -------------$/m or next; # official not-valid tag	1471	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1472	}
1357		1473
1358	utf8::decode $login;	1474	utf8::decode $login;
1359	push @logins, $login;	1475	push @logins, $login;
1360	}	1476	}
1361		1477
…		…
1399	sub expand_cfpod {	1515	sub expand_cfpod {
1400	((my $self), (local $_)) = @_;	1516	((my $self), (local $_)) = @_;
1401		1517
1402	# escape & and <	1518	# escape & and <
1403	s/&/&/g;	1519	s/&/&/g;
1404	s/(?<![BIUGH])</</g;	1520	s/(?<![BIUGHT])</</g;
1405		1521
1406	# 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
1407		1523
1408	1 while	1524	1 while
1409	# replace B<>, I<>, U<> etc.	1525	# replace B<>, I<>, U<> etc.
1410	s/B<([^\>]*)>/<b>$1<\/b>/	1526	s/B<([^\>]*)>/<b>$1<\/b>/
1411	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1527	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1412	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1528	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1529	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1413	# replace G<male\|female> tags	1530	# replace G<male\|female> tags
1414	\|\| s{G<([^>\|])\\|([^>])>}{	1531	\|\| s{G<([^>\|])\\|([^>])>}{
1415	$self->gender ? $2 : $1	1532	$self->gender ? $2 : $1
1416	}ge	1533	}ge
1417	# replace H<hint text>	1534	# replace H<hint text>
…		…
1438	sub hintmode {	1555	sub hintmode {
1439	$_[0]{hintmode} = $_[1] if @_ > 1;	1556	$_[0]{hintmode} = $_[1] if @_ > 1;
1440	$_[0]{hintmode}	1557	$_[0]{hintmode}
1441	}	1558	}
1442		1559
1443	=item $player->ext_reply ($msgid, %msg)	1560	=item $player->ext_reply ($msgid, @msg)
1444		1561
1445	Sends an ext reply to the player.	1562	Sends an ext reply to the player.
1446		1563
1447	=cut	1564	=cut
1448		1565
1449	sub ext_reply($$%) {	1566	sub ext_reply($$@) {
1450	my ($self, $id, %msg) = @_;	1567	my ($self, $id, @msg) = @_;
1451		1568
1452	$msg{msgid} = $id;	1569	$self->ns->ext_reply ($id, @msg)
1453	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1454	}	1570	}
1455		1571
1456	=item $player->ext_event ($type, %msg)	1572	=item $player->ext_msg ($type, @msg)
1457		1573
1458	Sends an ext event to the client.	1574	Sends an ext event to the client.
1459		1575
1460	=cut	1576	=cut
1461		1577
1462	sub ext_event($$%) {	1578	sub ext_msg($$@) {
1463	my ($self, $type, %msg) = @_;	1579	my ($self, $type, @msg) = @_;
1464		1580
1465	$self->ns->ext_event ($type, %msg);	1581	$self->ns->ext_msg ($type, @msg);
1466	}	1582	}
1467		1583
1468	=head3 cf::region	1584	=head3 cf::region
1469		1585
1470	=over 4	1586	=over 4
…		…
1483	my ($path) = @_;	1599	my ($path) = @_;
1484		1600
1485	my ($match, $specificity);	1601	my ($match, $specificity);
1486		1602
1487	for my $region (list) {	1603	for my $region (list) {
1488	if ($region->match && $path =~ $region->match) {	1604	if ($region->{match} && $path =~ $region->{match}) {
1489	($match, $specificity) = ($region, $region->specificity)	1605	($match, $specificity) = ($region, $region->specificity)
1490	if $region->specificity > $specificity;	1606	if $region->specificity > $specificity;
1491	}	1607	}
1492	}	1608	}
1493		1609
…		…
1613	$self->init; # pass $1 etc.	1729	$self->init; # pass $1 etc.
1614	return $self;	1730	return $self;
1615	}	1731	}
1616	}	1732	}
1617		1733
1618	Carp::carp "unable to resolve path '$path' (base '$base').";	1734	Carp::cluck "unable to resolve path '$path' (base '$base').";
1619	()	1735	()
1620	}	1736	}
1621		1737
1622	sub init {	1738	sub init {
1623	my ($self) = @_;	1739	my ($self) = @_;
…		…
1686		1802
1687	sub load_header_from($) {	1803	sub load_header_from($) {
1688	my ($self, $path) = @_;	1804	my ($self, $path) = @_;
1689		1805
1690	utf8::encode $path;	1806	utf8::encode $path;
1691	#aio_open $path, O_RDONLY, 0	1807	my $f = new_from_file cf::object::thawer $path
1692	# or return;
1693
1694	$self->_load_header ($path)
1695	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;
1696		1815
1697	$self->{load_path} = $path;	1816	$self->{load_path} = $path;
1698		1817
1699	1	1818	1
1700	}	1819	}
…		…
1754	sub find {	1873	sub find {
1755	my ($path, $origin) = @_;	1874	my ($path, $origin) = @_;
1756		1875
1757	$path = normalise $path, $origin && $origin->path;	1876	$path = normalise $path, $origin && $origin->path;
1758		1877
		1878	cf::lock_wait "map_data:$path";#d#remove
1759	cf::lock_wait "map_find:$path";	1879	cf::lock_wait "map_find:$path";
1760		1880
1761	$cf::MAP{$path} \|\| do {	1881	$cf::MAP{$path} \|\| do {
1762	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
1763	my $map = new_from_path cf::map $path	1885	my $map = new_from_path cf::map $path
1764	or return;	1886	or return;
1765		1887
1766	$map->{last_save} = $cf::RUNTIME;	1888	$map->{last_save} = $cf::RUNTIME;
1767		1889
…		…
1769	or return;	1891	or return;
1770		1892
1771	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1893	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1772	# doing this can freeze the server in a sync job, obviously	1894	# doing this can freeze the server in a sync job, obviously
1773	#$cf::WAIT_FOR_TICK->wait;	1895	#$cf::WAIT_FOR_TICK->wait;
		1896	undef $guard1;
		1897	undef $guard2;
1774	$map->reset;	1898	$map->reset;
1775	undef $guard;
1776	return find $path;	1899	return find $path;
1777	}	1900	}
1778		1901
1779	$cf::MAP{$path} = $map	1902	$cf::MAP{$path} = $map
1780	}	1903	}
…		…
1789	local $self->{deny_reset} = 1; # loading can take a long time	1912	local $self->{deny_reset} = 1; # loading can take a long time
1790		1913
1791	my $path = $self->{path};	1914	my $path = $self->{path};
1792		1915
1793	{	1916	{
1794	my $guard = cf::lock_acquire "map_load:$path";	1917	my $guard = cf::lock_acquire "map_data:$path";
1795		1918
		1919	return unless $self->valid;
1796	return if $self->in_memory != cf::MAP_SWAPPED;	1920	return unless $self->in_memory == cf::MAP_SWAPPED;
1797		1921
1798	$self->in_memory (cf::MAP_LOADING);	1922	$self->in_memory (cf::MAP_LOADING);
1799		1923
1800	$self->alloc;	1924	$self->alloc;
1801		1925
1802	$self->pre_load;	1926	$self->pre_load;
1803	Coro::cede;	1927	cf::cede_to_tick;
1804		1928
		1929	my $f = new_from_file cf::object::thawer $self->{load_path};
		1930	$f->skip_block;
1805	$self->_load_objects ($self->{load_path}, 1)	1931	$self->_load_objects ($f)
1806	or return;	1932	or return;
1807		1933
1808	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1934	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1809	if delete $self->{load_original};	1935	if delete $self->{load_original};
1810		1936
1811	if (my $uniq = $self->uniq_path) {	1937	if (my $uniq = $self->uniq_path) {
1812	utf8::encode $uniq;	1938	utf8::encode $uniq;
1813	if (aio_open $uniq, O_RDONLY, 0) {	1939	unless (aio_stat $uniq) {
		1940	if (my $f = new_from_file cf::object::thawer $uniq) {
1814	$self->clear_unique_items;	1941	$self->clear_unique_items;
1815	$self->_load_objects ($uniq, 0);	1942	$self->_load_objects ($f);
		1943	$f->resolve_delayed_derefs;
		1944	}
1816	}	1945	}
1817	}	1946	}
1818		1947
1819	Coro::cede;	1948	$f->resolve_delayed_derefs;
		1949
		1950	cf::cede_to_tick;
1820	# now do the right thing for maps	1951	# now do the right thing for maps
1821	$self->link_multipart_objects;	1952	$self->link_multipart_objects;
1822	$self->difficulty ($self->estimate_difficulty)	1953	$self->difficulty ($self->estimate_difficulty)
1823	unless $self->difficulty;	1954	unless $self->difficulty;
1824	Coro::cede;	1955	cf::cede_to_tick;
1825		1956
1826	unless ($self->{deny_activate}) {	1957	unless ($self->{deny_activate}) {
1827	$self->decay_objects;	1958	$self->decay_objects;
1828	$self->fix_auto_apply;	1959	$self->fix_auto_apply;
1829	$self->update_buttons;	1960	$self->update_buttons;
1830	Coro::cede;	1961	cf::cede_to_tick;
1831	$self->set_darkness_map;	1962	$self->set_darkness_map;
1832	Coro::cede;	1963	cf::cede_to_tick;
1833	$self->activate;	1964	$self->activate;
1834	}	1965	}
		1966
		1967	$self->{last_save} = $cf::RUNTIME;
		1968	$self->last_access ($cf::RUNTIME);
1835		1969
1836	$self->in_memory (cf::MAP_IN_MEMORY);	1970	$self->in_memory (cf::MAP_IN_MEMORY);
1837	}	1971	}
1838		1972
1839	$self->post_load;	1973	$self->post_load;
…		…
1850		1984
1851	$self	1985	$self
1852	}	1986	}
1853		1987
1854	# 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
1855	sub load_diag {	1989	sub load_neighbours {
1856	my ($map) = @_;	1990	my ($map) = @_;
1857		1991
1858	my @diag; # diagonal neighbours	1992	my @neigh; # diagonal neighbours
1859		1993
1860	for (0 .. 3) {	1994	for (0 .. 3) {
1861	my $neigh = $map->tile_path ($_)	1995	my $neigh = $map->tile_path ($_)
1862	or next;	1996	or next;
1863	$neigh = find $neigh, $map	1997	$neigh = find $neigh, $map
1864	or next;	1998	or next;
1865	$neigh->load;	1999	$neigh->load;
1866		2000
		2001	push @neigh,
1867	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2002	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1868	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2003	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1869	}	2004	}
1870		2005
1871	for (@diag) {	2006	for (grep defined $_->[0], @neigh) {
		2007	my ($path, $origin) = @$_;
1872	my $neigh = find @$_	2008	my $neigh = find $path, $origin
1873	or next;	2009	or next;
1874	$neigh->load;	2010	$neigh->load;
1875	}	2011	}
1876	}	2012	}
1877		2013
…		…
1882	}	2018	}
1883		2019
1884	sub do_load_sync {	2020	sub do_load_sync {
1885	my ($map) = @_;	2021	my ($map) = @_;
1886		2022
		2023	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2024	if $Coro::current == $Coro::main;
		2025
1887	cf::sync_job { $map->load };	2026	cf::sync_job { $map->load };
1888	}	2027	}
1889		2028
1890	our %MAP_PREFETCH;	2029	our %MAP_PREFETCH;
1891	our $MAP_PREFETCHER = undef;	2030	our $MAP_PREFETCHER = undef;
1892		2031
1893	sub find_async {	2032	sub find_async {
1894	my ($path, $origin) = @_;	2033	my ($path, $origin, $load) = @_;
1895		2034
1896	$path = normalise $path, $origin && $origin->{path};	2035	$path = normalise $path, $origin && $origin->{path};
1897		2036
1898	if (my $map = $cf::MAP{$path}) {	2037	if (my $map = $cf::MAP{$path}) {
1899	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2038	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1900	}	2039	}
1901		2040
1902	undef $MAP_PREFETCH{$path};	2041	$MAP_PREFETCH{$path} \|= $load;
		2042
1903	$MAP_PREFETCHER \|\|= cf::async {	2043	$MAP_PREFETCHER \|\|= cf::async {
		2044	$Coro::current->{desc} = "map prefetcher";
		2045
1904	while (%MAP_PREFETCH) {	2046	while (%MAP_PREFETCH) {
1905	for my $path (keys %MAP_PREFETCH) {	2047	while (my ($k, $v) = each %MAP_PREFETCH) {
1906	my $map = find $path	2048	if (my $map = find $k) {
1907	or next;
1908	$map->load;	2049	$map->load if $v;
		2050	}
1909		2051
1910	delete $MAP_PREFETCH{$path};	2052	delete $MAP_PREFETCH{$k};
1911	}	2053	}
1912	}	2054	}
1913	undef $MAP_PREFETCHER;	2055	undef $MAP_PREFETCHER;
1914	};	2056	};
1915	$MAP_PREFETCHER->prio (6);	2057	$MAP_PREFETCHER->prio (6);
…		…
1918	}	2060	}
1919		2061
1920	sub save {	2062	sub save {
1921	my ($self) = @_;	2063	my ($self) = @_;
1922		2064
1923	my $lock = cf::lock_acquire "map_data:" . $self->path;	2065	my $lock = cf::lock_acquire "map_data:$self->{path}";
1924		2066
1925	$self->{last_save} = $cf::RUNTIME;	2067	$self->{last_save} = $cf::RUNTIME;
1926		2068
1927	return unless $self->dirty;	2069	return unless $self->dirty;
1928		2070
…		…
1934	return if $self->{deny_save};	2076	return if $self->{deny_save};
1935		2077
1936	local $self->{last_access} = $self->last_access;#d#	2078	local $self->{last_access} = $self->last_access;#d#
1937		2079
1938	cf::async {	2080	cf::async {
		2081	$Coro::current->{desc} = "map player save";
1939	$_->contr->save for $self->players;	2082	$_->contr->save for $self->players;
1940	};	2083	};
1941		2084
1942	if ($uniq) {	2085	if ($uniq) {
1943	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	2086	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
…		…
1951	my ($self) = @_;	2094	my ($self) = @_;
1952		2095
1953	# save first because save cedes	2096	# save first because save cedes
1954	$self->save;	2097	$self->save;
1955		2098
1956	my $lock = cf::lock_acquire "map_data:" . $self->path;	2099	my $lock = cf::lock_acquire "map_data:$self->{path}";
1957		2100
1958	return if $self->players;	2101	return if $self->players;
1959	return if $self->in_memory != cf::MAP_IN_MEMORY;	2102	return if $self->in_memory != cf::MAP_IN_MEMORY;
1960	return if $self->{deny_save};	2103	return if $self->{deny_save};
1961		2104
		2105	$self->in_memory (cf::MAP_SWAPPED);
		2106
		2107	$self->deactivate;
		2108	$_->clear_links_to ($self) for values %cf::MAP;
1962	$self->clear;	2109	$self->clear;
1963	$self->in_memory (cf::MAP_SWAPPED);
1964	}	2110	}
1965		2111
1966	sub reset_at {	2112	sub reset_at {
1967	my ($self) = @_;	2113	my ($self) = @_;
1968		2114
…		…
2000	if $uniq;	2146	if $uniq;
2001	}	2147	}
2002		2148
2003	delete $cf::MAP{$self->path};	2149	delete $cf::MAP{$self->path};
2004		2150
		2151	$self->deactivate;
		2152	$_->clear_links_to ($self) for values %cf::MAP;
2005	$self->clear;	2153	$self->clear;
2006
2007	$_->clear_links_to ($self) for values %cf::MAP;
2008		2154
2009	$self->unlink_save;	2155	$self->unlink_save;
2010	$self->destroy;	2156	$self->destroy;
2011	}	2157	}
2012		2158
2013	my $nuke_counter = "aaaa";	2159	my $nuke_counter = "aaaa";
2014		2160
2015	sub nuke {	2161	sub nuke {
2016	my ($self) = @_;	2162	my ($self) = @_;
2017		2163
		2164	{
		2165	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2166
2018	delete $cf::MAP{$self->path};	2167	delete $cf::MAP{$self->path};
2019		2168
2020	$self->unlink_save;	2169	$self->unlink_save;
2021		2170
2022	bless $self, "cf::map";	2171	bless $self, "cf::map";
2023	delete $self->{deny_reset};	2172	delete $self->{deny_reset};
2024	$self->{deny_save} = 1;	2173	$self->{deny_save} = 1;
2025	$self->reset_timeout (1);	2174	$self->reset_timeout (1);
2026	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2175	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2027		2176
2028	$cf::MAP{$self->path} = $self;	2177	$cf::MAP{$self->path} = $self;
		2178	}
2029		2179
2030	$self->reset; # polite request, might not happen	2180	$self->reset; # polite request, might not happen
2031	}	2181	}
2032		2182
2033	=item $maps = cf::map::tmp_maps	2183	=item $maps = cf::map::tmp_maps
…		…
2109		2259
2110	sub inv_recursive {	2260	sub inv_recursive {
2111	inv_recursive_ inv $_[0]	2261	inv_recursive_ inv $_[0]
2112	}	2262	}
2113		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
2114	package cf;	2295	package cf;
2115		2296
2116	=back	2297	=back
2117		2298
2118	=head3 cf::object::player	2299	=head3 cf::object::player
…		…
2140		2321
2141	} else {	2322	} else {
2142	my $pl = $self->contr;	2323	my $pl = $self->contr;
2143		2324
2144	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2325	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145	my $diag = $pl->{npc_dialog};	2326	my $dialog = $pl->{npc_dialog};
2146	$diag->{pl}->ext_reply (	2327	$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		2328
2153	} else {	2329	} else {
2154	$msg = $npc->name . " says: $msg" if $npc;	2330	$msg = $npc->name . " says: $msg" if $npc;
2155	$self->message ($msg, $flags);	2331	$self->message ($msg, $flags);
2156	}	2332	}
2157	}	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 (@_);
2158	}	2344	}
2159		2345
2160	=item $player_object->may ("access")	2346	=item $player_object->may ("access")
2161		2347
2162	Returns wether the given player is authorized to access resource "access"	2348	Returns wether the given player is authorized to access resource "access"
…		…
2241	# use -1 or undef as default coordinates, not 0, 0	2427	# use -1 or undef as default coordinates, not 0, 0
2242	($x, $y) = ($map->enter_x, $map->enter_y)	2428	($x, $y) = ($map->enter_x, $map->enter_y)
2243	if $x <=0 && $y <= 0;	2429	if $x <=0 && $y <= 0;
2244		2430
2245	$map->load;	2431	$map->load;
2246	$map->load_diag;	2432	$map->load_neighbours;
2247		2433
2248	return unless $self->contr->active;	2434	return unless $self->contr->active;
2249	$self->activate_recursive;	2435	$self->activate_recursive;
2250		2436
2251	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2437	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252	$self->enter_map ($map, $x, $y);	2438	$self->enter_map ($map, $x, $y);
2253	}	2439	}
2254		2440
2255	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2441	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256		2442
2257	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
2258	her, loading and preparing them map, calling the provided $check callback	2444	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	2445	that has to return the map if sucecssful, and then unfreezes the player on
2260	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.
2261		2448
2262	=cut	2449	=cut
2263		2450
2264	our $GOTOGEN;	2451	our $GOTOGEN;
2265		2452
2266	sub cf::object::player::goto {	2453	sub cf::object::player::goto {
2267	my ($self, $path, $x, $y, $check) = @_;	2454	my ($self, $path, $x, $y, $check, $done) = @_;
2268		2455
2269	# 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
2270	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2457	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271		2458
2272	$self->enter_link;	2459	$self->enter_link;
2273		2460
2274	(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
2275	my $map = eval {	2483	my $map = eval {
2276	my $map = cf::map::find $path;	2484	my $map = defined $path ? cf::map::find $path : undef;
2277		2485
2278	if ($map) {	2486	if ($map) {
2279	$map = $map->customise_for ($self);	2487	$map = $map->customise_for ($self);
2280	$map = $check->($map) if $check && $map;	2488	$map = $check->($map) if $check && $map;
2281	} else {	2489	} else {
2282	$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);
2283	}	2491	}
2284		2492
2285	$map	2493	$map
2286	};	2494	};
2287		2495
…		…
2292		2500
2293	if ($gen == $self->{_goto_generation}) {	2501	if ($gen == $self->{_goto_generation}) {
2294	delete $self->{_goto_generation};	2502	delete $self->{_goto_generation};
2295	$self->leave_link ($map, $x, $y);	2503	$self->leave_link ($map, $x, $y);
2296	}	2504	}
		2505
		2506	$done->() if $done;
2297	})->prio (1);	2507	})->prio (1);
2298	}	2508	}
2299		2509
2300	=item $player_object->enter_exit ($exit_object)	2510	=item $player_object->enter_exit ($exit_object)
2301		2511
…		…
2375	# if exit is damned, update players death & WoR home-position	2585	# if exit is damned, update players death & WoR home-position
2376	$self->contr->savebed ($slaying, $hp, $sp)	2586	$self->contr->savebed ($slaying, $hp, $sp)
2377	if $exit->flag (FLAG_DAMNED);	2587	if $exit->flag (FLAG_DAMNED);
2378		2588
2379	(async {	2589	(async {
		2590	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2591
2380	$self->deactivate_recursive; # just to be sure	2592	$self->deactivate_recursive; # just to be sure
2381	unless (eval {	2593	unless (eval {
2382	$self->goto ($slaying, $hp, $sp);	2594	$self->goto ($slaying, $hp, $sp);
2383		2595
2384	1;	2596	1;
…		…
2410		2622
2411	utf8::encode $text;	2623	utf8::encode $text;
2412	$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);
2413	}	2625	}
2414		2626
2415	=item $client->send_msg ($color, $type, $msg, [extra...])	2627	=item $client->send_msg ($channel, $msg, $color, [extra...])
2416		2628
2417	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
2418	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
2419	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
2420	the message unless the client supports the msg packet.	2632	the message unless the client supports the msg packet.
2421		2633
2422	=cut	2634	=cut
2423		2635
		2636	our %CHANNEL = (
		2637	"c/identify" => {
		2638	id => "identify",
		2639	title => "Identify",
		2640	reply => undef,
		2641	tooltip => "Items recently identified",
		2642	},
		2643	"c/examine" => {
		2644	id => "examine",
		2645	title => "Examine",
		2646	reply => undef,
		2647	tooltip => "Signs and other items you examined",
		2648	},
		2649	);
		2650
2424	sub cf::client::send_msg {	2651	sub cf::client::send_msg {
2425	my ($self, $color, $type, $msg, @extra) = @_;	2652	my ($self, $channel, $msg, $color, @extra) = @_;
2426		2653
2427	$msg = $self->pl->expand_cfpod ($msg);	2654	$msg = $self->pl->expand_cfpod ($msg);
2428		2655
		2656	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2657
		2658	# check predefined channels, for the benefit of C
		2659	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};
		2660
		2661	if (ref $channel) {
		2662	# send meta info to client, if not yet sent
		2663	unless (exists $self->{channel}{$channel->{id}}) {
		2664	$self->{channel}{$channel->{id}} = $channel;
		2665	$self->ext_msg (channel_info => $channel)
		2666	if $self->can_msg;
		2667	}
		2668
		2669	$channel = $channel->{id};
		2670	}
		2671
2429	return unless @extra \|\| length $msg;	2672	return unless @extra \|\| length $msg;
2430		2673
2431	if ($self->can_msg) {	2674	if ($self->can_msg) {
		2675	# default colour, mask it out
		2676	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2677	if $color & cf::NDI_DEF;
		2678
2432	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));	2679	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2680	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2433	} else {	2681	} 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) {	2682	if ($color >= 0) {
		2683	# replace some tags by gcfclient-compatible ones
		2684	for ($msg) {
		2685	1 while
		2686	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2687	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2688	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2689	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2690	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2691	}
		2692
		2693	$color &= cf::NDI_COLOR_MASK;
		2694
		2695	utf8::encode $msg;
		2696
2445	if (0 && $msg =~ /\[/) {	2697	if (0 && $msg =~ /\[/) {
		2698	# COMMAND/INFO
2446	$self->send_packet ("drawextinfo $color 4 0 $msg")	2699	$self->send_packet ("drawextinfo $color 10 8 $msg")
2447	} else {	2700	} else {
2448	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2701	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2449	$self->send_packet ("drawinfo $color $msg")	2702	$self->send_packet ("drawinfo $color $msg")
2450	}	2703	}
2451	}	2704	}
2452	}	2705	}
2453	}	2706	}
2454		2707
2455	=item $client->ext_event ($type, %msg)	2708	=item $client->ext_msg ($type, @msg)
2456		2709
2457	Sends an ext event to the client.	2710	Sends an ext event to the client.
2458		2711
2459	=cut	2712	=cut
2460		2713
2461	sub cf::client::ext_event($$%) {	2714	sub cf::client::ext_msg($$@) {
2462	my ($self, $type, %msg) = @_;	2715	my ($self, $type, @msg) = @_;
2463		2716
		2717	if ($self->extcmd == 2) {
		2718	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2719	} elsif ($self->extcmd == 1) { # TODO: remove
2464	$msg{msgtype} = "event_$type";	2720	push @msg, msgtype => "event_$type";
2465	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2721	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2722	}
		2723	}
		2724
		2725	=item $client->ext_reply ($msgid, @msg)
		2726
		2727	Sends an ext reply to the client.
		2728
		2729	=cut
		2730
		2731	sub cf::client::ext_reply($$@) {
		2732	my ($self, $id, @msg) = @_;
		2733
		2734	if ($self->extcmd == 2) {
		2735	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2736	} elsif ($self->extcmd == 1) {
		2737	#TODO: version 1, remove
		2738	unshift @msg, msgtype => "reply", msgid => $id;
		2739	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2740	}
2466	}	2741	}
2467		2742
2468	=item $success = $client->query ($flags, "text", \&cb)	2743	=item $success = $client->query ($flags, "text", \&cb)
2469		2744
2470	Queues a query to the client, calling the given callback with	2745	Queues a query to the client, calling the given callback with
…		…
2525	my ($ns, $buf) = @_;	2800	my ($ns, $buf) = @_;
2526		2801
2527	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2802	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528		2803
2529	if (ref $msg) {	2804	if (ref $msg) {
		2805	my ($type, $reply, @payload) =
		2806	"ARRAY" eq ref $msg
		2807	? @$msg
		2808	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2809
		2810	my @reply;
		2811
2530	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2812	if (my $cb = $EXTICMD{$type}) {
2531	if (my %reply = $cb->($ns, $msg)) {	2813	@reply = $cb->($ns, @payload);
2532	$reply{msgid} = $msg->{msgid};
2533	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534	}
2535	}	2814	}
		2815
		2816	$ns->ext_reply ($reply, @reply)
		2817	if $reply;
		2818
2536	} else {	2819	} else {
2537	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2820	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2538	}	2821	}
2539		2822
2540	cf::override;	2823	cf::override;
…		…
2587	our $safe = new Safe "safe";	2870	our $safe = new Safe "safe";
2588	our $safe_hole = new Safe::Hole;	2871	our $safe_hole = new Safe::Hole;
2589		2872
2590	$SIG{FPE} = 'IGNORE';	2873	$SIG{FPE} = 'IGNORE';
2591		2874
2592	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2875	$safe->permit_only (Opcode::opset qw(
		2876	:base_core :base_mem :base_orig :base_math
		2877	grepstart grepwhile mapstart mapwhile
		2878	sort time
		2879	));
2593		2880
2594	# here we export the classes and methods available to script code	2881	# here we export the classes and methods available to script code
2595		2882
2596	=pod	2883	=pod
2597		2884
2598	The following functions and methods are available within a safe environment:	2885	The following functions and methods are available within a safe environment:
2599		2886
2600	cf::object	2887	cf::object
2601	contr pay_amount pay_player map x y force_find force_add	2888	contr pay_amount pay_player map x y force_find force_add
2602	insert remove	2889	insert remove name archname title slaying race decrease_ob_nr
2603		2890
2604	cf::object::player	2891	cf::object::player
2605	player	2892	player
2606		2893
2607	cf::player	2894	cf::player
…		…
2612		2899
2613	=cut	2900	=cut
2614		2901
2615	for (	2902	for (
2616	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	2903	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2904	insert remove inv name archname title slaying race
2617	insert remove)],	2905	decrease_ob_nr)],
2618	["cf::object::player" => qw(player)],	2906	["cf::object::player" => qw(player)],
2619	["cf::player" => qw(peaceful)],	2907	["cf::player" => qw(peaceful)],
2620	["cf::map" => qw(trigger)],	2908	["cf::map" => qw(trigger)],
2621	) {	2909	) {
2622	no strict 'refs';	2910	no strict 'refs';
…		…
2698	# the server's init and main functions	2986	# the server's init and main functions
2699		2987
2700	sub load_facedata($) {	2988	sub load_facedata($) {
2701	my ($path) = @_;	2989	my ($path) = @_;
2702		2990
		2991	# HACK to clear player env face cache, we need some signal framework
		2992	# for this (global event?)
		2993	%ext::player_env::MUSIC_FACE_CACHE = ();
		2994
		2995	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		2996
2703	warn "loading facedata from $path\n";	2997	warn "loading facedata from $path\n";
2704		2998
2705	my $facedata;	2999	my $facedata;
2706	0 < aio_load $path, $facedata	3000	0 < aio_load $path, $facedata
2707	or die "$path: $!";	3001	or die "$path: $!";
…		…
2709	$facedata = Coro::Storable::thaw $facedata;	3003	$facedata = Coro::Storable::thaw $facedata;
2710		3004
2711	$facedata->{version} == 2	3005	$facedata->{version} == 2
2712	or cf::cleanup "$path: version mismatch, cannot proceed.";	3006	or cf::cleanup "$path: version mismatch, cannot proceed.";
2713		3007
		3008	# patch in the exptable
		3009	$facedata->{resource}{"res/exp_table"} = {
		3010	type => FT_RSRC,
		3011	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3012	};
		3013	cf::cede_to_tick;
		3014
2714	{	3015	{
2715	my $faces = $facedata->{faceinfo};	3016	my $faces = $facedata->{faceinfo};
2716		3017
2717	while (my ($face, $info) = each %$faces) {	3018	while (my ($face, $info) = each %$faces) {
2718	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3019	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2719	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3020	cf::face::set_visibility $idx, $info->{visibility};
		3021	cf::face::set_magicmap $idx, $info->{magicmap};
2720	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3022	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2721	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3023	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2722	Coro::cede;	3024
		3025	cf::cede_to_tick;
2723	}	3026	}
2724		3027
2725	while (my ($face, $info) = each %$faces) {	3028	while (my ($face, $info) = each %$faces) {
2726	next unless $info->{smooth};	3029	next unless $info->{smooth};
2727	my $idx = cf::face::find $face	3030	my $idx = cf::face::find $face
2728	or next;	3031	or next;
2729	if (my $smooth = cf::face::find $info->{smooth}) {	3032	if (my $smooth = cf::face::find $info->{smooth}) {
		3033	cf::face::set_smooth $idx, $smooth;
2730	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3034	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731	} else {	3035	} else {
2732	warn "smooth face '$info->{smooth}' not found for face '$face'";	3036	warn "smooth face '$info->{smooth}' not found for face '$face'";
2733	}	3037	}
2734	Coro::cede;	3038
		3039	cf::cede_to_tick;
2735	}	3040	}
2736	}	3041	}
2737		3042
2738	{	3043	{
2739	my $anims = $facedata->{animinfo};	3044	my $anims = $facedata->{animinfo};
2740		3045
2741	while (my ($anim, $info) = each %$anims) {	3046	while (my ($anim, $info) = each %$anims) {
2742	cf::anim::set $anim, $info->{frames}, $info->{facings};	3047	cf::anim::set $anim, $info->{frames}, $info->{facings};
2743	Coro::cede;	3048	cf::cede_to_tick;
2744	}	3049	}
2745		3050
2746	cf::anim::invalidate_all; # d'oh	3051	cf::anim::invalidate_all; # d'oh
2747	}	3052	}
2748		3053
		3054	{
		3055	# TODO: for gcfclient pleasure, we should give resources
		3056	# that gcfclient doesn't grok a >10000 face index.
		3057	my $res = $facedata->{resource};
		3058
		3059	my $soundconf = delete $res->{"res/sound.conf"};
		3060
		3061	while (my ($name, $info) = each %$res) {
		3062	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3063	my $data;
		3064
		3065	if ($info->{type} & 1) {
		3066	# prepend meta info
		3067
		3068	my $meta = $enc->encode ({
		3069	name => $name,
		3070	%{ $info->{meta} \|\| {} },
		3071	});
		3072
		3073	$data = pack "(w/a)", $meta, $info->{data};
		3074	} else {
		3075	$data = $info->{data};
		3076	}
		3077
		3078	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3079	cf::face::set_type $idx, $info->{type};
		3080
		3081	cf::cede_to_tick;
		3082	}
		3083
		3084	if ($soundconf) {
		3085	$soundconf = $enc->decode (delete $soundconf->{data});
		3086
		3087	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3088	my $sound = $soundconf->{compat}[$_]
		3089	or next;
		3090
		3091	my $face = cf::face::find "sound/$sound->[1]";
		3092	cf::sound::set $sound->[0] => $face;
		3093	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3094	}
		3095
		3096	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3097	my $face = cf::face::find "sound/$v";
		3098	cf::sound::set $k => $face;
		3099	}
		3100	}
		3101	}
		3102
2749	1	3103	1
2750	}	3104	}
2751		3105
		3106	register_exticmd fx_want => sub {
		3107	my ($ns, $want) = @_;
		3108
		3109	while (my ($k, $v) = each %$want) {
		3110	$ns->fx_want ($k, $v);
		3111	}
		3112	};
		3113
2752	sub reload_regions {	3114	sub reload_regions {
		3115	# HACK to clear player env face cache, we need some signal framework
		3116	# for this (global event?)
		3117	%ext::player_env::MUSIC_FACE_CACHE = ();
		3118
2753	load_resource_file "$MAPDIR/regions"	3119	load_resource_file "$MAPDIR/regions"
2754	or die "unable to load regions file\n";	3120	or die "unable to load regions file\n";
		3121
		3122	for (cf::region::list) {
		3123	$_->{match} = qr/$_->{match}/
		3124	if exists $_->{match};
		3125	}
2755	}	3126	}
2756		3127
2757	sub reload_facedata {	3128	sub reload_facedata {
2758	load_facedata "$DATADIR/facedata"	3129	load_facedata "$DATADIR/facedata"
2759	or die "unable to load facedata\n";	3130	or die "unable to load facedata\n";
…		…
2788		3159
2789	sub init {	3160	sub init {
2790	reload_resources;	3161	reload_resources;
2791	}	3162	}
2792		3163
2793	sub cfg_load {	3164	sub reload_config {
2794	open my $fh, "<:utf8", "$CONFDIR/config"	3165	open my $fh, "<:utf8", "$CONFDIR/config"
2795	or return;	3166	or return;
2796		3167
2797	local $/;	3168	local $/;
2798	*CFG = YAML::Syck::Load <$fh>;	3169	*CFG = YAML::Syck::Load <$fh>;
…		…
2814	sub main {	3185	sub main {
2815	# we must not ever block the main coroutine	3186	# we must not ever block the main coroutine
2816	local $Coro::idle = sub {	3187	local $Coro::idle = sub {
2817	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3188	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2818	(async {	3189	(async {
		3190	$Coro::current->{desc} = "IDLE BUG HANDLER";
2819	Event::one_event;	3191	Event::one_event;
2820	})->prio (Coro::PRIO_MAX);	3192	})->prio (Coro::PRIO_MAX);
2821	};	3193	};
2822		3194
2823	cfg_load;	3195	reload_config;
2824	db_init;	3196	db_init;
2825	load_extensions;	3197	load_extensions;
2826		3198
2827	$TICK_WATCHER->start;	3199	$TICK_WATCHER->start;
2828	Event::loop;	3200	Event::loop;
…		…
3021	warn "reloading cf.pm";	3393	warn "reloading cf.pm";
3022	require cf;	3394	require cf;
3023	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3395	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3024		3396
3025	warn "loading config and database again";	3397	warn "loading config and database again";
3026	cf::cfg_load;	3398	cf::reload_config;
3027		3399
3028	warn "loading extensions";	3400	warn "loading extensions";
3029	cf::load_extensions;	3401	cf::load_extensions;
3030		3402
3031	warn "reattaching attachments to objects/players";	3403	warn "reattaching attachments to objects/players";
…		…
3067	register_command "reload" => sub {	3439	register_command "reload" => sub {
3068	my ($who, $arg) = @_;	3440	my ($who, $arg) = @_;
3069		3441
3070	if ($who->flag (FLAG_WIZ)) {	3442	if ($who->flag (FLAG_WIZ)) {
3071	$who->message ("reloading server.");	3443	$who->message ("reloading server.");
		3444	async {
		3445	$Coro::current->{desc} = "perl_reload";
3072	async { reload_perl };	3446	reload_perl;
		3447	};
3073	}	3448	}
3074	};	3449	};
3075		3450
3076	unshift @INC, $LIBDIR;	3451	unshift @INC, $LIBDIR;
3077		3452
…		…
3096	my $signal = new Coro::Signal;	3471	my $signal = new Coro::Signal;
3097	push @WAIT_FOR_TICK_BEGIN, $signal;	3472	push @WAIT_FOR_TICK_BEGIN, $signal;
3098	$signal->wait;	3473	$signal->wait;
3099	}	3474	}
3100		3475
3101	my $min = 1e6;#d#
3102	my $avg = 10;
3103	$TICK_WATCHER = Event->timer (	3476	$TICK_WATCHER = Event->timer (
3104	reentrant => 0,	3477	reentrant => 0,
3105	parked => 1,	3478	parked => 1,
3106	prio => 0,	3479	prio => 0,
3107	at => $NEXT_TICK \|\| $TICK,	3480	at => $NEXT_TICK \|\| $TICK,
…		…
3115		3488
3116	$NOW = $tick_start = Event::time;	3489	$NOW = $tick_start = Event::time;
3117		3490
3118	cf::server_tick; # one server iteration	3491	cf::server_tick; # one server iteration
3119		3492
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;	3493	$RUNTIME += $TICK;
3144	$NEXT_TICK += $TICK;	3494	$NEXT_TICK += $TICK;
3145		3495
3146	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3496	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3147	$NEXT_RUNTIME_WRITE = $NOW + 10;	3497	$NEXT_RUNTIME_WRITE = $NOW + 10;
3148	Coro::async_pool {	3498	Coro::async_pool {
		3499	$Coro::current->{desc} = "runtime saver";
3149	write_runtime	3500	write_runtime
3150	or warn "ERROR: unable to write runtime file: $!";	3501	or warn "ERROR: unable to write runtime file: $!";
3151	};	3502	};
3152	}	3503	}
3153		3504
3154	# my $AFTER = Event::time;
3155	# warn $AFTER - $NOW;#d#
3156
3157	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3505	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3158	$sig->send;	3506	$sig->send;
3159	}	3507	}
3160	while (my $sig = shift @WAIT_FOR_TICK) {	3508	while (my $sig = shift @WAIT_FOR_TICK) {
3161	$sig->send;	3509	$sig->send;
…		…
3171		3519
3172	$LOAD = ($NOW - $tick_start) / $TICK;	3520	$LOAD = ($NOW - $tick_start) / $TICK;
3173	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3521	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3174		3522
3175	_post_tick;	3523	_post_tick;
3176
3177
3178	},	3524	},
3179	);	3525	);
3180		3526
3181	{	3527	{
		3528	BDB::min_parallel 8;
3182	BDB::max_poll_time $TICK * 0.1;	3529	BDB::max_poll_time $TICK * 0.1;
3183	$BDB_POLL_WATCHER = Event->io (	3530	$BDB_POLL_WATCHER = Event->io (
3184	reentrant => 0,	3531	reentrant => 0,
3185	fd => BDB::poll_fileno,	3532	fd => BDB::poll_fileno,
3186	poll => 'r',	3533	poll => 'r',
3187	prio => 0,	3534	prio => 0,
3188	data => WF_AUTOCANCEL,	3535	data => WF_AUTOCANCEL,
3189	cb => \&BDB::poll_cb,	3536	cb => \&BDB::poll_cb,
3190	);	3537	);
3191	BDB::min_parallel 8;
3192		3538
3193	BDB::set_sync_prepare {	3539	BDB::set_sync_prepare {
3194	my $status;	3540	my $status;
3195	my $current = $Coro::current;	3541	my $current = $Coro::current;
3196	(	3542	(
…		…
3205	)	3551	)
3206	};	3552	};
3207		3553
3208	unless ($DB_ENV) {	3554	unless ($DB_ENV) {
3209	$DB_ENV = BDB::db_env_create;	3555	$DB_ENV = BDB::db_env_create;
		3556	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC
		3557	\| BDB::LOG_AUTOREMOVE, 1);
		3558	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3559	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3210		3560
3211	cf::sync_job {	3561	cf::sync_job {
3212	eval {	3562	eval {
3213	BDB::db_env_open	3563	BDB::db_env_open
3214	$DB_ENV,	3564	$DB_ENV,
…		…
3216	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN	3566	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN
3217	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3567	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3218	0666;	3568	0666;
3219		3569
3220	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3570	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	};	3571	};
3225		3572
3226	cf::cleanup "db_env_open(db): $@" if $@;	3573	cf::cleanup "db_env_open(db): $@" if $@;
3227	};	3574	};
3228	}	3575	}
		3576
		3577	$BDB_DEADLOCK_WATCHER = Event->timer (
		3578	after => 3,
		3579	interval => 1,
		3580	hard => 1,
		3581	prio => 0,
		3582	data => WF_AUTOCANCEL,
		3583	cb => sub {
		3584	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3585	},
		3586	);
		3587	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3588	after => 11,
		3589	interval => 60,
		3590	hard => 1,
		3591	prio => 0,
		3592	data => WF_AUTOCANCEL,
		3593	cb => sub {
		3594	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3595	},
		3596	);
		3597	$BDB_TRICKLE_WATCHER = Event->timer (
		3598	after => 5,
		3599	interval => 10,
		3600	hard => 1,
		3601	prio => 0,
		3602	data => WF_AUTOCANCEL,
		3603	cb => sub {
		3604	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3605	},
		3606	);
3229	}	3607	}
3230		3608
3231	{	3609	{
3232	IO::AIO::min_parallel 8;	3610	IO::AIO::min_parallel 8;
3233		3611
…		…
3252		3630
3253	# limit the # of concurrent backtraces	3631	# limit the # of concurrent backtraces
3254	if ($_log_backtrace < 2) {	3632	if ($_log_backtrace < 2) {
3255	++$_log_backtrace;	3633	++$_log_backtrace;
3256	async {	3634	async {
		3635	$Coro::current->{desc} = "abt $msg";
		3636
3257	my @bt = fork_call {	3637	my @bt = fork_call {
3258	@addr = map { sprintf "%x", $_ } @addr;	3638	@addr = map { sprintf "%x", $_ } @addr;
3259	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3639	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3260	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"	3640	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"
3261	or die "addr2line: $!";	3641	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.374 by root, Wed Sep 19 22:07:16 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.374 by root, Wed Sep 19 22:07:16 2007 UTC