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

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

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.293 by root, Tue Jul 3 05:14:15 2007 UTC vs. Revision 1.364 by root, Tue Sep 11 08:41:11 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.293 by root, Tue Jul 3 05:14:15 2007 UTC vs.
Revision 1.364 by root, Tue Sep 11 08:41:11 2007 UTC