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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.292 by root, Tue Jul 3 00:54:57 2007 UTC vs.
Revision 1.369 by root, Thu Sep 13 08:35:25 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_CHECKPOINT_WATCHER;
		86	our $BDB_TRICKLE_WATCHER;
83	our $DB_ENV;	87	our $DB_ENV;
84		88
85	our %CFG;	89	our %CFG;
86		90
87	our $UPTIME; $UPTIME \|\|= time;	91	our $UPTIME; $UPTIME \|\|= time;
88	our $RUNTIME;	92	our $RUNTIME;
89		93
90	our %PLAYER; # all users	94	our (%PLAYER, %PLAYER_LOADING); # all users
91	our %MAP; # all maps	95	our (%MAP, %MAP_LOADING ); # all maps
92	our $LINK_MAP; # the special {link} map, which is always available	96	our $LINK_MAP; # the special {link} map, which is always available
93		97
94	# used to convert map paths into valid unix filenames by replacing / by ∕	98	# used to convert map paths into valid unix filenames by replacing / by ∕
95	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	99	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96		100
…		…
166		170
167	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	171	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	172	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.	173	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170		174
		175	=item @cf::INVOKE_RESULTS
		176
		177	This array contains the results of the last C<invoke ()> call. When
		178	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		179	that call.
		180
171	=back	181	=back
172		182
173	=cut	183	=cut
174		184
175	BEGIN {	185	BEGIN {
…		…
179	$msg .= "\n"	189	$msg .= "\n"
180	unless $msg =~ /\n$/;	190	unless $msg =~ /\n$/;
181		191
182	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	192	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183		193
184	utf8::encode $msg;
185	LOG llevError, $msg;	194	LOG llevError, $msg;
186	};	195	};
187	}	196	}
188		197
189	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	198	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
264	Wait until the given lock is available and then acquires it and returns	273	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,	274	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	275	for example when the coroutine gets canceled), the lock is automatically
267	returned.	276	returned.
268		277
		278	Locks are not recursive, locking from the same coro twice results in a
		279	deadlocked coro.
		280
269	Lock names should begin with a unique identifier (for example, cf::map::find	281	Lock names should begin with a unique identifier (for example, cf::map::find
270	uses map_find and cf::map::load uses map_load).	282	uses map_find and cf::map::load uses map_load).
271		283
272	=item $locked = cf::lock_active $string	284	=item $locked = cf::lock_active $string
273		285
274	Return true if the lock is currently active, i.e. somebody has locked it.	286	Return true if the lock is currently active, i.e. somebody has locked it.
275		287
276	=cut	288	=cut
277		289
278	our %LOCK;	290	our %LOCK;
		291	our %LOCKER;#d#
279		292
280	sub lock_wait($) {	293	sub lock_wait($) {
281	my ($key) = @_;	294	my ($key) = @_;
		295
		296	if ($LOCKER{$key} == $Coro::current) {#d#
		297	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		298	return;#d#
		299	}#d#
282		300
283	# wait for lock, if any	301	# wait for lock, if any
284	while ($LOCK{$key}) {	302	while ($LOCK{$key}) {
285	push @{ $LOCK{$key} }, $Coro::current;	303	push @{ $LOCK{$key} }, $Coro::current;
286	Coro::schedule;	304	Coro::schedule;
…		…
292		310
293	# wait, to be sure we are not locked	311	# wait, to be sure we are not locked
294	lock_wait $key;	312	lock_wait $key;
295		313
296	$LOCK{$key} = [];	314	$LOCK{$key} = [];
		315	$LOCKER{$key} = $Coro::current;#d#
297		316
298	Coro::guard {	317	Coro::guard {
		318	delete $LOCKER{$key};#d#
299	# wake up all waiters, to be on the safe side	319	# wake up all waiters, to be on the safe side
300	$_->ready for @{ delete $LOCK{$key} };	320	$_->ready for @{ delete $LOCK{$key} };
301	}	321	}
302	}	322	}
303		323
…		…
313	my $guard = Coro::guard {	333	my $guard = Coro::guard {
314	$TICK_WATCHER->start;	334	$TICK_WATCHER->start;
315	};	335	};
316	$TICK_WATCHER->stop;	336	$TICK_WATCHER->stop;
317	$guard	337	$guard
		338	}
		339
		340	=item cf::get_slot $time[, $priority[, $name]]
		341
		342	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		343	This call blocks and returns only when you have at least C<$time> seconds
		344	of cpu time till the next tick. The slot is only valid till the next cede.
		345
		346	The optional C<$name> can be used to identify the job to run. It might be
		347	used for statistical purposes and should identify the same time-class.
		348
		349	Useful for short background jobs.
		350
		351	=cut
		352
		353	our @SLOT_QUEUE;
		354	our $SLOT_QUEUE;
		355
		356	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		357	$SLOT_QUEUE = Coro::async {
		358	my $signal = new Coro::Signal;
		359
		360	while () {
		361	next_job:
		362	my $avail = cf::till_tick;
		363	if ($avail > 0.01) {
		364	for (0 .. $#SLOT_QUEUE) {
		365	if ($SLOT_QUEUE[$_][0] < $avail) {
		366	my $job = splice @SLOT_QUEUE, $_, 1, ();
		367	$job->[2]->send;
		368	Coro::cede;
		369	goto next_job;
		370	}
		371	}
		372	}
		373
		374	if (@SLOT_QUEUE) {
		375	# we do not use wait_For_tick() as it returns immediately when tick is inactive
		376	push @cf::WAIT_FOR_TICK, $signal;
		377	$signal->wait;
		378	} else {
		379	Coro::schedule;
		380	}
		381	}
		382	};
		383
		384	sub get_slot($;$$) {
		385	my ($time, $pri, $name) = @_;
		386
		387	$time = $TICK * .6 if $time > $TICK * .6;
		388	my $sig = new Coro::Signal;
		389
		390	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		391	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		392	$SLOT_QUEUE->ready;
		393	$sig->wait;
318	}	394	}
319		395
320	=item cf::async { BLOCK }	396	=item cf::async { BLOCK }
321		397
322	Currently the same as Coro::async_pool, meaning you cannot use	398	Currently the same as Coro::async_pool, meaning you cannot use
…		…
412	=cut	488	=cut
413		489
414	sub fork_call(&@) {	490	sub fork_call(&@) {
415	my ($cb, @args) = @_;	491	my ($cb, @args) = @_;
416		492
417	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	493	# we seemingly have to make a local copy of the whole thing,
418	# or die "socketpair: $!";	494	# otherwise perl prematurely frees the stuff :/
419	pipe my $fh1, my $fh2	495	# TODO: investigate and fix (likely this will be rather laborious)
420	or die "pipe: $!";
421		496
422	if (my $pid = fork) {	497	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;	498	reset_signals;
435	local $SIG{__WARN__};	499	&$cb
436	local $SIG{__DIE__};	500	}, @args;
437	eval {
438	close $fh1;
439		501
440	my @res = eval { $cb->(@args) };	502	wantarray ? @res : $res[-1]
441	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442	};
443
444	warn $@ if $@;
445	_exit 0;
446	}
447	}	503	}
448		504
449	=item $value = cf::db_get $family => $key	505	=item $value = cf::db_get $family => $key
450		506
451	Returns a single value from the environment database.	507	Returns a single value from the environment database.
…		…
453	=item cf::db_put $family => $key => $value	509	=item cf::db_put $family => $key => $value
454		510
455	Stores the given C<$value> in the family. It can currently store binary	511	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).	512	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
457		513
		514	=item $db = cf::db_table "name"
		515
		516	Create and/or open a new database table. The string must not be "db" and must be unique
		517	within each server.
		518
458	=cut	519	=cut
		520
		521	sub db_table($) {
		522	my ($name) = @_;
		523	my $db = BDB::db_create $DB_ENV;
		524
		525	eval {
		526	$db->set_flags (BDB::CHKSUM);
		527
		528	utf8::encode $name;
		529	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		530	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
		531	cf::cleanup "db_open(db): $!" if $!;
		532	};
		533	cf::cleanup "db_open(db): $@" if $@;
		534
		535	$db
		536	}
