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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.291 by root, Tue Jul 3 00:54:44 2007 UTC vs.
Revision 1.366 by root, Tue Sep 11 16:05:35 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	warn "hm<$_[0] $_[1]>\n";#d#
1424	$_[0]{hintmode} = $_[1] if @_ > 1;	1560	$_[0]{hintmode} = $_[1] if @_ > 1;
1425	$_[0]{hintmode}	1561	$_[0]{hintmode}
1426	}	1562	}
1427		1563
1428	=item $player->ext_reply ($msgid, %msg)	1564	=item $player->ext_reply ($msgid, @msg)
1429		1565
1430	Sends an ext reply to the player.	1566	Sends an ext reply to the player.
1431		1567
1432	=cut	1568	=cut
1433		1569
1434	sub ext_reply($$%) {	1570	sub ext_reply($$@) {
1435	my ($self, $id, %msg) = @_;	1571	my ($self, $id, @msg) = @_;
1436		1572
1437	$msg{msgid} = $id;	1573	$self->ns->ext_reply ($id, @msg)
1438	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1439	}	1574	}
1440		1575
1441	=item $player->ext_event ($type, %msg)	1576	=item $player->ext_msg ($type, @msg)
1442		1577
1443	Sends an ext event to the client.	1578	Sends an ext event to the client.
1444		1579
1445	=cut	1580	=cut
1446		1581
1447	sub ext_event($$%) {	1582	sub ext_msg($$@) {
1448	my ($self, $type, %msg) = @_;	1583	my ($self, $type, @msg) = @_;
1449		1584
1450	$self->ns->ext_event ($type, %msg);	1585	$self->ns->ext_msg ($type, @msg);
1451	}	1586	}
1452		1587
1453	=head3 cf::region	1588	=head3 cf::region
1454		1589
1455	=over 4	1590	=over 4
…		…
1468	my ($path) = @_;	1603	my ($path) = @_;
1469		1604
1470	my ($match, $specificity);	1605	my ($match, $specificity);
1471		1606
1472	for my $region (list) {	1607	for my $region (list) {
1473	if ($region->match && $path =~ $region->match) {	1608	if ($region->{match} && $path =~ $region->{match}) {
1474	($match, $specificity) = ($region, $region->specificity)	1609	($match, $specificity) = ($region, $region->specificity)
1475	if $region->specificity > $specificity;	1610	if $region->specificity > $specificity;
1476	}	1611	}
1477	}	1612	}
1478		1613
…		…
1598	$self->init; # pass $1 etc.	1733	$self->init; # pass $1 etc.
1599	return $self;	1734	return $self;
1600	}	1735	}
1601	}	1736	}
1602		1737
1603	Carp::carp "unable to resolve path '$path' (base '$base').";	1738	Carp::cluck "unable to resolve path '$path' (base '$base').";
1604	()	1739	()
1605	}	1740	}
1606		1741
1607	sub init {	1742	sub init {
1608	my ($self) = @_;	1743	my ($self) = @_;
…		…
1671		1806
1672	sub load_header_from($) {	1807	sub load_header_from($) {
1673	my ($self, $path) = @_;	1808	my ($self, $path) = @_;
1674		1809
1675	utf8::encode $path;	1810	utf8::encode $path;
1676	#aio_open $path, O_RDONLY, 0	1811	my $f = new_from_file cf::object::thawer $path
1677	# or return;
1678
1679	$self->_load_header ($path)
1680	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;
1681		1819
1682	$self->{load_path} = $path;	1820	$self->{load_path} = $path;
1683		1821
1684	1	1822	1
1685	}	1823	}
…		…
1739	sub find {	1877	sub find {
1740	my ($path, $origin) = @_;	1878	my ($path, $origin) = @_;
1741		1879
1742	$path = normalise $path, $origin && $origin->path;	1880	$path = normalise $path, $origin && $origin->path;
1743		1881
		1882	cf::lock_wait "map_data:$path";#d#remove
1744	cf::lock_wait "map_find:$path";	1883	cf::lock_wait "map_find:$path";
1745		1884
1746	$cf::MAP{$path} \|\| do {	1885	$cf::MAP{$path} \|\| do {
1747	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
1748	my $map = new_from_path cf::map $path	1889	my $map = new_from_path cf::map $path
1749	or return;	1890	or return;
1750		1891
1751	$map->{last_save} = $cf::RUNTIME;	1892	$map->{last_save} = $cf::RUNTIME;
1752		1893
…		…
1754	or return;	1895	or return;
1755		1896
1756	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1897	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1757	# doing this can freeze the server in a sync job, obviously	1898	# doing this can freeze the server in a sync job, obviously
1758	#$cf::WAIT_FOR_TICK->wait;	1899	#$cf::WAIT_FOR_TICK->wait;
		1900	undef $guard1;
		1901	undef $guard2;
1759	$map->reset;	1902	$map->reset;
1760	undef $guard;
1761	return find $path;	1903	return find $path;
1762	}	1904	}
1763		1905
1764	$cf::MAP{$path} = $map	1906	$cf::MAP{$path} = $map
1765	}	1907	}
…		…
1774	local $self->{deny_reset} = 1; # loading can take a long time	1916	local $self->{deny_reset} = 1; # loading can take a long time
1775		1917
1776	my $path = $self->{path};	1918	my $path = $self->{path};
1777		1919
1778	{	1920	{
1779	my $guard = cf::lock_acquire "map_load:$path";	1921	my $guard = cf::lock_acquire "map_data:$path";
1780		1922
		1923	return unless $self->valid;
1781	return if $self->in_memory != cf::MAP_SWAPPED;	1924	return unless $self->in_memory == cf::MAP_SWAPPED;
1782		1925
1783	$self->in_memory (cf::MAP_LOADING);	1926	$self->in_memory (cf::MAP_LOADING);
1784		1927
1785	$self->alloc;	1928	$self->alloc;
1786		1929
1787	$self->pre_load;	1930	$self->pre_load;
1788	Coro::cede;	1931	cf::cede_to_tick;
1789		1932
		1933	my $f = new_from_file cf::object::thawer $self->{load_path};
		1934	$f->skip_block;
1790	$self->_load_objects ($self->{load_path}, 1)	1935	$self->_load_objects ($f)
1791	or return;	1936	or return;
1792		1937
1793	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1938	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1794	if delete $self->{load_original};	1939	if delete $self->{load_original};
1795		1940
1796	if (my $uniq = $self->uniq_path) {	1941	if (my $uniq = $self->uniq_path) {
1797	utf8::encode $uniq;	1942	utf8::encode $uniq;
1798	if (aio_open $uniq, O_RDONLY, 0) {	1943	unless (aio_stat $uniq) {
		1944	if (my $f = new_from_file cf::object::thawer $uniq) {
1799	$self->clear_unique_items;	1945	$self->clear_unique_items;
1800	$self->_load_objects ($uniq, 0);	1946	$self->_load_objects ($f);
		1947	$f->resolve_delayed_derefs;
		1948	}
1801	}	1949	}
1802	}	1950	}
1803		1951
1804	Coro::cede;	1952	$f->resolve_delayed_derefs;
		1953
		1954	cf::cede_to_tick;
1805	# now do the right thing for maps	1955	# now do the right thing for maps
1806	$self->link_multipart_objects;	1956	$self->link_multipart_objects;
1807	$self->difficulty ($self->estimate_difficulty)	1957	$self->difficulty ($self->estimate_difficulty)
1808	unless $self->difficulty;	1958	unless $self->difficulty;
1809	Coro::cede;	1959	cf::cede_to_tick;
1810		1960
1811	unless ($self->{deny_activate}) {	1961	unless ($self->{deny_activate}) {
1812	$self->decay_objects;	1962	$self->decay_objects;
1813	$self->fix_auto_apply;	1963	$self->fix_auto_apply;
1814	$self->update_buttons;	1964	$self->update_buttons;
1815	Coro::cede;	1965	cf::cede_to_tick;
1816	$self->set_darkness_map;	1966	$self->set_darkness_map;
1817	Coro::cede;	1967	cf::cede_to_tick;
1818	$self->activate;	1968	$self->activate;
1819	}	1969	}
		1970
		1971	$self->{last_save} = $cf::RUNTIME;
		1972	$self->last_access ($cf::RUNTIME);
1820		1973
1821	$self->in_memory (cf::MAP_IN_MEMORY);	1974	$self->in_memory (cf::MAP_IN_MEMORY);
1822	}	1975	}
1823		1976
1824	$self->post_load;	1977	$self->post_load;
…		…
1835		1988
1836	$self	1989	$self
1837	}	1990	}
1838		1991
1839	# 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
1840	sub load_diag {	1993	sub load_neighbours {
1841	my ($map) = @_;	1994	my ($map) = @_;
1842		1995
1843	my @diag; # diagonal neighbours	1996	my @neigh; # diagonal neighbours
1844		1997
1845	for (0 .. 3) {	1998	for (0 .. 3) {
1846	my $neigh = $map->tile_path ($_)	1999	my $neigh = $map->tile_path ($_)
1847	or next;	2000	or next;
1848	$neigh = find $neigh, $map	2001	$neigh = find $neigh, $map
1849	or next;	2002	or next;
1850	$neigh->load;	2003	$neigh->load;
1851		2004
		2005	push @neigh,
1852	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2006	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1853	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2007	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1854	}	2008	}
1855		2009
1856	for (@diag) {	2010	for (grep defined $_->[0], @neigh) {
		2011	my ($path, $origin) = @$_;
1857	my $neigh = find @$_	2012	my $neigh = find $path, $origin
1858	or next;	2013	or next;
1859	$neigh->load;	2014	$neigh->load;
1860	}	2015	}
1861	}	2016	}
1862		2017
…		…
1867	}	2022	}
1868		2023
1869	sub do_load_sync {	2024	sub do_load_sync {
1870	my ($map) = @_;	2025	my ($map) = @_;
1871		2026
		2027	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2028	if $Coro::current == $Coro::main;
		2029
1872	cf::sync_job { $map->load };	2030	cf::sync_job { $map->load };
1873	}	2031	}
1874		2032
1875	our %MAP_PREFETCH;	2033	our %MAP_PREFETCH;
1876	our $MAP_PREFETCHER = undef;	2034	our $MAP_PREFETCHER = undef;
1877		2035
1878	sub find_async {	2036	sub find_async {
1879	my ($path, $origin) = @_;	2037	my ($path, $origin, $load) = @_;
1880		2038
1881	$path = normalise $path, $origin && $origin->{path};	2039	$path = normalise $path, $origin && $origin->{path};
1882		2040
1883	if (my $map = $cf::MAP{$path}) {	2041	if (my $map = $cf::MAP{$path}) {
1884	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2042	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1885	}	2043	}
1886		2044
1887	undef $MAP_PREFETCH{$path};	2045	$MAP_PREFETCH{$path} \|= $load;
		2046
1888	$MAP_PREFETCHER \|\|= cf::async {	2047	$MAP_PREFETCHER \|\|= cf::async {
1889	while (%MAP_PREFETCH) {	2048	while (%MAP_PREFETCH) {
1890	for my $path (keys %MAP_PREFETCH) {	2049	while (my ($k, $v) = each %MAP_PREFETCH) {
1891	my $map = find $path	2050	if (my $map = find $k) {
1892	or next;
1893	$map->load;	2051	$map->load if $v;
		2052	}
1894		2053
1895	delete $MAP_PREFETCH{$path};	2054	delete $MAP_PREFETCH{$k};
1896	}	2055	}
1897	}	2056	}
1898	undef $MAP_PREFETCHER;	2057	undef $MAP_PREFETCHER;
1899	};	2058	};
1900	$MAP_PREFETCHER->prio (6);	2059	$MAP_PREFETCHER->prio (6);
…		…
1903	}	2062	}
1904		2063
1905	sub save {	2064	sub save {
1906	my ($self) = @_;	2065	my ($self) = @_;
1907		2066
1908	my $lock = cf::lock_acquire "map_data:" . $self->path;	2067	my $lock = cf::lock_acquire "map_data:$self->{path}";
1909		2068
1910	$self->{last_save} = $cf::RUNTIME;	2069	$self->{last_save} = $cf::RUNTIME;
1911		2070
1912	return unless $self->dirty;	2071	return unless $self->dirty;
1913		2072
…		…
1936	my ($self) = @_;	2095	my ($self) = @_;
1937		2096
1938	# save first because save cedes	2097	# save first because save cedes
1939	$self->save;	2098	$self->save;
1940		2099
1941	my $lock = cf::lock_acquire "map_data:" . $self->path;	2100	my $lock = cf::lock_acquire "map_data:$self->{path}";
1942		2101
1943	return if $self->players;	2102	return if $self->players;
1944	return if $self->in_memory != cf::MAP_IN_MEMORY;	2103	return if $self->in_memory != cf::MAP_IN_MEMORY;
1945	return if $self->{deny_save};	2104	return if $self->{deny_save};
1946		2105
		2106	$self->in_memory (cf::MAP_SWAPPED);
		2107
		2108	$self->deactivate;
		2109	$_->clear_links_to ($self) for values %cf::MAP;
1947	$self->clear;	2110	$self->clear;
1948	$self->in_memory (cf::MAP_SWAPPED);
1949	}	2111	}
1950		2112
1951	sub reset_at {	2113	sub reset_at {
1952	my ($self) = @_;	2114	my ($self) = @_;
1953		2115
…		…
1985	if $uniq;	2147	if $uniq;
1986	}	2148	}
1987		2149
1988	delete $cf::MAP{$self->path};	2150	delete $cf::MAP{$self->path};
1989		2151
		2152	$self->deactivate;
		2153	$_->clear_links_to ($self) for values %cf::MAP;