459		537
460	our $DB;	538	our $DB;
461		539
462	sub db_init {	540	sub db_init {
463	unless ($DB) {
464	$DB = BDB::db_create $DB_ENV;
465
466	cf::sync_job {	541	cf::sync_job {
467	eval {	542	$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	}	543	};
477	}	544	}
478		545
479	sub db_get($$) {	546	sub db_get($$) {
480	my $key = "$_[0]/$_[1]";	547	my $key = "$_[0]/$_[1]";
481		548
…		…
531	if (1) {	598	if (1) {
532	$md5 =	599	$md5 =
533	join "\x00",	600	join "\x00",
534	$processversion,	601	$processversion,
535	map {	602	map {
536	Coro::cede;	603	cf::cede_to_tick;
537	($src->[$_], Digest::MD5::md5_hex $data[$_])	604	($src->[$_], Digest::MD5::md5_hex $data[$_])
538	} 0.. $#$src;	605	} 0.. $#$src;
539		606
540		607
541	my $dbmd5 = db_get cache => "$id/md5";	608	my $dbmd5 = db_get cache => "$id/md5";
…		…
847	";	914	";
848	die if $@;	915	die if $@;
849	}	916	}
850		917
851	our $override;	918	our $override;
852	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	919	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
853		920
854	sub override {	921	sub override {
855	$override = 1;	922	$override = 1;
856	@invoke_results = ();	923	@INVOKE_RESULTS = (@_);
857	}	924	}
858		925
859	sub do_invoke {	926	sub do_invoke {
860	my $event = shift;	927	my $event = shift;
861	my $callbacks = shift;	928	my $callbacks = shift;
862		929
863	@invoke_results = ();	930	@INVOKE_RESULTS = ();
864		931
865	local $override;	932	local $override;
866		933
867	for (@$callbacks) {	934	for (@$callbacks) {
868	eval { &{$_->[1]} };	935	eval { &{$_->[1]} };
…		…
885		952
886	Generate an object-specific event with the given arguments.	953	Generate an object-specific event with the given arguments.
887		954
888	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	955	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	956	removed in future versions), and there is no public API to access override
890	results (if you must, access C<@cf::invoke_results> directly).	957	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891		958
892	=back	959	=back
893		960
894	=cut	961	=cut
895		962
896	#############################################################################	963	#############################################################################
897	# object support	964	# object support
		965	#
		966
		967	sub _can_merge {
		968	my ($ob1, $ob2) = @_;
		969
		970	local $Storable::canonical = 1;
		971	my $fob1 = Storable::freeze $ob1;
		972	my $fob2 = Storable::freeze $ob2;
		973
		974	$fob1 eq $fob2
		975	}
898		976
899	sub reattach {	977	sub reattach {
900	# basically do the same as instantiate, without calling instantiate	978	# basically do the same as instantiate, without calling instantiate
901	my ($obj) = @_;	979	my ($obj) = @_;
902		980
…		…
947	);	1025	);
948		1026
949	sub object_freezer_save {	1027	sub object_freezer_save {
950	my ($filename, $rdata, $objs) = @_;	1028	my ($filename, $rdata, $objs) = @_;
951		1029
		1030	my $guard = cf::lock_acquire "io";
		1031
952	sync_job {	1032	sync_job {
953	if (length $$rdata) {	1033	if (length $$rdata) {
		1034	utf8::decode (my $decname = $filename);
954	warn sprintf "saving %s (%d,%d)\n",	1035	warn sprintf "saving %s (%d,%d)\n",
955	$filename, length $$rdata, scalar @$objs;	1036	$decname, length $$rdata, scalar @$objs;
956		1037
957	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1038	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
958	chmod SAVE_MODE, $fh;	1039	chmod SAVE_MODE, $fh;
959	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1040	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960	aio_fsync $fh if $cf::USE_FSYNC;	1041	aio_fsync $fh if $cf::USE_FSYNC;
…		…
979	}	1060	}
980	} else {	1061	} else {
981	aio_unlink $filename;	1062	aio_unlink $filename;
982	aio_unlink "$filename.pst";	1063	aio_unlink "$filename.pst";
983	}	1064	}
984	}	1065	};
		1066
		1067	undef $guard;
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
…		…
994		1077
995	sub object_thawer_load {	1078	sub object_thawer_load {
996	my ($filename) = @_;	1079	my ($filename) = @_;
997		1080
998	my ($data, $av);	1081	my ($data, $av);
		1082
		1083	my $guard = cf::lock_acquire "io";
999		1084
1000	(aio_load $filename, $data) >= 0	1085	(aio_load $filename, $data) >= 0
1001	or return;	1086	or return;
1002		1087
1003	unless (aio_stat "$filename.pst") {	1088	unless (aio_stat "$filename.pst") {
1004	(aio_load "$filename.pst", $av) >= 0	1089	(aio_load "$filename.pst", $av) >= 0
1005	or return;	1090	or return;
		1091
		1092	undef $guard;
1006	$av = eval { (Storable::thaw $av)->{objs} };	1093	$av = eval { (Storable::thaw $av)->{objs} };
1007	}	1094	}
1008		1095
		1096	utf8::decode (my $decname = $filename);
1009	warn sprintf "loading %s (%d)\n",	1097	warn sprintf "loading %s (%d,%d)\n",
1010	$filename, length $data, scalar @{$av \|\| []};	1098	$decname, length $data, scalar @{$av \|\| []};
		1099
1011	return ($data, $av);	1100	($data, $av)
1012	}	1101	}
1013		1102
1014	=head2 COMMAND CALLBACKS	1103	=head2 COMMAND CALLBACKS
1015		1104
1016	=over 4	1105	=over 4
…		…
1089	my ($pl, $buf) = @_;	1178	my ($pl, $buf) = @_;
1090		1179
1091	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1180	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092		1181
1093	if (ref $msg) {	1182	if (ref $msg) {
		1183	my ($type, $reply, @payload) =
		1184	"ARRAY" eq ref $msg
		1185	? @$msg
		1186	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1187
		1188	my @reply;
		1189
1094	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1190	if (my $cb = $EXTCMD{$type}) {
1095	if (my %reply = $cb->($pl, $msg)) {	1191	@reply = $cb->($pl, @payload);
1096	$pl->ext_reply ($msg->{msgid}, %reply);
1097	}
1098	}	1192	}
		1193
		1194	$pl->ext_reply ($reply, @reply)
		1195	if $reply;
		1196
1099	} else {	1197	} else {
1100	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1198	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101	}	1199	}
1102		1200
1103	cf::override;	1201	cf::override;
…		…
1193		1291
1194	=head3 cf::player	1292	=head3 cf::player
1195		1293
1196	=over 4	1294	=over 4
1197		1295
		1296	=item cf::player::num_playing
		1297
		1298	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1299
		1300	=cut
		1301
		1302	sub num_playing {
		1303	scalar grep
		1304	$_->ob->map
		1305	&& !$_->hidden
		1306	&& !$_->ob->flag (cf::FLAG_WIZ),
		1307	cf::player::list
		1308	}
		1309
1198	=item cf::player::find $login	1310	=item cf::player::find $login
1199		1311
1200	Returns the given player object, loading it if necessary (might block).	1312	Returns the given player object, loading it if necessary (might block).
1201		1313
1202	=cut	1314	=cut
…		…
1237	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1349	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1350	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1351	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240	aio_unlink +(playerdir $login) . "/$login.pl";	1352	aio_unlink +(playerdir $login) . "/$login.pl";
1241		1353
1242	my $pl = load_pl path $login	1354	my $f = new_from_file cf::object::thawer path $login
1243	or return;	1355	or return;
		1356
		1357	$f->next;
		1358	my $pl = cf::player::load_pl $f
		1359	or return;
		1360	local $cf::PLAYER_LOADING{$login} = $pl;
		1361	$f->resolve_delayed_derefs;
1244	$cf::PLAYER{$login} = $pl	1362	$cf::PLAYER{$login} = $pl
1245	}	1363	}
1246	}	1364	}
1247	}	1365	}
1248		1366
…		…
1258		1376
1259	aio_mkdir playerdir $pl, 0770;	1377	aio_mkdir playerdir $pl, 0770;
1260	$pl->{last_save} = $cf::RUNTIME;	1378	$pl->{last_save} = $cf::RUNTIME;
1261		1379
1262	$pl->save_pl ($path);	1380	$pl->save_pl ($path);
1263	Coro::cede;	1381	cf::cede_to_tick;
1264	}	1382	}
1265		1383
1266	sub new($) {	1384	sub new($) {
1267	my ($login) = @_;	1385	my ($login) = @_;
1268		1386
…		…
1272	$self->{deny_save} = 1;	1390	$self->{deny_save} = 1;
1273		1391
1274	$cf::PLAYER{$login} = $self;	1392	$cf::PLAYER{$login} = $self;
1275		1393
1276	$self	1394	$self
		1395	}
		1396
		1397	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1398
		1399	=cut
		1400
		1401	sub send_msg {
		1402	my $ns = shift->ns
		1403	or return;
		1404	$ns->send_msg (@_);
1277	}	1405	}
1278		1406
1279	=item $pl->quit_character	1407	=item $pl->quit_character
1280		1408
1281	Nukes the player without looking back. If logged in, the connection will	1409	Nukes the player without looking back. If logged in, the connection will
…		…
1336	or return [];	1464	or return [];
1337		1465
1338	my @logins;	1466	my @logins;
1339		1467
1340	for my $login (@$dirs) {	1468	for my $login (@$dirs) {
		1469	my $path = path $login;
		1470
		1471	# a .pst is a dead give-away for a valid player
		1472	unless (-e "$path.pst") {
1341	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1473	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342	aio_read $fh, 0, 512, my $buf, 0 or next;	1474	aio_read $fh, 0, 512, my $buf, 0 or next;
1343	$buf !~ /^password -------------$/m or next; # official not-valid tag	1475	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1476	}
1344		1477
1345	utf8::decode $login;	1478	utf8::decode $login;
1346	push @logins, $login;	1479	push @logins, $login;
1347	}	1480	}
1348		1481
…		…
1386	sub expand_cfpod {	1519	sub expand_cfpod {
1387	((my $self), (local $_)) = @_;	1520	((my $self), (local $_)) = @_;
1388		1521
1389	# escape & and <	1522	# escape & and <
1390	s/&/&/g;	1523	s/&/&/g;
1391	s/(?<![BIUGH])</</g;	1524	s/(?<![BIUGHT])</</g;
1392		1525
1393	# this is buggy, it needs to properly take care of nested <'s	1526	# this is buggy, it needs to properly take care of nested <'s
1394		1527
1395	1 while	1528	1 while
1396	# replace B<>, I<>, U<> etc.	1529	# replace B<>, I<>, U<> etc.
1397	s/B<([^\>]*)>/<b>$1<\/b>/	1530	s/B<([^\>]*)>/<b>$1<\/b>/
1398	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1531	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1399	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1532	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1533	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1400	# replace G<male\|female> tags	1534	# replace G<male\|female> tags
1401	\|\| s{G<([^>\|])\\|([^>])>}{	1535	\|\| s{G<([^>\|])\\|([^>])>}{
1402	$self->gender ? $2 : $1	1536	$self->gender ? $2 : $1
1403	}ge	1537	}ge
1404	# replace H<hint text>	1538	# replace H<hint text>
…		…
1412		1546
1413	# create single paragraphs (very hackish)	1547	# create single paragraphs (very hackish)
1414	s/(?<=\S)\n(?=\w)/ /g;	1548	s/(?<=\S)\n(?=\w)/ /g;
1415		1549
1416	# compress some whitespace	1550	# compress some whitespace
1417	1 while s/\s\n\s\n\s*/\n/;	1551	s/\s+\n/\n/g; # ws line-ends
		1552	s/\n\n+/\n/g; # double lines
		1553	s/^\n+//; # beginning lines
		1554	s/\n+$//; # ending lines
1418		1555
1419	$_	1556	$_
1420	}	1557	}
1421		1558
1422	sub hintmode {	1559	sub hintmode {
1423	$_[0]{hintmode} = $_[1] if @_ > 1;	1560	$_[0]{hintmode} = $_[1] if @_ > 1;
1424	$_[0]{hintmode}	1561	$_[0]{hintmode}
1425	}	1562	}
1426		1563
1427	=item $player->ext_reply ($msgid, %msg)	1564	=item $player->ext_reply ($msgid, @msg)
1428		1565
1429	Sends an ext reply to the player.	1566	Sends an ext reply to the player.
1430		1567
1431	=cut	1568	=cut
1432		1569
1433	sub ext_reply($$%) {	1570	sub ext_reply($$@) {
1434	my ($self, $id, %msg) = @_;	1571	my ($self, $id, @msg) = @_;
1435		1572
1436	$msg{msgid} = $id;	1573	$self->ns->ext_reply ($id, @msg)
1437	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1438	}	1574	}
1439		1575
1440	=item $player->ext_event ($type, %msg)	1576	=item $player->ext_msg ($type, @msg)
1441		1577
1442	Sends an ext event to the client.	1578	Sends an ext event to the client.
1443		1579
1444	=cut	1580	=cut
1445		1581
1446	sub ext_event($$%) {	1582	sub ext_msg($$@) {
1447	my ($self, $type, %msg) = @_;	1583	my ($self, $type, @msg) = @_;
1448		1584
1449	$self->ns->ext_event ($type, %msg);	1585	$self->ns->ext_msg ($type, @msg);
1450	}	1586	}
1451		1587
1452	=head3 cf::region	1588	=head3 cf::region
1453		1589
1454	=over 4	1590	=over 4
…		…
1467	my ($path) = @_;	1603	my ($path) = @_;
1468		1604
1469	my ($match, $specificity);	1605	my ($match, $specificity);
1470		1606
1471	for my $region (list) {	1607	for my $region (list) {
1472	if ($region->match && $path =~ $region->match) {	1608	if ($region->{match} && $path =~ $region->{match}) {
1473	($match, $specificity) = ($region, $region->specificity)	1609	($match, $specificity) = ($region, $region->specificity)
1474	if $region->specificity > $specificity;	1610	if $region->specificity > $specificity;
1475	}	1611	}
1476	}	1612	}
1477		1613
…		…
1597	$self->init; # pass $1 etc.	1733	$self->init; # pass $1 etc.
1598	return $self;	1734	return $self;
1599	}	1735	}
1600	}	1736	}
1601		1737
1602	Carp::carp "unable to resolve path '$path' (base '$base').";	1738	Carp::cluck "unable to resolve path '$path' (base '$base').";
1603	()	1739	()
1604	}	1740	}
1605		1741
1606	sub init {	1742	sub init {
1607	my ($self) = @_;	1743	my ($self) = @_;
…		…
1670		1806
1671	sub load_header_from($) {	1807	sub load_header_from($) {
1672	my ($self, $path) = @_;	1808	my ($self, $path) = @_;
1673		1809
1674	utf8::encode $path;	1810	utf8::encode $path;
1675	#aio_open $path, O_RDONLY, 0	1811	my $f = new_from_file cf::object::thawer $path
1676	# or return;
1677
1678	$self->_load_header ($path)
1679	or return;	1812	or return;
		1813
		1814	$self->_load_header ($f)
		1815	or return;
		1816
		1817	local $MAP_LOADING{$self->{path}} = $self;
		1818	$f->resolve_delayed_derefs;
1680		1819
1681	$self->{load_path} = $path;	1820	$self->{load_path} = $path;
1682		1821
1683	1	1822	1
1684	}	1823	}
…		…
1738	sub find {	1877	sub find {
1739	my ($path, $origin) = @_;	1878	my ($path, $origin) = @_;
1740		1879
1741	$path = normalise $path, $origin && $origin->path;	1880	$path = normalise $path, $origin && $origin->path;
1742		1881
		1882	cf::lock_wait "map_data:$path";#d#remove
1743	cf::lock_wait "map_find:$path";	1883	cf::lock_wait "map_find:$path";
1744		1884
1745	$cf::MAP{$path} \|\| do {	1885	$cf::MAP{$path} \|\| do {
1746	my $guard = cf::lock_acquire "map_find:$path";	1886	my $guard1 = cf::lock_acquire "map_find:$path";
		1887	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1888
1747	my $map = new_from_path cf::map $path	1889	my $map = new_from_path cf::map $path
1748	or return;	1890	or return;
1749		1891
1750	$map->{last_save} = $cf::RUNTIME;	1892	$map->{last_save} = $cf::RUNTIME;
1751		1893
…		…
1753	or return;	1895	or return;
1754		1896
1755	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1897	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1756	# doing this can freeze the server in a sync job, obviously	1898	# doing this can freeze the server in a sync job, obviously
1757	#$cf::WAIT_FOR_TICK->wait;	1899	#$cf::WAIT_FOR_TICK->wait;
		1900	undef $guard1;
		1901	undef $guard2;
1758	$map->reset;	1902	$map->reset;
1759	undef $guard;
1760	return find $path;	1903	return find $path;
1761	}	1904	}
1762		1905
1763	$cf::MAP{$path} = $map	1906	$cf::MAP{$path} = $map
1764	}	1907	}
…		…
1773	local $self->{deny_reset} = 1; # loading can take a long time	1916	local $self->{deny_reset} = 1; # loading can take a long time
1774		1917
1775	my $path = $self->{path};	1918	my $path = $self->{path};
1776		1919
1777	{	1920	{
1778	my $guard = cf::lock_acquire "map_load:$path";	1921	my $guard = cf::lock_acquire "map_data:$path";
1779		1922
		1923	return unless $self->valid;
1780	return if $self->in_memory != cf::MAP_SWAPPED;	1924	return unless $self->in_memory == cf::MAP_SWAPPED;
1781		1925
1782	$self->in_memory (cf::MAP_LOADING);	1926	$self->in_memory (cf::MAP_LOADING);
1783		1927
1784	$self->alloc;	1928	$self->alloc;
1785		1929
1786	$self->pre_load;	1930	$self->pre_load;
1787	Coro::cede;	1931	cf::cede_to_tick;
1788		1932
		1933	my $f = new_from_file cf::object::thawer $self->{load_path};
		1934	$f->skip_block;
1789	$self->_load_objects ($self->{load_path}, 1)	1935	$self->_load_objects ($f)
1790	or return;	1936	or return;
1791		1937
1792	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1938	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1793	if delete $self->{load_original};	1939	if delete $self->{load_original};
1794		1940
1795	if (my $uniq = $self->uniq_path) {	1941	if (my $uniq = $self->uniq_path) {
1796	utf8::encode $uniq;	1942	utf8::encode $uniq;
1797	if (aio_open $uniq, O_RDONLY, 0) {	1943	unless (aio_stat $uniq) {
		1944	if (my $f = new_from_file cf::object::thawer $uniq) {
1798	$self->clear_unique_items;	1945	$self->clear_unique_items;
1799	$self->_load_objects ($uniq, 0);	1946	$self->_load_objects ($f);
		1947	$f->resolve_delayed_derefs;
		1948	}
1800	}	1949	}
1801	}	1950	}
1802		1951
1803	Coro::cede;	1952	$f->resolve_delayed_derefs;
		1953
		1954	cf::cede_to_tick;
1804	# now do the right thing for maps	1955	# now do the right thing for maps
1805	$self->link_multipart_objects;	1956	$self->link_multipart_objects;
1806	$self->difficulty ($self->estimate_difficulty)	1957	$self->difficulty ($self->estimate_difficulty)
1807	unless $self->difficulty;	1958	unless $self->difficulty;
1808	Coro::cede;	1959	cf::cede_to_tick;
1809		1960
1810	unless ($self->{deny_activate}) {	1961	unless ($self->{deny_activate}) {
1811	$self->decay_objects;	1962	$self->decay_objects;
1812	$self->fix_auto_apply;	1963	$self->fix_auto_apply;
1813	$self->update_buttons;	1964	$self->update_buttons;
1814	Coro::cede;	1965	cf::cede_to_tick;
1815	$self->set_darkness_map;	1966	$self->set_darkness_map;
1816	Coro::cede;	1967	cf::cede_to_tick;
1817	$self->activate;	1968	$self->activate;
1818	}	1969	}
		1970
		1971	$self->{last_save} = $cf::RUNTIME;
		1972	$self->last_access ($cf::RUNTIME);
1819		1973
1820	$self->in_memory (cf::MAP_IN_MEMORY);	1974	$self->in_memory (cf::MAP_IN_MEMORY);
1821	}	1975	}
1822		1976
1823	$self->post_load;	1977	$self->post_load;
…		…
1834		1988
1835	$self	1989	$self
1836	}	1990	}
1837		1991
1838	# find and load all maps in the 3x3 area around a map	1992	# find and load all maps in the 3x3 area around a map
1839	sub load_diag {	1993	sub load_neighbours {
1840	my ($map) = @_;	1994	my ($map) = @_;
1841		1995
1842	my @diag; # diagonal neighbours	1996	my @neigh; # diagonal neighbours
1843		1997
1844	for (0 .. 3) {	1998	for (0 .. 3) {
1845	my $neigh = $map->tile_path ($_)	1999	my $neigh = $map->tile_path ($_)
1846	or next;	2000	or next;
1847	$neigh = find $neigh, $map	2001	$neigh = find $neigh, $map
1848	or next;	2002	or next;
1849	$neigh->load;	2003	$neigh->load;
1850		2004
		2005	push @neigh,
1851	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2006	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1852	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2007	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1853	}	2008	}
1854		2009
1855	for (@diag) {	2010	for (grep defined $_->[0], @neigh) {
		2011	my ($path, $origin) = @$_;
1856	my $neigh = find @$_	2012	my $neigh = find $path, $origin
1857	or next;	2013	or next;
1858	$neigh->load;	2014	$neigh->load;
1859	}	2015	}
1860	}	2016	}
1861		2017
…		…
1866	}	2022	}
1867		2023
1868	sub do_load_sync {	2024	sub do_load_sync {
1869	my ($map) = @_;	2025	my ($map) = @_;
1870		2026
		2027	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2028	if $Coro::current == $Coro::main;
		2029
1871	cf::sync_job { $map->load };	2030	cf::sync_job { $map->load };
1872	}	2031	}
1873		2032
1874	our %MAP_PREFETCH;	2033	our %MAP_PREFETCH;
1875	our $MAP_PREFETCHER = undef;	2034	our $MAP_PREFETCHER = undef;
1876		2035
1877	sub find_async {	2036	sub find_async {
1878	my ($path, $origin) = @_;	2037	my ($path, $origin, $load) = @_;
1879		2038
1880	$path = normalise $path, $origin && $origin->{path};	2039	$path = normalise $path, $origin && $origin->{path};
1881		2040
1882	if (my $map = $cf::MAP{$path}) {	2041	if (my $map = $cf::MAP{$path}) {
1883	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2042	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1884	}	2043	}
1885		2044
1886	undef $MAP_PREFETCH{$path};	2045	$MAP_PREFETCH{$path} \|= $load;
		2046
1887	$MAP_PREFETCHER \|\|= cf::async {	2047	$MAP_PREFETCHER \|\|= cf::async {
1888	while (%MAP_PREFETCH) {	2048	while (%MAP_PREFETCH) {
1889	for my $path (keys %MAP_PREFETCH) {	2049	while (my ($k, $v) = each %MAP_PREFETCH) {
1890	my $map = find $path	2050	if (my $map = find $k) {
1891	or next;
1892	$map->load;	2051	$map->load if $v;
		2052	}
1893		2053
1894	delete $MAP_PREFETCH{$path};	2054	delete $MAP_PREFETCH{$k};
1895	}	2055	}
1896	}	2056	}
1897	undef $MAP_PREFETCHER;	2057	undef $MAP_PREFETCHER;
1898	};	2058	};
1899	$MAP_PREFETCHER->prio (6);	2059	$MAP_PREFETCHER->prio (6);
…		…
1902	}	2062	}
1903		2063
1904	sub save {	2064	sub save {
1905	my ($self) = @_;	2065	my ($self) = @_;
1906		2066
1907	my $lock = cf::lock_acquire "map_data:" . $self->path;	2067	my $lock = cf::lock_acquire "map_data:$self->{path}";
1908		2068
1909	$self->{last_save} = $cf::RUNTIME;	2069	$self->{last_save} = $cf::RUNTIME;
1910		2070
1911	return unless $self->dirty;	2071	return unless $self->dirty;
1912		2072
…		…
1935	my ($self) = @_;	2095	my ($self) = @_;
1936		2096
1937	# save first because save cedes	2097	# save first because save cedes
1938	$self->save;	2098	$self->save;
1939		2099
1940	my $lock = cf::lock_acquire "map_data:" . $self->path;	2100	my $lock = cf::lock_acquire "map_data:$self->{path}";
1941		2101
1942	return if $self->players;	2102	return if $self->players;
1943	return if $self->in_memory != cf::MAP_IN_MEMORY;	2103	return if $self->in_memory != cf::MAP_IN_MEMORY;
1944	return if $self->{deny_save};	2104	return if $self->{deny_save};
1945		2105
		2106	$self->in_memory (cf::MAP_SWAPPED);
		2107
		2108	$self->deactivate;
		2109	$_->clear_links_to ($self) for values %cf::MAP;
1946	$self->clear;	2110	$self->clear;
1947	$self->in_memory (cf::MAP_SWAPPED);
1948	}	2111	}
1949		2112
1950	sub reset_at {	2113	sub reset_at {
1951	my ($self) = @_;	2114	my ($self) = @_;
1952		2115
…		…
1984	if $uniq;	2147	if $uniq;
1985	}	2148	}
1986		2149
1987	delete $cf::MAP{$self->path};	2150	delete $cf::MAP{$self->path};
1988		2151
		2152	$self->deactivate;
		2153	$_->clear_links_to ($self) for values %cf::MAP;
1989	$self->clear;	2154	$self->clear;
1990
1991	$_->clear_links_to ($self) for values %cf::MAP;
1992		2155
1993	$self->unlink_save;	2156	$self->unlink_save;
1994	$self->destroy;	2157	$self->destroy;
1995	}	2158	}
1996		2159
1997	my $nuke_counter = "aaaa";	2160	my $nuke_counter = "aaaa";
1998		2161
1999	sub nuke {	2162	sub nuke {
2000	my ($self) = @_;	2163	my ($self) = @_;
2001		2164
		2165	{
		2166	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2167
2002	delete $cf::MAP{$self->path};	2168	delete $cf::MAP{$self->path};
2003		2169
2004	$self->unlink_save;	2170	$self->unlink_save;
2005		2171
2006	bless $self, "cf::map";	2172	bless $self, "cf::map";
2007	delete $self->{deny_reset};	2173	delete $self->{deny_reset};
2008	$self->{deny_save} = 1;	2174	$self->{deny_save} = 1;
2009	$self->reset_timeout (1);	2175	$self->reset_timeout (1);
2010	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2176	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2011		2177
2012	$cf::MAP{$self->path} = $self;	2178	$cf::MAP{$self->path} = $self;
		2179	}
2013		2180
2014	$self->reset; # polite request, might not happen	2181	$self->reset; # polite request, might not happen
2015	}	2182	}
2016		2183
2017	=item $maps = cf::map::tmp_maps	2184	=item $maps = cf::map::tmp_maps
…		…
2093		2260
2094	sub inv_recursive {	2261	sub inv_recursive {
2095	inv_recursive_ inv $_[0]	2262	inv_recursive_ inv $_[0]
2096	}	2263	}
2097		2264
		2265	=item $ref = $ob->ref
		2266
		2267	creates and returns a persistent reference to an objetc that can be stored as a string.
		2268
		2269	=item $ob = cf::object::deref ($refstring)
		2270
		2271	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2272	even if the object actually exists. May block.
		2273
		2274	=cut
		2275
		2276	sub deref {
		2277	my ($ref) = @_;
		2278
		2279	# temporary compatibility#TODO#remove
		2280	$ref =~ s{^<}{player/<};
		2281
		2282	if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
		2283	my ($uuid, $name) = ($1, $2);
		2284	my $pl = $cf::PLAYER_LOADING{$name} \|\| cf::player::find $name
		2285	or return;
		2286	$pl->ob->uuid eq $uuid
		2287	or return;
		2288
		2289	$pl->ob
		2290	} else {
		2291	warn "$ref: cannot resolve object reference\n";
		2292	undef
		2293	}
		2294	}
		2295