1990	$self->clear;	2154	$self->clear;
1991
1992	$_->clear_links_to ($self) for values %cf::MAP;
1993		2155
1994	$self->unlink_save;	2156	$self->unlink_save;
1995	$self->destroy;	2157	$self->destroy;
1996	}	2158	}
1997		2159
1998	my $nuke_counter = "aaaa";	2160	my $nuke_counter = "aaaa";
1999		2161
2000	sub nuke {	2162	sub nuke {
2001	my ($self) = @_;	2163	my ($self) = @_;
2002		2164
		2165	{
		2166	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2167
2003	delete $cf::MAP{$self->path};	2168	delete $cf::MAP{$self->path};
2004		2169
2005	$self->unlink_save;	2170	$self->unlink_save;
2006		2171
2007	bless $self, "cf::map";	2172	bless $self, "cf::map";
2008	delete $self->{deny_reset};	2173	delete $self->{deny_reset};
2009	$self->{deny_save} = 1;	2174	$self->{deny_save} = 1;
2010	$self->reset_timeout (1);	2175	$self->reset_timeout (1);
2011	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2176	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2012		2177
2013	$cf::MAP{$self->path} = $self;	2178	$cf::MAP{$self->path} = $self;
		2179	}
2014		2180
2015	$self->reset; # polite request, might not happen	2181	$self->reset; # polite request, might not happen
2016	}	2182	}
2017		2183
2018	=item $maps = cf::map::tmp_maps	2184	=item $maps = cf::map::tmp_maps
…		…
2094		2260
2095	sub inv_recursive {	2261	sub inv_recursive {
2096	inv_recursive_ inv $_[0]	2262	inv_recursive_ inv $_[0]
2097	}	2263	}
2098		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
2099	package cf;	2296	package cf;
2100		2297
2101	=back	2298	=back
2102		2299
2103	=head3 cf::object::player	2300	=head3 cf::object::player
…		…
2125		2322
2126	} else {	2323	} else {
2127	my $pl = $self->contr;	2324	my $pl = $self->contr;
2128		2325
2129	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2326	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2130	my $diag = $pl->{npc_dialog};	2327	my $dialog = $pl->{npc_dialog};
2131	$diag->{pl}->ext_reply (	2328	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2132	$diag->{id},
2133	msgtype => "reply",
2134	msg => $diag->{pl}->expand_cfpod ($msg),
2135	add_topics => []
2136	);
2137		2329
2138	} else {	2330	} else {
2139	$msg = $npc->name . " says: $msg" if $npc;	2331	$msg = $npc->name . " says: $msg" if $npc;
2140	$self->message ($msg, $flags);	2332	$self->message ($msg, $flags);
2141	}	2333	}
2142	}	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 (@_);
2143	}	2345	}
2144		2346
2145	=item $player_object->may ("access")	2347	=item $player_object->may ("access")
2146		2348
2147	Returns wether the given player is authorized to access resource "access"	2349	Returns wether the given player is authorized to access resource "access"
…		…
2226	# use -1 or undef as default coordinates, not 0, 0	2428	# use -1 or undef as default coordinates, not 0, 0
2227	($x, $y) = ($map->enter_x, $map->enter_y)	2429	($x, $y) = ($map->enter_x, $map->enter_y)
2228	if $x <=0 && $y <= 0;	2430	if $x <=0 && $y <= 0;
2229		2431
2230	$map->load;	2432	$map->load;
2231	$map->load_diag;	2433	$map->load_neighbours;
2232		2434
2233	return unless $self->contr->active;	2435	return unless $self->contr->active;
2234	$self->activate_recursive;	2436	$self->activate_recursive;
2235		2437
2236	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2438	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2237	$self->enter_map ($map, $x, $y);	2439	$self->enter_map ($map, $x, $y);
2238	}	2440	}
2239		2441
2240	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2442	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2241		2443
2242	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
2243	her, loading and preparing them map, calling the provided $check callback	2445	her, loading and preparing them map, calling the provided $check callback
2244	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
2245	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.
2246		2449
2247	=cut	2450	=cut
2248		2451
2249	our $GOTOGEN;	2452	our $GOTOGEN;
2250		2453
2251	sub cf::object::player::goto {	2454	sub cf::object::player::goto {
2252	my ($self, $path, $x, $y, $check) = @_;	2455	my ($self, $path, $x, $y, $check, $done) = @_;
2253		2456
2254	# 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
2255	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2458	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2256		2459
2257	$self->enter_link;	2460	$self->enter_link;
2258		2461
2259	(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	# todo: use ob_blocked to check all tiles of the destination "object"
		2469	# for suitability.
		2470
		2471	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2472	}
		2473	}
		2474
2260	my $map = eval {	2475	my $map = eval {
2261	my $map = cf::map::find $path;	2476	my $map = cf::map::find $path;
2262		2477
2263	if ($map) {	2478	if ($map) {
2264	$map = $map->customise_for ($self);	2479	$map = $map->customise_for ($self);
…		…
2277		2492
2278	if ($gen == $self->{_goto_generation}) {	2493	if ($gen == $self->{_goto_generation}) {
2279	delete $self->{_goto_generation};	2494	delete $self->{_goto_generation};
2280	$self->leave_link ($map, $x, $y);	2495	$self->leave_link ($map, $x, $y);
2281	}	2496	}
		2497
		2498	$done->() if $done;
2282	})->prio (1);	2499	})->prio (1);
2283	}	2500	}
2284		2501
2285	=item $player_object->enter_exit ($exit_object)	2502	=item $player_object->enter_exit ($exit_object)
2286		2503
…		…
2355	my $hp = $exit->stats->hp;	2572	my $hp = $exit->stats->hp;
2356	my $sp = $exit->stats->sp;	2573	my $sp = $exit->stats->sp;
2357		2574
2358	$self->enter_link;	2575	$self->enter_link;
2359		2576
		2577	# if exit is damned, update players death & WoR home-position
		2578	$self->contr->savebed ($slaying, $hp, $sp)
		2579	if $exit->flag (FLAG_DAMNED);
		2580