2098	package cf;	2296	package cf;
2099		2297
2100	=back	2298	=back
2101		2299
2102	=head3 cf::object::player	2300	=head3 cf::object::player
…		…
2124		2322
2125	} else {	2323	} else {
2126	my $pl = $self->contr;	2324	my $pl = $self->contr;
2127		2325
2128	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2326	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2129	my $diag = $pl->{npc_dialog};	2327	my $dialog = $pl->{npc_dialog};
2130	$diag->{pl}->ext_reply (	2328	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2131	$diag->{id},
2132	msgtype => "reply",
2133	msg => $diag->{pl}->expand_cfpod ($msg),
2134	add_topics => []
2135	);
2136		2329
2137	} else {	2330	} else {
2138	$msg = $npc->name . " says: $msg" if $npc;	2331	$msg = $npc->name . " says: $msg" if $npc;
2139	$self->message ($msg, $flags);	2332	$self->message ($msg, $flags);
2140	}	2333	}
2141	}	2334	}
		2335	}
		2336
		2337	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2338
		2339	=cut
		2340
		2341	sub cf::object::send_msg {
		2342	my $pl = shift->contr
		2343	or return;
		2344	$pl->send_msg (@_);
2142	}	2345	}
2143		2346
2144	=item $player_object->may ("access")	2347	=item $player_object->may ("access")
2145		2348
2146	Returns wether the given player is authorized to access resource "access"	2349	Returns wether the given player is authorized to access resource "access"
…		…
2225	# use -1 or undef as default coordinates, not 0, 0	2428	# use -1 or undef as default coordinates, not 0, 0
2226	($x, $y) = ($map->enter_x, $map->enter_y)	2429	($x, $y) = ($map->enter_x, $map->enter_y)
2227	if $x <=0 && $y <= 0;	2430	if $x <=0 && $y <= 0;
2228		2431
2229	$map->load;	2432	$map->load;
2230	$map->load_diag;	2433	$map->load_neighbours;
2231		2434
2232	return unless $self->contr->active;	2435	return unless $self->contr->active;
2233	$self->activate_recursive;	2436	$self->activate_recursive;
2234		2437
2235	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2438	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2236	$self->enter_map ($map, $x, $y);	2439	$self->enter_map ($map, $x, $y);
2237	}	2440	}
2238		2441
2239	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2442	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2240		2443
2241	Moves the player to the given map-path and coordinates by first freezing	2444	Moves the player to the given map-path and coordinates by first freezing
2242	her, loading and preparing them map, calling the provided $check callback	2445	her, loading and preparing them map, calling the provided $check callback
2243	that has to return the map if sucecssful, and then unfreezes the player on	2446	that has to return the map if sucecssful, and then unfreezes the player on
2244	the new (success) or old (failed) map position.	2447	the new (success) or old (failed) map position. In either case, $done will
		2448	be called at the end of this process.
2245		2449
2246	=cut	2450	=cut
2247		2451
2248	our $GOTOGEN;	2452	our $GOTOGEN;
2249		2453
2250	sub cf::object::player::goto {	2454	sub cf::object::player::goto {
2251	my ($self, $path, $x, $y, $check) = @_;	2455	my ($self, $path, $x, $y, $check, $done) = @_;
2252		2456
2253	# do generation counting so two concurrent goto's will be executed in-order	2457	# do generation counting so two concurrent goto's will be executed in-order
2254	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2458	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2255		2459
2256	$self->enter_link;	2460	$self->enter_link;
2257		2461
2258	(async {	2462	(async {
		2463	# *tag paths override both path and x\|y
		2464	if ($path =~ /^\(.)$/) {
		2465	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2466	my $ob = $obs[rand @obs];
		2467
		2468	# see if we actually can go there
		2469	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2470	$ob = $obs[rand @obs];
		2471	} else {
		2472	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE \| cf::NDI_RED);
		2473	}
		2474	# else put us there anyways for now #d#
		2475
		2476	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2477	} else {
		2478	($path, $x, $y) = (undef, undef, undef);
		2479	}
		2480	}
		2481
2259	my $map = eval {	2482	my $map = eval {
2260	my $map = cf::map::find $path;	2483	my $map = defined $path ? cf::map::find $path : undef;
2261		2484
2262	if ($map) {	2485	if ($map) {
2263	$map = $map->customise_for ($self);	2486	$map = $map->customise_for ($self);
2264	$map = $check->($map) if $check && $map;	2487	$map = $check->($map) if $check && $map;
2265	} else {	2488	} else {
2266	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);	2489	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE \| cf::NDI_RED);
2267	}	2490	}
2268		2491
2269	$map	2492	$map
2270	};	2493	};
2271		2494
…		…
2276		2499
2277	if ($gen == $self->{_goto_generation}) {	2500	if ($gen == $self->{_goto_generation}) {
2278	delete $self->{_goto_generation};	2501	delete $self->{_goto_generation};
2279	$self->leave_link ($map, $x, $y);	2502	$self->leave_link ($map, $x, $y);
2280	}	2503	}
		2504
		2505	$done->() if $done;
2281	})->prio (1);	2506	})->prio (1);
2282	}	2507	}
2283		2508
2284	=item $player_object->enter_exit ($exit_object)	2509	=item $player_object->enter_exit ($exit_object)
2285		2510
…		…
2354	my $hp = $exit->stats->hp;	2579	my $hp = $exit->stats->hp;
2355	my $sp = $exit->stats->sp;	2580	my $sp = $exit->stats->sp;
2356		2581
2357	$self->enter_link;	2582	$self->enter_link;
2358		2583
		2584	# if exit is damned, update players death & WoR home-position
		2585	$self->contr->savebed ($slaying, $hp, $sp)
		2586	if $exit->flag (FLAG_DAMNED);
		2587