2360	(async {	2581	(async {
2361	$self->deactivate_recursive; # just to be sure	2582	$self->deactivate_recursive; # just to be sure
2362	unless (eval {	2583	unless (eval {
2363	$self->goto ($slaying, $hp, $sp);	2584	$self->goto ($slaying, $hp, $sp);
2364		2585
…		…
2391		2612
2392	utf8::encode $text;	2613	utf8::encode $text;
2393	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2614	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2394	}	2615	}
2395		2616
2396	=item $client->send_msg ($color, $type, $msg, [extra...])	2617	=item $client->send_msg ($channel, $msg, $color, [extra...])
2397		2618
2398	Send a drawinfo or msg packet to the client, formatting the msg for the	2619	Send a drawinfo or msg packet to the client, formatting the msg for the
2399	client if neccessary. C<$type> should be a string identifying the type of	2620	client if neccessary. C<$type> should be a string identifying the type of
2400	the message, with C<log> being the default. If C<$color> is negative, suppress	2621	the message, with C<log> being the default. If C<$color> is negative, suppress
2401	the message unless the client supports the msg packet.	2622	the message unless the client supports the msg packet.
2402		2623
2403	=cut	2624	=cut
2404		2625
		2626	our %CHANNEL = (
		2627	"c/identify" => {
		2628	id => "identify",
		2629	title => "Identify",
		2630	reply => undef,
		2631	tooltip => "Items recently identified",
		2632	},
		2633	"c/examine" => {
		2634	id => "examine",
		2635	title => "Examine",
		2636	reply => undef,
		2637	tooltip => "Signs and other items you examined",
		2638	},
		2639	);
		2640
2405	sub cf::client::send_msg {	2641	sub cf::client::send_msg {
2406	my ($self, $color, $type, $msg, @extra) = @_;	2642	my ($self, $channel, $msg, $color, @extra) = @_;
2407		2643
2408	$msg = $self->pl->expand_cfpod ($msg);	2644	$msg = $self->pl->expand_cfpod ($msg);
2409		2645
		2646	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2647
		2648	# check predefined channels, for the benefit of C
		2649	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};
		2650
		2651	if (ref $channel) {
		2652	# send meta info to client, if not yet sent
		2653	unless (exists $self->{channel}{$channel->{id}}) {
		2654	$self->{channel}{$channel->{id}} = $channel;
		2655	$self->ext_msg (channel_info => $channel)
		2656	if $self->can_msg;
		2657	}
		2658
		2659	$channel = $channel->{id};
		2660	}
		2661
		2662	return unless @extra \|\| length $msg;
		2663
2410	if ($self->can_msg) {	2664	if ($self->can_msg) {
		2665	# default colour, mask it out
		2666	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2667	if $color & cf::NDI_DEF;
		2668
2411	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));	2669	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2670	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2412	} else {	2671	} else {
2413	# replace some tags by gcfclient-compatible ones
2414	for ($msg) {
2415	1 while
2416	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2417	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2418	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2419	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2420	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2421	}
2422
2423	if ($color >= 0) {	2672	if ($color >= 0) {
		2673	# replace some tags by gcfclient-compatible ones
		2674	for ($msg) {
		2675	1 while
		2676	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2677	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2678	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2679	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2680	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2681	}
		2682
		2683	$color &= cf::NDI_COLOR_MASK;
		2684
		2685	utf8::encode $msg;
		2686
2424	if (0 && $msg =~ /\[/) {	2687	if (0 && $msg =~ /\[/) {
		2688	# COMMAND/INFO
2425	$self->send_packet ("drawextinfo $color 4 0 $msg")	2689	$self->send_packet ("drawextinfo $color 10 8 $msg")
2426	} else {	2690	} else {
2427	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2691	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2428	$self->send_packet ("drawinfo $color $msg")	2692	$self->send_packet ("drawinfo $color $msg")
2429	}	2693	}
2430	}	2694	}
2431	}	2695	}
2432	}	2696	}
2433		2697
2434	=item $client->ext_event ($type, %msg)	2698	=item $client->ext_msg ($type, @msg)
2435		2699
2436	Sends an ext event to the client.	2700	Sends an ext event to the client.
2437		2701
2438	=cut	2702	=cut
2439		2703
2440	sub cf::client::ext_event($$%) {	2704	sub cf::client::ext_msg($$@) {
2441	my ($self, $type, %msg) = @_;	2705	my ($self, $type, @msg) = @_;
2442		2706
		2707	if ($self->extcmd == 2) {
		2708	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2709	} elsif ($self->extcmd == 1) { # TODO: remove
2443	$msg{msgtype} = "event_$type";	2710	push @msg, msgtype => "event_$type";
2444	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2711	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2712	}
		2713	}
		2714
		2715	=item $client->ext_reply ($msgid, @msg)
		2716
		2717	Sends an ext reply to the client.
		2718
		2719	=cut
		2720
		2721	sub cf::client::ext_reply($$@) {
		2722	my ($self, $id, @msg) = @_;
		2723
		2724	if ($self->extcmd == 2) {
		2725	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2726	} elsif ($self->extcmd == 1) {
		2727	#TODO: version 1, remove
		2728	unshift @msg, msgtype => "reply", msgid => $id;
		2729	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2730	}
2445	}	2731	}
2446		2732
2447	=item $success = $client->query ($flags, "text", \&cb)	2733	=item $success = $client->query ($flags, "text", \&cb)
2448		2734
2449	Queues a query to the client, calling the given callback with	2735	Queues a query to the client, calling the given callback with
…		…
2504	my ($ns, $buf) = @_;	2790	my ($ns, $buf) = @_;
2505		2791
2506	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2792	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2507		2793
2508	if (ref $msg) {	2794	if (ref $msg) {
		2795	my ($type, $reply, @payload) =
		2796	"ARRAY" eq ref $msg
		2797	? @$msg
		2798	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2799
		2800	my @reply;
		2801
2509	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2802	if (my $cb = $EXTICMD{$type}) {
2510	if (my %reply = $cb->($ns, $msg)) {	2803	@reply = $cb->($ns, @payload);
2511	$reply{msgid} = $msg->{msgid};
2512	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2513	}
2514	}	2804	}
		2805
		2806	$ns->ext_reply ($reply, @reply)
		2807	if $reply;
		2808
2515	} else {	2809	} else {
2516	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2810	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2517	}	2811	}
2518		2812
2519	cf::override;	2813	cf::override;
…		…
2566	our $safe = new Safe "safe";	2860	our $safe = new Safe "safe";
2567	our $safe_hole = new Safe::Hole;	2861	our $safe_hole = new Safe::Hole;
2568		2862
2569	$SIG{FPE} = 'IGNORE';	2863	$SIG{FPE} = 'IGNORE';
2570		2864
2571	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2865	$safe->permit_only (Opcode::opset qw(
		2866	:base_core :base_mem :base_orig :base_math
		2867	grepstart grepwhile mapstart mapwhile
		2868	sort time
		2869	));
2572		2870
2573	# here we export the classes and methods available to script code	2871	# here we export the classes and methods available to script code
2574		2872
2575	=pod	2873	=pod
2576		2874
2577	The following functions and methods are available within a safe environment:	2875	The following functions and methods are available within a safe environment:
2578		2876
2579	cf::object contr pay_amount pay_player map	2877	cf::object
		2878	contr pay_amount pay_player map x y force_find force_add
		2879	insert remove name archname title slaying race decrease_ob_nr
		2880
2580	cf::object::player player	2881	cf::object::player
2581	cf::player peaceful	2882	player
2582	cf::map trigger	2883
		2884	cf::player
		2885	peaceful
		2886
		2887	cf::map
		2888	trigger
2583		2889
2584	=cut	2890	=cut
2585		2891
2586	for (	2892	for (
2587	["cf::object" => qw(contr pay_amount pay_player map)],	2893	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2894	insert remove inv name archname title slaying race
		2895	decrease_ob_nr)],
2588	["cf::object::player" => qw(player)],	2896	["cf::object::player" => qw(player)],
2589	["cf::player" => qw(peaceful)],	2897	["cf::player" => qw(peaceful)],
2590	["cf::map" => qw(trigger)],	2898	["cf::map" => qw(trigger)],
2591	) {	2899	) {
2592	no strict 'refs';	2900	no strict 'refs';
…		…
2668	# the server's init and main functions	2976	# the server's init and main functions
2669		2977
2670	sub load_facedata($) {	2978	sub load_facedata($) {
2671	my ($path) = @_;	2979	my ($path) = @_;
2672		2980
		2981	# HACK to clear player env face cache, we need some signal framework
		2982	# for this (global event?)
		2983	%ext::player_env::MUSIC_FACE_CACHE = ();
		2984
		2985	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		2986
2673	warn "loading facedata from $path\n";	2987	warn "loading facedata from $path\n";
2674		2988
2675	my $facedata;	2989	my $facedata;
2676	0 < aio_load $path, $facedata	2990	0 < aio_load $path, $facedata
2677	or die "$path: $!";	2991	or die "$path: $!";
…		…
2679	$facedata = Coro::Storable::thaw $facedata;	2993	$facedata = Coro::Storable::thaw $facedata;
2680		2994
2681	$facedata->{version} == 2	2995	$facedata->{version} == 2
2682	or cf::cleanup "$path: version mismatch, cannot proceed.";	2996	or cf::cleanup "$path: version mismatch, cannot proceed.";
2683		2997
		2998	# patch in the exptable
		2999	$facedata->{resource}{"res/exp_table"} = {
		3000	type => FT_RSRC,
		3001	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3002	};
		3003	cf::cede_to_tick;
		3004
2684	{	3005	{
2685	my $faces = $facedata->{faceinfo};	3006	my $faces = $facedata->{faceinfo};
2686		3007
2687	while (my ($face, $info) = each %$faces) {	3008	while (my ($face, $info) = each %$faces) {
2688	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3009	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2689	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3010	cf::face::set_visibility $idx, $info->{visibility};
		3011	cf::face::set_magicmap $idx, $info->{magicmap};
2690	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3012	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2691	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3013	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2692	Coro::cede;	3014
		3015	cf::cede_to_tick;
2693	}	3016	}
2694		3017
2695	while (my ($face, $info) = each %$faces) {	3018	while (my ($face, $info) = each %$faces) {
2696	next unless $info->{smooth};	3019	next unless $info->{smooth};
2697	my $idx = cf::face::find $face	3020	my $idx = cf::face::find $face
2698	or next;	3021	or next;
2699	if (my $smooth = cf::face::find $info->{smooth}) {	3022	if (my $smooth = cf::face::find $info->{smooth}) {
		3023	cf::face::set_smooth $idx, $smooth;
2700	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3024	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2701	} else {	3025	} else {
2702	warn "smooth face '$info->{smooth}' not found for face '$face'";	3026	warn "smooth face '$info->{smooth}' not found for face '$face'";
2703	}	3027	}
2704	Coro::cede;	3028
		3029	cf::cede_to_tick;
2705	}	3030	}
2706	}	3031	}
2707		3032
2708	{	3033	{
2709	my $anims = $facedata->{animinfo};	3034	my $anims = $facedata->{animinfo};
2710		3035
2711	while (my ($anim, $info) = each %$anims) {	3036	while (my ($anim, $info) = each %$anims) {
2712	cf::anim::set $anim, $info->{frames}, $info->{facings};	3037	cf::anim::set $anim, $info->{frames}, $info->{facings};
2713	Coro::cede;	3038	cf::cede_to_tick;
2714	}	3039	}
2715		3040
2716	cf::anim::invalidate_all; # d'oh	3041	cf::anim::invalidate_all; # d'oh
2717	}	3042	}
2718		3043
		3044	{
		3045	# TODO: for gcfclient pleasure, we should give resources
		3046	# that gcfclient doesn't grok a >10000 face index.
		3047	my $res = $facedata->{resource};
		3048
		3049	my $soundconf = delete $res->{"res/sound.conf"};
		3050
		3051	while (my ($name, $info) = each %$res) {
		3052	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3053	my $data;
		3054
		3055	if ($info->{type} & 1) {
		3056	# prepend meta info
		3057
		3058	my $meta = $enc->encode ({
		3059	name => $name,
		3060	%{ $info->{meta} \|\| {} },
		3061	});
		3062
		3063	$data = pack "(w/a)", $meta, $info->{data};
		3064	} else {
		3065	$data = $info->{data};
		3066	}
		3067
		3068	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3069	cf::face::set_type $idx, $info->{type};
		3070
		3071	cf::cede_to_tick;
		3072	}
		3073
		3074	if ($soundconf) {
		3075	$soundconf = $enc->decode (delete $soundconf->{data});
		3076
		3077	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3078	my $sound = $soundconf->{compat}[$_]
		3079	or next;
		3080
		3081	my $face = cf::face::find "sound/$sound->[1]";
		3082	cf::sound::set $sound->[0] => $face;
		3083	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3084	}
		3085
		3086	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3087	my $face = cf::face::find "sound/$v";
		3088	cf::sound::set $k => $face;
		3089	}
		3090	}
		3091	}
		3092
2719	1	3093	1
2720	}	3094	}
2721		3095
		3096	register_exticmd fx_want => sub {
		3097	my ($ns, $want) = @_;
		3098
		3099	while (my ($k, $v) = each %$want) {
		3100	$ns->fx_want ($k, $v);
		3101	}
		3102	};
		3103
2722	sub reload_regions {	3104	sub reload_regions {
		3105	# HACK to clear player env face cache, we need some signal framework
		3106	# for this (global event?)
		3107	%ext::player_env::MUSIC_FACE_CACHE = ();
		3108
2723	load_resource_file "$MAPDIR/regions"	3109	load_resource_file "$MAPDIR/regions"
2724	or die "unable to load regions file\n";	3110	or die "unable to load regions file\n";
		3111
		3112	for (cf::region::list) {
		3113	$_->{match} = qr/$_->{match}/
		3114	if exists $_->{match};
		3115	}
2725	}	3116	}
2726		3117
2727	sub reload_facedata {	3118	sub reload_facedata {
2728	load_facedata "$DATADIR/facedata"	3119	load_facedata "$DATADIR/facedata"
2729	or die "unable to load facedata\n";	3120	or die "unable to load facedata\n";
…		…
2758		3149
2759	sub init {	3150	sub init {
2760	reload_resources;	3151	reload_resources;
2761	}	3152	}
2762		3153
2763	sub cfg_load {	3154	sub reload_config {
2764	open my $fh, "<:utf8", "$CONFDIR/config"	3155	open my $fh, "<:utf8", "$CONFDIR/config"
2765	or return;	3156	or return;
2766		3157
2767	local $/;	3158	local $/;
2768	*CFG = YAML::Syck::Load <$fh>;	3159	*CFG = YAML::Syck::Load <$fh>;
…		…
2788	(async {	3179	(async {
2789	Event::one_event;	3180	Event::one_event;
2790	})->prio (Coro::PRIO_MAX);	3181	})->prio (Coro::PRIO_MAX);
2791	};	3182	};
2792		3183
2793	cfg_load;	3184	reload_config;
2794	db_init;	3185	db_init;
2795	load_extensions;	3186	load_extensions;
2796		3187
2797	$TICK_WATCHER->start;	3188	$TICK_WATCHER->start;
2798	Event::loop;	3189	Event::loop;
…		…
2991	warn "reloading cf.pm";	3382	warn "reloading cf.pm";
2992	require cf;	3383	require cf;
2993	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3384	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2994		3385
2995	warn "loading config and database again";	3386	warn "loading config and database again";
2996	cf::cfg_load;	3387	cf::reload_config;
2997		3388
2998	warn "loading extensions";	3389	warn "loading extensions";
2999	cf::load_extensions;	3390	cf::load_extensions;
3000		3391
3001	warn "reattaching attachments to objects/players";	3392	warn "reattaching attachments to objects/players";
…		…
3066	my $signal = new Coro::Signal;	3457	my $signal = new Coro::Signal;
3067	push @WAIT_FOR_TICK_BEGIN, $signal;	3458	push @WAIT_FOR_TICK_BEGIN, $signal;
3068	$signal->wait;	3459	$signal->wait;
3069	}	3460	}
3070		3461
3071	my $min = 1e6;#d#	3462	our $stat_fh;
3072	my $avg = 10;	3463	sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND \| Fcntl::O_CREAT \| Fcntl::O_WRONLY, 0600;#d#
		3464
3073	$TICK_WATCHER = Event->timer (	3465	$TICK_WATCHER = Event->timer (
3074	reentrant => 0,	3466	reentrant => 0,
3075	parked => 1,	3467	parked => 1,
3076	prio => 0,	3468	prio => 0,
3077	at => $NEXT_TICK \|\| $TICK,	3469	at => $NEXT_TICK \|\| $TICK,
…		…
3081	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3473	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3082	unless ++$bug_warning > 10;	3474	unless ++$bug_warning > 10;
3083	return;	3475	return;
3084	}	3476	}
3085		3477
		3478	my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
		3479
3086	$NOW = $tick_start = Event::time;	3480	$NOW = $tick_start = Event::time;
3087		3481
3088	cf::server_tick; # one server iteration	3482	cf::server_tick; # one server iteration
3089
3090	0 && sync_job {#d#
3091	for(1..10) {
3092	my $t = Event::time;
3093	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3094	or die;
3095
3096	$map->width (50);
3097	$map->height (50);
3098	$map->alloc;
3099	$map->_load_objects ("/tmp/x.map", 1);
3100	my $t = Event::time - $t;
3101
3102	#next unless $t < 0.0013;#d#
3103	if ($t < $min) {
3104	$min = $t;
3105	}
3106	$avg = $avg * 0.99 + $t * 0.01;
3107	}
3108	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3109	exit 0;
3110	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3111	};
3112		3483
3113	$RUNTIME += $TICK;	3484	$RUNTIME += $TICK;
3114	$NEXT_TICK += $TICK;	3485	$NEXT_TICK += $TICK;
3115		3486
3116	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3487	if ($NOW >= $NEXT_RUNTIME_WRITE) {
…		…
3142	$LOAD = ($NOW - $tick_start) / $TICK;	3513	$LOAD = ($NOW - $tick_start) / $TICK;
3143	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3514	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3144		3515
3145	_post_tick;	3516	_post_tick;
3146		3517
3147		3518	# gather some statistics#d#
		3519	$stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
		3520	IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
3148	},	3521	},
3149	);	3522	);
3150		3523
3151	{	3524	{
		3525	BDB::min_parallel 8;
3152	BDB::max_poll_time $TICK * 0.1;	3526	BDB::max_poll_time $TICK * 0.1;
3153	$BDB_POLL_WATCHER = Event->io (	3527	$BDB_POLL_WATCHER = Event->io (
3154	reentrant => 0,	3528	reentrant => 0,
3155	fd => BDB::poll_fileno,	3529	fd => BDB::poll_fileno,
3156	poll => 'r',	3530	poll => 'r',
3157	prio => 0,	3531	prio => 0,
3158	data => WF_AUTOCANCEL,	3532	data => WF_AUTOCANCEL,
3159	cb => \&BDB::poll_cb,	3533	cb => \&BDB::poll_cb,
3160	);	3534	);
3161	BDB::min_parallel 8;
3162		3535
3163	BDB::set_sync_prepare {	3536	BDB::set_sync_prepare {
3164	my $status;	3537	my $status;
3165	my $current = $Coro::current;	3538	my $current = $Coro::current;
3166	(	3539	(
…		…
3187	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3560	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3188	0666;	3561	0666;
3189		3562
3190	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3563	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3191		3564
3192	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);	3565	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC
		3566	\| BDB::LOG_AUTOREMOVE, 1);
3193	$DB_ENV->set_lk_detect;	3567	$DB_ENV->set_lk_detect;
3194	};	3568	};
3195		3569
3196	cf::cleanup "db_env_open(db): $@" if $@;	3570	cf::cleanup "db_env_open(db): $@" if $@;
3197	};	3571	};
3198	}	3572	}
		3573
		3574	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3575	after => 11,
		3576	interval => 60,
		3577	hard => 1,
		3578	prio => 0,
		3579	data => WF_AUTOCANCEL,
		3580	cb => sub {
		3581	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3582	},
		3583	);
		3584	$BDB_TRICKLE_WATCHER = Event->timer (
		3585	after => 5,
		3586	interval => 10,
		3587	hard => 1,
		3588	prio => 0,
		3589	data => WF_AUTOCANCEL,
		3590	cb => sub {
		3591	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3592	},
		3593	);
3199	}	3594	}
3200		3595
3201	{	3596	{
3202	IO::AIO::min_parallel 8;	3597	IO::AIO::min_parallel 8;
3203		3598

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.291 by root, Tue Jul 3 00:54:44 2007 UTC vs. Revision 1.366 by root, Tue Sep 11 16:05:35 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.291 by root, Tue Jul 3 00:54:44 2007 UTC vs.
Revision 1.366 by root, Tue Sep 11 16:05:35 2007 UTC