2359	(async {	2588	(async {
2360	$self->deactivate_recursive; # just to be sure	2589	$self->deactivate_recursive; # just to be sure
2361	unless (eval {	2590	unless (eval {
2362	$self->goto ($slaying, $hp, $sp);	2591	$self->goto ($slaying, $hp, $sp);
2363		2592
…		…
2390		2619
2391	utf8::encode $text;	2620	utf8::encode $text;
2392	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2621	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2393	}	2622	}
2394		2623
2395	=item $client->send_msg ($color, $type, $msg, [extra...])	2624	=item $client->send_msg ($channel, $msg, $color, [extra...])
2396		2625
2397	Send a drawinfo or msg packet to the client, formatting the msg for the	2626	Send a drawinfo or msg packet to the client, formatting the msg for the
2398	client if neccessary. C<$type> should be a string identifying the type of	2627	client if neccessary. C<$type> should be a string identifying the type of
2399	the message, with C<log> being the default. If C<$color> is negative, suppress	2628	the message, with C<log> being the default. If C<$color> is negative, suppress
2400	the message unless the client supports the msg packet.	2629	the message unless the client supports the msg packet.
2401		2630
2402	=cut	2631	=cut
2403		2632
		2633	our %CHANNEL = (
		2634	"c/identify" => {
		2635	id => "identify",
		2636	title => "Identify",
		2637	reply => undef,
		2638	tooltip => "Items recently identified",
		2639	},
		2640	"c/examine" => {
		2641	id => "examine",
		2642	title => "Examine",
		2643	reply => undef,
		2644	tooltip => "Signs and other items you examined",
		2645	},
		2646	);
		2647
2404	sub cf::client::send_msg {	2648	sub cf::client::send_msg {
2405	my ($self, $color, $type, $msg, @extra) = @_;	2649	my ($self, $channel, $msg, $color, @extra) = @_;
2406		2650
2407	$msg = $self->pl->expand_cfpod ($msg);	2651	$msg = $self->pl->expand_cfpod ($msg);
2408		2652
		2653	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2654
		2655	# check predefined channels, for the benefit of C
		2656	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};
		2657
		2658	if (ref $channel) {
		2659	# send meta info to client, if not yet sent
		2660	unless (exists $self->{channel}{$channel->{id}}) {
		2661	$self->{channel}{$channel->{id}} = $channel;
		2662	$self->ext_msg (channel_info => $channel)
		2663	if $self->can_msg;
		2664	}
		2665
		2666	$channel = $channel->{id};
		2667	}
		2668
		2669	return unless @extra \|\| length $msg;
		2670
2409	if ($self->can_msg) {	2671	if ($self->can_msg) {
		2672	# default colour, mask it out
		2673	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2674	if $color & cf::NDI_DEF;
		2675
2410	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));	2676	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2677	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2411	} else {	2678	} else {
2412	# replace some tags by gcfclient-compatible ones
2413	for ($msg) {
2414	1 while
2415	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2416	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2417	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2418	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2419	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2420	}
2421
2422	if ($color >= 0) {	2679	if ($color >= 0) {
		2680	# replace some tags by gcfclient-compatible ones
		2681	for ($msg) {
		2682	1 while
		2683	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2684	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2685	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2686	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2687	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2688	}
		2689
		2690	$color &= cf::NDI_COLOR_MASK;
		2691
		2692	utf8::encode $msg;
		2693
2423	if (0 && $msg =~ /\[/) {	2694	if (0 && $msg =~ /\[/) {
		2695	# COMMAND/INFO
2424	$self->send_packet ("drawextinfo $color 4 0 $msg")	2696	$self->send_packet ("drawextinfo $color 10 8 $msg")
2425	} else {	2697	} else {
2426	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2698	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2427	$self->send_packet ("drawinfo $color $msg")	2699	$self->send_packet ("drawinfo $color $msg")
2428	}	2700	}
2429	}	2701	}
2430	}	2702	}
2431	}	2703	}
2432		2704
2433	=item $client->ext_event ($type, %msg)	2705	=item $client->ext_msg ($type, @msg)
2434		2706
2435	Sends an ext event to the client.	2707	Sends an ext event to the client.
2436		2708
2437	=cut	2709	=cut
2438		2710
2439	sub cf::client::ext_event($$%) {	2711	sub cf::client::ext_msg($$@) {
2440	my ($self, $type, %msg) = @_;	2712	my ($self, $type, @msg) = @_;
2441		2713
		2714	if ($self->extcmd == 2) {
		2715	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2716	} elsif ($self->extcmd == 1) { # TODO: remove
2442	$msg{msgtype} = "event_$type";	2717	push @msg, msgtype => "event_$type";
2443	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2718	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2719	}
		2720	}
		2721
		2722	=item $client->ext_reply ($msgid, @msg)
		2723
		2724	Sends an ext reply to the client.
		2725
		2726	=cut
		2727
		2728	sub cf::client::ext_reply($$@) {
		2729	my ($self, $id, @msg) = @_;
		2730
		2731	if ($self->extcmd == 2) {
		2732	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2733	} elsif ($self->extcmd == 1) {
		2734	#TODO: version 1, remove
		2735	unshift @msg, msgtype => "reply", msgid => $id;
		2736	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2737	}
2444	}	2738	}
2445		2739
2446	=item $success = $client->query ($flags, "text", \&cb)	2740	=item $success = $client->query ($flags, "text", \&cb)
2447		2741
2448	Queues a query to the client, calling the given callback with	2742	Queues a query to the client, calling the given callback with
…		…
2503	my ($ns, $buf) = @_;	2797	my ($ns, $buf) = @_;
2504		2798
2505	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2799	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2506		2800
2507	if (ref $msg) {	2801	if (ref $msg) {
		2802	my ($type, $reply, @payload) =
		2803	"ARRAY" eq ref $msg
		2804	? @$msg
		2805	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2806
		2807	my @reply;
		2808
2508	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2809	if (my $cb = $EXTICMD{$type}) {
2509	if (my %reply = $cb->($ns, $msg)) {	2810	@reply = $cb->($ns, @payload);
2510	$reply{msgid} = $msg->{msgid};
2511	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2512	}
2513	}	2811	}
		2812
		2813	$ns->ext_reply ($reply, @reply)
		2814	if $reply;
		2815
2514	} else {	2816	} else {
2515	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2817	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2516	}	2818	}
2517		2819
2518	cf::override;	2820	cf::override;
…		…
2565	our $safe = new Safe "safe";	2867	our $safe = new Safe "safe";
2566	our $safe_hole = new Safe::Hole;	2868	our $safe_hole = new Safe::Hole;
2567		2869
2568	$SIG{FPE} = 'IGNORE';	2870	$SIG{FPE} = 'IGNORE';
2569		2871
2570	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2872	$safe->permit_only (Opcode::opset qw(
		2873	:base_core :base_mem :base_orig :base_math
		2874	grepstart grepwhile mapstart mapwhile
		2875	sort time
		2876	));
2571		2877
2572	# here we export the classes and methods available to script code	2878	# here we export the classes and methods available to script code
2573		2879
2574	=pod	2880	=pod
2575		2881
2576	The following functions and methods are available within a safe environment:	2882	The following functions and methods are available within a safe environment:
2577		2883
2578	cf::object contr pay_amount pay_player map	2884	cf::object
		2885	contr pay_amount pay_player map x y force_find force_add
		2886	insert remove name archname title slaying race decrease_ob_nr
		2887
2579	cf::object::player player	2888	cf::object::player
2580	cf::player peaceful	2889	player
2581	cf::map trigger	2890
		2891	cf::player
		2892	peaceful
		2893
		2894	cf::map
		2895	trigger
2582		2896
2583	=cut	2897	=cut
2584		2898
2585	for (	2899	for (
2586	["cf::object" => qw(contr pay_amount pay_player map)],	2900	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2901	insert remove inv name archname title slaying race
		2902	decrease_ob_nr)],
2587	["cf::object::player" => qw(player)],	2903	["cf::object::player" => qw(player)],
2588	["cf::player" => qw(peaceful)],	2904	["cf::player" => qw(peaceful)],
2589	["cf::map" => qw(trigger)],	2905	["cf::map" => qw(trigger)],
2590	) {	2906	) {
2591	no strict 'refs';	2907	no strict 'refs';
…		…
2667	# the server's init and main functions	2983	# the server's init and main functions
2668		2984
2669	sub load_facedata($) {	2985	sub load_facedata($) {
2670	my ($path) = @_;	2986	my ($path) = @_;
2671		2987
		2988	# HACK to clear player env face cache, we need some signal framework
		2989	# for this (global event?)
		2990	%ext::player_env::MUSIC_FACE_CACHE = ();
		2991
		2992	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		2993
2672	warn "loading facedata from $path\n";	2994	warn "loading facedata from $path\n";
2673		2995
2674	my $facedata;	2996	my $facedata;
2675	0 < aio_load $path, $facedata	2997	0 < aio_load $path, $facedata
2676	or die "$path: $!";	2998	or die "$path: $!";
…		…
2678	$facedata = Coro::Storable::thaw $facedata;	3000	$facedata = Coro::Storable::thaw $facedata;
2679		3001
2680	$facedata->{version} == 2	3002	$facedata->{version} == 2
2681	or cf::cleanup "$path: version mismatch, cannot proceed.";	3003	or cf::cleanup "$path: version mismatch, cannot proceed.";
2682		3004
		3005	# patch in the exptable
		3006	$facedata->{resource}{"res/exp_table"} = {
		3007	type => FT_RSRC,
		3008	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3009	};
		3010	cf::cede_to_tick;
		3011
2683	{	3012	{
2684	my $faces = $facedata->{faceinfo};	3013	my $faces = $facedata->{faceinfo};
2685		3014
2686	while (my ($face, $info) = each %$faces) {	3015	while (my ($face, $info) = each %$faces) {
2687	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3016	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2688	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3017	cf::face::set_visibility $idx, $info->{visibility};
		3018	cf::face::set_magicmap $idx, $info->{magicmap};
2689	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3019	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2690	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3020	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2691	Coro::cede;	3021
		3022	cf::cede_to_tick;
2692	}	3023	}
2693		3024
2694	while (my ($face, $info) = each %$faces) {	3025	while (my ($face, $info) = each %$faces) {
2695	next unless $info->{smooth};	3026	next unless $info->{smooth};
2696	my $idx = cf::face::find $face	3027	my $idx = cf::face::find $face
2697	or next;	3028	or next;
2698	if (my $smooth = cf::face::find $info->{smooth}) {	3029	if (my $smooth = cf::face::find $info->{smooth}) {
		3030	cf::face::set_smooth $idx, $smooth;
2699	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3031	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2700	} else {	3032	} else {
2701	warn "smooth face '$info->{smooth}' not found for face '$face'";	3033	warn "smooth face '$info->{smooth}' not found for face '$face'";
2702	}	3034	}
2703	Coro::cede;	3035
		3036	cf::cede_to_tick;
2704	}	3037	}
2705	}	3038	}
2706		3039
2707	{	3040	{
2708	my $anims = $facedata->{animinfo};	3041	my $anims = $facedata->{animinfo};
2709		3042
2710	while (my ($anim, $info) = each %$anims) {	3043	while (my ($anim, $info) = each %$anims) {
2711	cf::anim::set $anim, $info->{frames}, $info->{facings};	3044	cf::anim::set $anim, $info->{frames}, $info->{facings};
2712	Coro::cede;	3045	cf::cede_to_tick;
2713	}	3046	}
2714		3047
2715	cf::anim::invalidate_all; # d'oh	3048	cf::anim::invalidate_all; # d'oh
2716	}	3049	}
2717		3050
		3051	{
		3052	# TODO: for gcfclient pleasure, we should give resources
		3053	# that gcfclient doesn't grok a >10000 face index.
		3054	my $res = $facedata->{resource};
		3055
		3056	my $soundconf = delete $res->{"res/sound.conf"};
		3057
		3058	while (my ($name, $info) = each %$res) {
		3059	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3060	my $data;
		3061
		3062	if ($info->{type} & 1) {
		3063	# prepend meta info
		3064
		3065	my $meta = $enc->encode ({
		3066	name => $name,
		3067	%{ $info->{meta} \|\| {} },
		3068	});
		3069
		3070	$data = pack "(w/a)", $meta, $info->{data};
		3071	} else {
		3072	$data = $info->{data};
		3073	}
		3074
		3075	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3076	cf::face::set_type $idx, $info->{type};
		3077
		3078	cf::cede_to_tick;
		3079	}
		3080
		3081	if ($soundconf) {
		3082	$soundconf = $enc->decode (delete $soundconf->{data});
		3083
		3084	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3085	my $sound = $soundconf->{compat}[$_]
		3086	or next;
		3087
		3088	my $face = cf::face::find "sound/$sound->[1]";
		3089	cf::sound::set $sound->[0] => $face;
		3090	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3091	}
		3092
		3093	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3094	my $face = cf::face::find "sound/$v";
		3095	cf::sound::set $k => $face;
		3096	}
		3097	}
		3098	}
		3099
2718	1	3100	1
2719	}	3101	}
2720		3102
		3103	register_exticmd fx_want => sub {
		3104	my ($ns, $want) = @_;
		3105
		3106	while (my ($k, $v) = each %$want) {
		3107	$ns->fx_want ($k, $v);
		3108	}
		3109	};
		3110
2721	sub reload_regions {	3111	sub reload_regions {
		3112	# HACK to clear player env face cache, we need some signal framework
		3113	# for this (global event?)
		3114	%ext::player_env::MUSIC_FACE_CACHE = ();
		3115
2722	load_resource_file "$MAPDIR/regions"	3116	load_resource_file "$MAPDIR/regions"
2723	or die "unable to load regions file\n";	3117	or die "unable to load regions file\n";
		3118
		3119	for (cf::region::list) {
		3120	$_->{match} = qr/$_->{match}/
		3121	if exists $_->{match};
		3122	}
2724	}	3123	}
2725		3124
2726	sub reload_facedata {	3125	sub reload_facedata {
2727	load_facedata "$DATADIR/facedata"	3126	load_facedata "$DATADIR/facedata"
2728	or die "unable to load facedata\n";	3127	or die "unable to load facedata\n";
…		…
2757		3156
2758	sub init {	3157	sub init {
2759	reload_resources;	3158	reload_resources;
2760	}	3159	}
2761		3160
2762	sub cfg_load {	3161	sub reload_config {
2763	open my $fh, "<:utf8", "$CONFDIR/config"	3162	open my $fh, "<:utf8", "$CONFDIR/config"
2764	or return;	3163	or return;
2765		3164
2766	local $/;	3165	local $/;
2767	*CFG = YAML::Syck::Load <$fh>;	3166	*CFG = YAML::Syck::Load <$fh>;
…		…
2787	(async {	3186	(async {
2788	Event::one_event;	3187	Event::one_event;
2789	})->prio (Coro::PRIO_MAX);	3188	})->prio (Coro::PRIO_MAX);
2790	};	3189	};
2791		3190
2792	cfg_load;	3191	reload_config;
2793	db_init;	3192	db_init;
2794	load_extensions;	3193	load_extensions;
2795		3194
2796	$TICK_WATCHER->start;	3195	$TICK_WATCHER->start;
2797	Event::loop;	3196	Event::loop;
…		…
2990	warn "reloading cf.pm";	3389	warn "reloading cf.pm";
2991	require cf;	3390	require cf;
2992	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3391	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2993		3392
2994	warn "loading config and database again";	3393	warn "loading config and database again";
2995	cf::cfg_load;	3394	cf::reload_config;
2996		3395
2997	warn "loading extensions";	3396	warn "loading extensions";
2998	cf::load_extensions;	3397	cf::load_extensions;
2999		3398
3000	warn "reattaching attachments to objects/players";	3399	warn "reattaching attachments to objects/players";
…		…
3065	my $signal = new Coro::Signal;	3464	my $signal = new Coro::Signal;
3066	push @WAIT_FOR_TICK_BEGIN, $signal;	3465	push @WAIT_FOR_TICK_BEGIN, $signal;
3067	$signal->wait;	3466	$signal->wait;
3068	}	3467	}
3069		3468
3070	my $min = 1e6;#d#	3469	our $stat_fh;
3071	my $avg = 10;	3470	sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND \| Fcntl::O_CREAT \| Fcntl::O_WRONLY, 0600;#d#
		3471
3072	$TICK_WATCHER = Event->timer (	3472	$TICK_WATCHER = Event->timer (
3073	reentrant => 0,	3473	reentrant => 0,
3074	parked => 1,	3474	parked => 1,
3075	prio => 0,	3475	prio => 0,
3076	at => $NEXT_TICK \|\| $TICK,	3476	at => $NEXT_TICK \|\| $TICK,
…		…
3080	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3480	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3081	unless ++$bug_warning > 10;	3481	unless ++$bug_warning > 10;
3082	return;	3482	return;
3083	}	3483	}
3084		3484
		3485	my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
		3486
3085	$NOW = $tick_start = Event::time;	3487	$NOW = $tick_start = Event::time;
3086		3488
3087	cf::server_tick; # one server iteration	3489	cf::server_tick; # one server iteration
3088
3089	0 && sync_job {#d#
3090	for(1..10) {
3091	my $t = Event::time;
3092	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3093	or die;
3094
3095	$map->width (50);
3096	$map->height (50);
3097	$map->alloc;
3098	$map->_load_objects ("/tmp/x.map", 1);
3099	my $t = Event::time - $t;
3100
3101	#next unless $t < 0.0013;#d#
3102	if ($t < $min) {
3103	$min = $t;
3104	}
3105	$avg = $avg * 0.99 + $t * 0.01;
3106	}
3107	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3108	exit 0;
3109	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3110	};
3111		3490
3112	$RUNTIME += $TICK;	3491	$RUNTIME += $TICK;
3113	$NEXT_TICK += $TICK;	3492	$NEXT_TICK += $TICK;
3114		3493
3115	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3494	if ($NOW >= $NEXT_RUNTIME_WRITE) {
…		…
3141	$LOAD = ($NOW - $tick_start) / $TICK;	3520	$LOAD = ($NOW - $tick_start) / $TICK;
3142	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3521	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3143		3522
3144	_post_tick;	3523	_post_tick;
3145		3524
3146		3525	# gather some statistics#d#
		3526	$stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
		3527	IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
3147	},	3528	},
3148	);	3529	);
3149		3530
3150	{	3531	{
		3532	BDB::min_parallel 8;
3151	BDB::max_poll_time $TICK * 0.1;	3533	BDB::max_poll_time $TICK * 0.1;
3152	$BDB_POLL_WATCHER = Event->io (	3534	$BDB_POLL_WATCHER = Event->io (
3153	reentrant => 0,	3535	reentrant => 0,
3154	fd => BDB::poll_fileno,	3536	fd => BDB::poll_fileno,
3155	poll => 'r',	3537	poll => 'r',
3156	prio => 0,	3538	prio => 0,
3157	data => WF_AUTOCANCEL,	3539	data => WF_AUTOCANCEL,
3158	cb => \&BDB::poll_cb,	3540	cb => \&BDB::poll_cb,
3159	);	3541	);
3160	BDB::min_parallel 8;
3161		3542
3162	BDB::set_sync_prepare {	3543	BDB::set_sync_prepare {
3163	my $status;	3544	my $status;
3164	my $current = $Coro::current;	3545	my $current = $Coro::current;
3165	(	3546	(
…		…
3186	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3567	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3187	0666;	3568	0666;
3188		3569
3189	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3570	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3190		3571
3191	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);	3572	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC
		3573	\| BDB::LOG_AUTOREMOVE, 1);
3192	$DB_ENV->set_lk_detect;	3574	$DB_ENV->set_lk_detect;
3193	};	3575	};
3194		3576
3195	cf::cleanup "db_env_open(db): $@" if $@;	3577	cf::cleanup "db_env_open(db): $@" if $@;
3196	};	3578	};
3197	}	3579	}
		3580
		3581	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3582	after => 11,
		3583	interval => 60,
		3584	hard => 1,
		3585	prio => 0,
		3586	data => WF_AUTOCANCEL,
		3587	cb => sub {
		3588	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3589	},
		3590	);
		3591	$BDB_TRICKLE_WATCHER = Event->timer (
		3592	after => 5,
		3593	interval => 10,
		3594	hard => 1,
		3595	prio => 0,
		3596	data => WF_AUTOCANCEL,
		3597	cb => sub {
		3598	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3599	},
		3600	);
3198	}	3601	}
3199		3602
3200	{	3603	{
3201	IO::AIO::min_parallel 8;	3604	IO::AIO::min_parallel 8;
3202		3605

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.292 by root, Tue Jul 3 00:54:57 2007 UTC vs. Revision 1.369 by root, Thu Sep 13 08:35:25 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.292 by root, Tue Jul 3 00:54:57 2007 UTC vs.
Revision 1.369 by root, Thu Sep 13 08:35:25 2007 UTC