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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.300 by root, Tue Jul 10 06:44:29 2007 UTC vs.
Revision 1.367 by root, Wed Sep 12 11:10: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
…		…
409	Coro::Storable. May, of course, block. Note that the executed sub may	485	Coro::Storable. May, of course, block. Note that the executed sub may
410	never block itself or use any form of Event handling.	486	never block itself or use any form of Event handling.
411		487
412	=cut	488	=cut
413		489
414	sub _store_scalar {
415	open my $fh, ">", \my $buf
416	or die "fork_call: cannot open fh-to-buf in child : $!";
417	Storable::store_fd $_[0], $fh;
418	close $fh;
419
420	$buf
421	}
422
423	sub fork_call(&@) {	490	sub fork_call(&@) {
424	my ($cb, @args) = @_;	491	my ($cb, @args) = @_;
425		492
426	# 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,
427	# or die "socketpair: $!";	494	# otherwise perl prematurely frees the stuff :/
428	pipe my $fh1, my $fh2	495	# TODO: investigate and fix (likely this will be rather laborious)
429	or die "pipe: $!";
430		496
431	if (my $pid = fork) {	497	my @res = Coro::Util::fork_eval {
432	close $fh2;
433
434	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
435	warn "pst<$res>" unless $res =~ /^pst/;
436	$res = Coro::Storable::thaw $res;
437
438	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
439
440	Carp::confess $$res unless "ARRAY" eq ref $res;
441
442	return wantarray ? @$res : $res->[-1];
443	} else {
444	reset_signals;	498	reset_signals;
445	local $SIG{__WARN__};	499	&$cb
446	local $SIG{__DIE__};	500	}, @args;
447	# just in case, this hack effectively disables event
448	# in the child. cleaner and slower would be canceling all watchers,
449	# but this works for the time being.
450	local $Coro::idle;
451	$Coro::current->prio (Coro::PRIO_MAX);
452		501
453	eval {	502	wantarray ? @res : $res[-1]
454	close $fh1;
455
456	my @res = eval { $cb->(@args) };
457
458	syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
459	close $fh2;
460	};
461
462	warn $@ if $@;
463	_exit 0;
464	}
465	}	503	}
466		504
467	=item $value = cf::db_get $family => $key	505	=item $value = cf::db_get $family => $key
468		506
469	Returns a single value from the environment database.	507	Returns a single value from the environment database.
…		…
471	=item cf::db_put $family => $key => $value	509	=item cf::db_put $family => $key => $value
472		510
473	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
474	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).
475		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
476	=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	}
477		537
478	our $DB;	538	our $DB;
479		539
480	sub db_init {	540	sub db_init {
481	unless ($DB) {
482	$DB = BDB::db_create $DB_ENV;
483
484	cf::sync_job {	541	cf::sync_job {
485	eval {	542	$DB \|\|= db_table "db";
486	$DB->set_flags (BDB::CHKSUM);
487
488	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
489	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
490	cf::cleanup "db_open(db): $!" if $!;
491	};
492	cf::cleanup "db_open(db): $@" if $@;
493	};
494	}	543	};
495	}	544	}
496		545
497	sub db_get($$) {	546	sub db_get($$) {
498	my $key = "$_[0]/$_[1]";	547	my $key = "$_[0]/$_[1]";
499		548
…		…
549	if (1) {	598	if (1) {
550	$md5 =	599	$md5 =
551	join "\x00",	600	join "\x00",
552	$processversion,	601	$processversion,
553	map {	602	map {
554	Coro::cede;	603	cf::cede_to_tick;
555	($src->[$_], Digest::MD5::md5_hex $data[$_])	604	($src->[$_], Digest::MD5::md5_hex $data[$_])
556	} 0.. $#$src;	605	} 0.. $#$src;
557		606
558		607
559	my $dbmd5 = db_get cache => "$id/md5";	608	my $dbmd5 = db_get cache => "$id/md5";
…		…
865	";	914	";
866	die if $@;	915	die if $@;
867	}	916	}
868		917
869	our $override;	918	our $override;
870	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?
871		920
872	sub override {	921	sub override {
873	$override = 1;	922	$override = 1;
874	@invoke_results = ();	923	@INVOKE_RESULTS = (@_);
875	}	924	}
876		925
877	sub do_invoke {	926	sub do_invoke {
878	my $event = shift;	927	my $event = shift;
879	my $callbacks = shift;	928	my $callbacks = shift;
880		929
881	@invoke_results = ();	930	@INVOKE_RESULTS = ();
882		931
883	local $override;	932	local $override;
884		933
885	for (@$callbacks) {	934	for (@$callbacks) {
886	eval { &{$_->[1]} };	935	eval { &{$_->[1]} };
…		…
903		952
904	Generate an object-specific event with the given arguments.	953	Generate an object-specific event with the given arguments.
905		954
906	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
907	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
908	results (if you must, access C<@cf::invoke_results> directly).	957	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
909		958
910	=back	959	=back
911		960
912	=cut	961	=cut
913		962
914	#############################################################################	963	#############################################################################
915	# 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	}
916		976
917	sub reattach {	977	sub reattach {
918	# basically do the same as instantiate, without calling instantiate	978	# basically do the same as instantiate, without calling instantiate
919	my ($obj) = @_;	979	my ($obj) = @_;
920		980
…		…
965	);	1025	);
966		1026
967	sub object_freezer_save {	1027	sub object_freezer_save {
968	my ($filename, $rdata, $objs) = @_;	1028	my ($filename, $rdata, $objs) = @_;
969		1029
		1030	my $guard = cf::lock_acquire "io";
		1031
970	sync_job {	1032	sync_job {
971	if (length $$rdata) {	1033	if (length $$rdata) {
		1034	utf8::decode (my $decname = $filename);
972	warn sprintf "saving %s (%d,%d)\n",	1035	warn sprintf "saving %s (%d,%d)\n",
973	$filename, length $$rdata, scalar @$objs;	1036	$decname, length $$rdata, scalar @$objs;
974		1037
975	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1038	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
976	chmod SAVE_MODE, $fh;	1039	chmod SAVE_MODE, $fh;
977	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1040	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
978	aio_fsync $fh if $cf::USE_FSYNC;	1041	aio_fsync $fh if $cf::USE_FSYNC;
…		…
997	}	1060	}
998	} else {	1061	} else {
999	aio_unlink $filename;	1062	aio_unlink $filename;
1000	aio_unlink "$filename.pst";	1063	aio_unlink "$filename.pst";
1001	}	1064	}
1002	}	1065	};
		1066
		1067	undef $guard;
1003	}	1068	}
1004		1069
1005	sub object_freezer_as_string {	1070	sub object_freezer_as_string {
1006	my ($rdata, $objs) = @_;	1071	my ($rdata, $objs) = @_;
1007		1072
…		…
1012		1077
1013	sub object_thawer_load {	1078	sub object_thawer_load {
1014	my ($filename) = @_;	1079	my ($filename) = @_;
1015		1080
1016	my ($data, $av);	1081	my ($data, $av);
		1082
		1083	my $guard = cf::lock_acquire "io";
1017		1084
1018	(aio_load $filename, $data) >= 0	1085	(aio_load $filename, $data) >= 0
1019	or return;	1086	or return;
1020		1087
1021	unless (aio_stat "$filename.pst") {	1088	unless (aio_stat "$filename.pst") {
1022	(aio_load "$filename.pst", $av) >= 0	1089	(aio_load "$filename.pst", $av) >= 0
1023	or return;	1090	or return;
		1091
		1092	undef $guard;
1024	$av = eval { (Storable::thaw $av)->{objs} };	1093	$av = eval { (Storable::thaw $av)->{objs} };
1025	}	1094	}
1026		1095
		1096	utf8::decode (my $decname = $filename);
1027	warn sprintf "loading %s (%d)\n",	1097	warn sprintf "loading %s (%d,%d)\n",
1028	$filename, length $data, scalar @{$av \|\| []};	1098	$decname, length $data, scalar @{$av \|\| []};
		1099
1029	return ($data, $av);	1100	($data, $av)
1030	}	1101	}
1031		1102
1032	=head2 COMMAND CALLBACKS	1103	=head2 COMMAND CALLBACKS
1033		1104
1034	=over 4	1105	=over 4
…		…
1107	my ($pl, $buf) = @_;	1178	my ($pl, $buf) = @_;
1108		1179
1109	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1180	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1110		1181
1111	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
1112	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1190	if (my $cb = $EXTCMD{$type}) {
1113	if (my %reply = $cb->($pl, $msg)) {	1191	@reply = $cb->($pl, @payload);
1114	$pl->ext_reply ($msg->{msgid}, %reply);
1115	}
1116	}	1192	}
		1193
		1194	$pl->ext_reply ($reply, @reply)
		1195	if $reply;
		1196
1117	} else {	1197	} else {
1118	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1198	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1119	}	1199	}
1120		1200
1121	cf::override;	1201	cf::override;
…		…
1211		1291
1212	=head3 cf::player	1292	=head3 cf::player
1213		1293
1214	=over 4	1294	=over 4
1215		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
1216	=item cf::player::find $login	1310	=item cf::player::find $login
1217		1311
1218	Returns the given player object, loading it if necessary (might block).	1312	Returns the given player object, loading it if necessary (might block).
1219		1313
1220	=cut	1314	=cut
…		…
1255	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1349	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1256	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1350	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1257	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1351	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1258	aio_unlink +(playerdir $login) . "/$login.pl";	1352	aio_unlink +(playerdir $login) . "/$login.pl";
1259		1353
1260	my $pl = load_pl path $login	1354	my $f = new_from_file cf::object::thawer path $login
1261	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;
1262	$cf::PLAYER{$login} = $pl	1362	$cf::PLAYER{$login} = $pl
1263	}	1363	}
1264	}	1364	}
1265	}	1365	}
1266		1366
…		…
1276		1376
1277	aio_mkdir playerdir $pl, 0770;	1377	aio_mkdir playerdir $pl, 0770;
1278	$pl->{last_save} = $cf::RUNTIME;	1378	$pl->{last_save} = $cf::RUNTIME;
1279		1379
1280	$pl->save_pl ($path);	1380	$pl->save_pl ($path);
1281	Coro::cede;	1381	cf::cede_to_tick;
1282	}	1382	}
1283		1383
1284	sub new($) {	1384	sub new($) {
1285	my ($login) = @_;	1385	my ($login) = @_;
1286		1386
…		…
1290	$self->{deny_save} = 1;	1390	$self->{deny_save} = 1;
1291		1391
1292	$cf::PLAYER{$login} = $self;	1392	$cf::PLAYER{$login} = $self;
1293		1393
1294	$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 (@_);
1295	}	1405	}
1296		1406
1297	=item $pl->quit_character	1407	=item $pl->quit_character
1298		1408
1299	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
…		…
1354	or return [];	1464	or return [];
1355		1465
1356	my @logins;	1466	my @logins;
1357		1467
1358	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") {
1359	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1473	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1360	aio_read $fh, 0, 512, my $buf, 0 or next;	1474	aio_read $fh, 0, 512, my $buf, 0 or next;
1361	$buf !~ /^password -------------$/m or next; # official not-valid tag	1475	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1476	}
1362		1477
1363	utf8::decode $login;	1478	utf8::decode $login;
1364	push @logins, $login;	1479	push @logins, $login;
1365	}	1480	}
1366		1481
…		…
1404	sub expand_cfpod {	1519	sub expand_cfpod {
1405	((my $self), (local $_)) = @_;	1520	((my $self), (local $_)) = @_;
1406		1521
1407	# escape & and <	1522	# escape & and <
1408	s/&/&/g;	1523	s/&/&/g;
1409	s/(?<![BIUGH])</</g;	1524	s/(?<![BIUGHT])</</g;
1410		1525
1411	# 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
1412		1527
1413	1 while	1528	1 while
1414	# replace B<>, I<>, U<> etc.	1529	# replace B<>, I<>, U<> etc.
1415	s/B<([^\>]*)>/<b>$1<\/b>/	1530	s/B<([^\>]*)>/<b>$1<\/b>/
1416	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1531	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1417	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1532	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1533	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1418	# replace G<male\|female> tags	1534	# replace G<male\|female> tags
1419	\|\| s{G<([^>\|])\\|([^>])>}{	1535	\|\| s{G<([^>\|])\\|([^>])>}{
1420	$self->gender ? $2 : $1	1536	$self->gender ? $2 : $1
1421	}ge	1537	}ge
1422	# replace H<hint text>	1538	# replace H<hint text>
…		…
1435	s/\s+\n/\n/g; # ws line-ends	1551	s/\s+\n/\n/g; # ws line-ends
1436	s/\n\n+/\n/g; # double lines	1552	s/\n\n+/\n/g; # double lines
1437	s/^\n+//; # beginning lines	1553	s/^\n+//; # beginning lines
1438	s/\n+$//; # ending lines	1554	s/\n+$//; # ending lines
1439		1555
1440	warn $_;#d#
1441	$_	1556	$_
1442	}	1557	}
1443		1558
1444	sub hintmode {	1559	sub hintmode {
1445	$_[0]{hintmode} = $_[1] if @_ > 1;	1560	$_[0]{hintmode} = $_[1] if @_ > 1;
1446	$_[0]{hintmode}	1561	$_[0]{hintmode}
1447	}	1562	}
1448		1563
1449	=item $player->ext_reply ($msgid, %msg)	1564	=item $player->ext_reply ($msgid, @msg)
1450		1565
1451	Sends an ext reply to the player.	1566	Sends an ext reply to the player.
1452		1567
1453	=cut	1568	=cut
1454		1569
1455	sub ext_reply($$%) {	1570	sub ext_reply($$@) {
1456	my ($self, $id, %msg) = @_;	1571	my ($self, $id, @msg) = @_;
1457		1572
1458	$msg{msgid} = $id;	1573	$self->ns->ext_reply ($id, @msg)
1459	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460	}	1574	}
1461		1575
1462	=item $player->ext_event ($type, %msg)	1576	=item $player->ext_msg ($type, @msg)
1463		1577
1464	Sends an ext event to the client.	1578	Sends an ext event to the client.
1465		1579
1466	=cut	1580	=cut
1467		1581
1468	sub ext_event($$%) {	1582	sub ext_msg($$@) {
1469	my ($self, $type, %msg) = @_;	1583	my ($self, $type, @msg) = @_;
1470		1584
1471	$self->ns->ext_event ($type, %msg);	1585	$self->ns->ext_msg ($type, @msg);
1472	}	1586	}
1473		1587
1474	=head3 cf::region	1588	=head3 cf::region
1475		1589
1476	=over 4	1590	=over 4
…		…
1489	my ($path) = @_;	1603	my ($path) = @_;
1490		1604
1491	my ($match, $specificity);	1605	my ($match, $specificity);
1492		1606
1493	for my $region (list) {	1607	for my $region (list) {
1494	if ($region->match && $path =~ $region->match) {	1608	if ($region->{match} && $path =~ $region->{match}) {
1495	($match, $specificity) = ($region, $region->specificity)	1609	($match, $specificity) = ($region, $region->specificity)
1496	if $region->specificity > $specificity;	1610	if $region->specificity > $specificity;
1497	}	1611	}
1498	}	1612	}
1499		1613
…		…
1619	$self->init; # pass $1 etc.	1733	$self->init; # pass $1 etc.
1620	return $self;	1734	return $self;
1621	}	1735	}
1622	}	1736	}
1623		1737
1624	Carp::carp "unable to resolve path '$path' (base '$base').";	1738	Carp::cluck "unable to resolve path '$path' (base '$base').";
1625	()	1739	()
1626	}	1740	}
1627		1741
1628	sub init {	1742	sub init {
1629	my ($self) = @_;	1743	my ($self) = @_;
…		…
1692		1806
1693	sub load_header_from($) {	1807	sub load_header_from($) {
1694	my ($self, $path) = @_;	1808	my ($self, $path) = @_;
1695		1809
1696	utf8::encode $path;	1810	utf8::encode $path;
1697	#aio_open $path, O_RDONLY, 0	1811	my $f = new_from_file cf::object::thawer $path
1698	# or return;
1699
1700	$self->_load_header ($path)
1701	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;
1702		1819
1703	$self->{load_path} = $path;	1820	$self->{load_path} = $path;
1704		1821
1705	1	1822	1
1706	}	1823	}
…		…
1760	sub find {	1877	sub find {
1761	my ($path, $origin) = @_;	1878	my ($path, $origin) = @_;
1762		1879
1763	$path = normalise $path, $origin && $origin->path;	1880	$path = normalise $path, $origin && $origin->path;
1764		1881
		1882	cf::lock_wait "map_data:$path";#d#remove
1765	cf::lock_wait "map_find:$path";	1883	cf::lock_wait "map_find:$path";
1766		1884
1767	$cf::MAP{$path} \|\| do {	1885	$cf::MAP{$path} \|\| do {
1768	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
1769	my $map = new_from_path cf::map $path	1889	my $map = new_from_path cf::map $path
1770	or return;	1890	or return;
1771		1891
1772	$map->{last_save} = $cf::RUNTIME;	1892	$map->{last_save} = $cf::RUNTIME;
1773		1893
…		…
1775	or return;	1895	or return;
1776		1896
1777	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1897	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778	# doing this can freeze the server in a sync job, obviously	1898	# doing this can freeze the server in a sync job, obviously
1779	#$cf::WAIT_FOR_TICK->wait;	1899	#$cf::WAIT_FOR_TICK->wait;
		1900	undef $guard1;
		1901	undef $guard2;
1780	$map->reset;	1902	$map->reset;
1781	undef $guard;
1782	return find $path;	1903	return find $path;
1783	}	1904	}
1784		1905
1785	$cf::MAP{$path} = $map	1906	$cf::MAP{$path} = $map
1786	}	1907	}
…		…
1795	local $self->{deny_reset} = 1; # loading can take a long time	1916	local $self->{deny_reset} = 1; # loading can take a long time
1796		1917
1797	my $path = $self->{path};	1918	my $path = $self->{path};
1798		1919
1799	{	1920	{
1800	my $guard = cf::lock_acquire "map_load:$path";	1921	my $guard = cf::lock_acquire "map_data:$path";
1801		1922
		1923	return unless $self->valid;
1802	return if $self->in_memory != cf::MAP_SWAPPED;	1924	return unless $self->in_memory == cf::MAP_SWAPPED;
1803		1925
1804	$self->in_memory (cf::MAP_LOADING);	1926	$self->in_memory (cf::MAP_LOADING);
1805		1927
1806	$self->alloc;	1928	$self->alloc;
1807		1929
1808	$self->pre_load;	1930	$self->pre_load;
1809	Coro::cede;	1931	cf::cede_to_tick;
1810		1932
		1933	my $f = new_from_file cf::object::thawer $self->{load_path};
		1934	$f->skip_block;
1811	$self->_load_objects ($self->{load_path}, 1)	1935	$self->_load_objects ($f)
1812	or return;	1936	or return;
1813		1937
1814	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1938	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1815	if delete $self->{load_original};	1939	if delete $self->{load_original};
1816		1940
1817	if (my $uniq = $self->uniq_path) {	1941	if (my $uniq = $self->uniq_path) {
1818	utf8::encode $uniq;	1942	utf8::encode $uniq;
1819	if (aio_open $uniq, O_RDONLY, 0) {	1943	unless (aio_stat $uniq) {
		1944	if (my $f = new_from_file cf::object::thawer $uniq) {
1820	$self->clear_unique_items;	1945	$self->clear_unique_items;
1821	$self->_load_objects ($uniq, 0);	1946	$self->_load_objects ($f);
		1947	$f->resolve_delayed_derefs;
		1948	}
1822	}	1949	}
1823	}	1950	}
1824		1951
1825	Coro::cede;	1952	$f->resolve_delayed_derefs;
		1953
		1954	cf::cede_to_tick;
1826	# now do the right thing for maps	1955	# now do the right thing for maps
1827	$self->link_multipart_objects;	1956	$self->link_multipart_objects;
1828	$self->difficulty ($self->estimate_difficulty)	1957	$self->difficulty ($self->estimate_difficulty)
1829	unless $self->difficulty;	1958	unless $self->difficulty;
1830	Coro::cede;	1959	cf::cede_to_tick;
1831		1960
1832	unless ($self->{deny_activate}) {	1961	unless ($self->{deny_activate}) {
1833	$self->decay_objects;	1962	$self->decay_objects;
1834	$self->fix_auto_apply;	1963	$self->fix_auto_apply;
1835	$self->update_buttons;	1964	$self->update_buttons;
1836	Coro::cede;	1965	cf::cede_to_tick;
1837	$self->set_darkness_map;	1966	$self->set_darkness_map;
1838	Coro::cede;	1967	cf::cede_to_tick;
1839	$self->activate;	1968	$self->activate;
1840	}	1969	}
		1970
		1971	$self->{last_save} = $cf::RUNTIME;
		1972	$self->last_access ($cf::RUNTIME);
1841		1973
1842	$self->in_memory (cf::MAP_IN_MEMORY);	1974	$self->in_memory (cf::MAP_IN_MEMORY);
1843	}	1975	}
1844		1976
1845	$self->post_load;	1977	$self->post_load;
…		…
1856		1988
1857	$self	1989	$self
1858	}	1990	}
1859		1991
1860	# 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
1861	sub load_diag {	1993	sub load_neighbours {
1862	my ($map) = @_;	1994	my ($map) = @_;
1863		1995
1864	my @diag; # diagonal neighbours	1996	my @neigh; # diagonal neighbours
1865		1997
1866	for (0 .. 3) {	1998	for (0 .. 3) {
1867	my $neigh = $map->tile_path ($_)	1999	my $neigh = $map->tile_path ($_)
1868	or next;	2000	or next;
1869	$neigh = find $neigh, $map	2001	$neigh = find $neigh, $map
1870	or next;	2002	or next;
1871	$neigh->load;	2003	$neigh->load;
1872		2004
		2005	push @neigh,
1873	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2006	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1874	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2007	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1875	}	2008	}
1876		2009
1877	for (@diag) {	2010	for (grep defined $_->[0], @neigh) {
		2011	my ($path, $origin) = @$_;
1878	my $neigh = find @$_	2012	my $neigh = find $path, $origin
1879	or next;	2013	or next;
1880	$neigh->load;	2014	$neigh->load;
1881	}	2015	}
1882	}	2016	}
1883		2017
…		…
1888	}	2022	}
1889		2023
1890	sub do_load_sync {	2024	sub do_load_sync {
1891	my ($map) = @_;	2025	my ($map) = @_;
1892		2026
		2027	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2028	if $Coro::current == $Coro::main;
		2029
1893	cf::sync_job { $map->load };	2030	cf::sync_job { $map->load };
1894	}	2031	}
1895		2032
1896	our %MAP_PREFETCH;	2033	our %MAP_PREFETCH;
1897	our $MAP_PREFETCHER = undef;	2034	our $MAP_PREFETCHER = undef;
1898		2035
1899	sub find_async {	2036	sub find_async {
1900	my ($path, $origin) = @_;	2037	my ($path, $origin, $load) = @_;
1901		2038
1902	$path = normalise $path, $origin && $origin->{path};	2039	$path = normalise $path, $origin && $origin->{path};
1903		2040
1904	if (my $map = $cf::MAP{$path}) {	2041	if (my $map = $cf::MAP{$path}) {
1905	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2042	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1906	}	2043	}
1907		2044
1908	undef $MAP_PREFETCH{$path};	2045	$MAP_PREFETCH{$path} \|= $load;
		2046
1909	$MAP_PREFETCHER \|\|= cf::async {	2047	$MAP_PREFETCHER \|\|= cf::async {
1910	while (%MAP_PREFETCH) {	2048	while (%MAP_PREFETCH) {
1911	for my $path (keys %MAP_PREFETCH) {	2049	while (my ($k, $v) = each %MAP_PREFETCH) {
1912	my $map = find $path	2050	if (my $map = find $k) {
1913	or next;
1914	$map->load;	2051	$map->load if $v;
		2052	}
1915		2053
1916	delete $MAP_PREFETCH{$path};	2054	delete $MAP_PREFETCH{$k};
1917	}	2055	}
1918	}	2056	}
1919	undef $MAP_PREFETCHER;	2057	undef $MAP_PREFETCHER;
1920	};	2058	};
1921	$MAP_PREFETCHER->prio (6);	2059	$MAP_PREFETCHER->prio (6);
…		…
1924	}	2062	}
1925		2063
1926	sub save {	2064	sub save {
1927	my ($self) = @_;	2065	my ($self) = @_;
1928		2066
1929	my $lock = cf::lock_acquire "map_data:" . $self->path;	2067	my $lock = cf::lock_acquire "map_data:$self->{path}";
1930		2068
1931	$self->{last_save} = $cf::RUNTIME;	2069	$self->{last_save} = $cf::RUNTIME;
1932		2070
1933	return unless $self->dirty;	2071	return unless $self->dirty;
1934		2072
…		…
1957	my ($self) = @_;	2095	my ($self) = @_;
1958		2096
1959	# save first because save cedes	2097	# save first because save cedes
1960	$self->save;	2098	$self->save;
1961		2099
1962	my $lock = cf::lock_acquire "map_data:" . $self->path;	2100	my $lock = cf::lock_acquire "map_data:$self->{path}";
1963		2101
1964	return if $self->players;	2102	return if $self->players;
1965	return if $self->in_memory != cf::MAP_IN_MEMORY;	2103	return if $self->in_memory != cf::MAP_IN_MEMORY;
1966	return if $self->{deny_save};	2104	return if $self->{deny_save};
1967		2105
		2106	$self->in_memory (cf::MAP_SWAPPED);
		2107
		2108	$self->deactivate;
		2109	$_->clear_links_to ($self) for values %cf::MAP;
1968	$self->clear;	2110	$self->clear;
1969	$self->in_memory (cf::MAP_SWAPPED);
1970	}	2111	}
1971		2112
1972	sub reset_at {	2113	sub reset_at {
1973	my ($self) = @_;	2114	my ($self) = @_;
1974		2115
…		…
2006	if $uniq;	2147	if $uniq;
2007	}	2148	}
2008		2149
2009	delete $cf::MAP{$self->path};	2150	delete $cf::MAP{$self->path};
2010		2151
		2152	$self->deactivate;
		2153	$_->clear_links_to ($self) for values %cf::MAP;
2011	$self->clear;	2154	$self->clear;
2012
2013	$_->clear_links_to ($self) for values %cf::MAP;
2014		2155
2015	$self->unlink_save;	2156	$self->unlink_save;
2016	$self->destroy;	2157	$self->destroy;
2017	}	2158	}
2018		2159
2019	my $nuke_counter = "aaaa";	2160	my $nuke_counter = "aaaa";
2020		2161
2021	sub nuke {	2162	sub nuke {
2022	my ($self) = @_;	2163	my ($self) = @_;
2023		2164
		2165	{
		2166	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2167
2024	delete $cf::MAP{$self->path};	2168	delete $cf::MAP{$self->path};
2025		2169
2026	$self->unlink_save;	2170	$self->unlink_save;
2027		2171
2028	bless $self, "cf::map";	2172	bless $self, "cf::map";
2029	delete $self->{deny_reset};	2173	delete $self->{deny_reset};
2030	$self->{deny_save} = 1;	2174	$self->{deny_save} = 1;
2031	$self->reset_timeout (1);	2175	$self->reset_timeout (1);
2032	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2176	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033		2177
2034	$cf::MAP{$self->path} = $self;	2178	$cf::MAP{$self->path} = $self;
		2179	}
2035		2180
2036	$self->reset; # polite request, might not happen	2181	$self->reset; # polite request, might not happen
2037	}	2182	}
2038		2183
2039	=item $maps = cf::map::tmp_maps	2184	=item $maps = cf::map::tmp_maps
…		…
2115		2260
2116	sub inv_recursive {	2261	sub inv_recursive {
2117	inv_recursive_ inv $_[0]	2262	inv_recursive_ inv $_[0]
2118	}	2263	}
2119		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
2120	package cf;	2296	package cf;
2121		2297
2122	=back	2298	=back
2123		2299
2124	=head3 cf::object::player	2300	=head3 cf::object::player
…		…
2146		2322
2147	} else {	2323	} else {
2148	my $pl = $self->contr;	2324	my $pl = $self->contr;
2149		2325
2150	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2326	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151	my $diag = $pl->{npc_dialog};	2327	my $dialog = $pl->{npc_dialog};
2152	$diag->{pl}->ext_reply (	2328	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153	$diag->{id},
2154	msgtype => "reply",
2155	msg => $diag->{pl}->expand_cfpod ($msg),
2156	add_topics => []
2157	);
2158		2329
2159	} else {	2330	} else {
2160	$msg = $npc->name . " says: $msg" if $npc;	2331	$msg = $npc->name . " says: $msg" if $npc;
2161	$self->message ($msg, $flags);	2332	$self->message ($msg, $flags);
2162	}	2333	}
2163	}	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 (@_);
2164	}	2345	}
2165		2346
2166	=item $player_object->may ("access")	2347	=item $player_object->may ("access")
2167		2348
2168	Returns wether the given player is authorized to access resource "access"	2349	Returns wether the given player is authorized to access resource "access"
…		…
2247	# use -1 or undef as default coordinates, not 0, 0	2428	# use -1 or undef as default coordinates, not 0, 0
2248	($x, $y) = ($map->enter_x, $map->enter_y)	2429	($x, $y) = ($map->enter_x, $map->enter_y)
2249	if $x <=0 && $y <= 0;	2430	if $x <=0 && $y <= 0;
2250		2431
2251	$map->load;	2432	$map->load;
2252	$map->load_diag;	2433	$map->load_neighbours;
2253		2434
2254	return unless $self->contr->active;	2435	return unless $self->contr->active;
2255	$self->activate_recursive;	2436	$self->activate_recursive;
2256		2437
2257	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2438	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258	$self->enter_map ($map, $x, $y);	2439	$self->enter_map ($map, $x, $y);
2259	}	2440	}
2260		2441
2261	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2442	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262		2443
2263	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
2264	her, loading and preparing them map, calling the provided $check callback	2445	her, loading and preparing them map, calling the provided $check callback
2265	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
2266	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.
2267		2449
2268	=cut	2450	=cut
2269		2451
2270	our $GOTOGEN;	2452	our $GOTOGEN;
2271		2453
2272	sub cf::object::player::goto {	2454	sub cf::object::player::goto {
2273	my ($self, $path, $x, $y, $check) = @_;	2455	my ($self, $path, $x, $y, $check, $done) = @_;
2274		2456
2275	# 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
2276	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2458	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277		2459
2278	$self->enter_link;	2460	$self->enter_link;
2279		2461
2280	(async {	2462	(async {
		2463	# *tag paths override both path and x\|y
		2464	if ($path =~ /^\(.)$/) {
		2465	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2466	my $ob = $obs[rand @obs];
		2467
		2468	# see if we actually can go there
		2469	# todo: use ob_blocked to check all tiles of the destination "object"
		2470	# for suitability.
		2471
		2472	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2473	}
		2474	}
		2475
2281	my $map = eval {	2476	my $map = eval {
2282	my $map = cf::map::find $path;	2477	my $map = cf::map::find $path;
2283		2478
2284	if ($map) {	2479	if ($map) {
2285	$map = $map->customise_for ($self);	2480	$map = $map->customise_for ($self);
…		…
2298		2493
2299	if ($gen == $self->{_goto_generation}) {	2494	if ($gen == $self->{_goto_generation}) {
2300	delete $self->{_goto_generation};	2495	delete $self->{_goto_generation};
2301	$self->leave_link ($map, $x, $y);	2496	$self->leave_link ($map, $x, $y);
2302	}	2497	}
		2498
		2499	$done->() if $done;
2303	})->prio (1);	2500	})->prio (1);
2304	}	2501	}
2305		2502
2306	=item $player_object->enter_exit ($exit_object)	2503	=item $player_object->enter_exit ($exit_object)
2307		2504
…		…
2416		2613
2417	utf8::encode $text;	2614	utf8::encode $text;
2418	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2615	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2419	}	2616	}
2420		2617
2421	=item $client->send_msg ($color, $type, $msg, [extra...])	2618	=item $client->send_msg ($channel, $msg, $color, [extra...])
2422		2619
2423	Send a drawinfo or msg packet to the client, formatting the msg for the	2620	Send a drawinfo or msg packet to the client, formatting the msg for the
2424	client if neccessary. C<$type> should be a string identifying the type of	2621	client if neccessary. C<$type> should be a string identifying the type of
2425	the message, with C<log> being the default. If C<$color> is negative, suppress	2622	the message, with C<log> being the default. If C<$color> is negative, suppress
2426	the message unless the client supports the msg packet.	2623	the message unless the client supports the msg packet.
2427		2624
2428	=cut	2625	=cut
2429		2626
		2627	our %CHANNEL = (
		2628	"c/identify" => {
		2629	id => "identify",
		2630	title => "Identify",
		2631	reply => undef,
		2632	tooltip => "Items recently identified",
		2633	},
		2634	"c/examine" => {
		2635	id => "examine",
		2636	title => "Examine",
		2637	reply => undef,
		2638	tooltip => "Signs and other items you examined",
		2639	},
		2640	);
		2641
2430	sub cf::client::send_msg {	2642	sub cf::client::send_msg {
2431	my ($self, $color, $type, $msg, @extra) = @_;	2643	my ($self, $channel, $msg, $color, @extra) = @_;
2432		2644
2433	$msg = $self->pl->expand_cfpod ($msg);	2645	$msg = $self->pl->expand_cfpod ($msg);
2434		2646
		2647	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2648
		2649	# check predefined channels, for the benefit of C
		2650	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};
		2651
		2652	if (ref $channel) {
		2653	# send meta info to client, if not yet sent
		2654	unless (exists $self->{channel}{$channel->{id}}) {
		2655	$self->{channel}{$channel->{id}} = $channel;
		2656	$self->ext_msg (channel_info => $channel)
		2657	if $self->can_msg;
		2658	}
		2659
		2660	$channel = $channel->{id};
		2661	}
		2662
2435	return unless @extra \|\| length $msg;	2663	return unless @extra \|\| length $msg;
2436		2664
2437	if ($self->can_msg) {	2665	if ($self->can_msg) {
		2666	# default colour, mask it out
		2667	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2668	if $color & cf::NDI_DEF;
		2669
2438	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));	2670	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2671	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2439	} else {	2672	} else {
2440	# replace some tags by gcfclient-compatible ones
2441	for ($msg) {
2442	1 while
2443	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448	}
2449
2450	if ($color >= 0) {	2673	if ($color >= 0) {
		2674	# replace some tags by gcfclient-compatible ones
		2675	for ($msg) {
		2676	1 while
		2677	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2678	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2679	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2680	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2681	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2682	}
		2683
		2684	$color &= cf::NDI_COLOR_MASK;
		2685
		2686	utf8::encode $msg;
		2687
2451	if (0 && $msg =~ /\[/) {	2688	if (0 && $msg =~ /\[/) {
		2689	# COMMAND/INFO
2452	$self->send_packet ("drawextinfo $color 4 0 $msg")	2690	$self->send_packet ("drawextinfo $color 10 8 $msg")
2453	} else {	2691	} else {
2454	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2692	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2455	$self->send_packet ("drawinfo $color $msg")	2693	$self->send_packet ("drawinfo $color $msg")
2456	}	2694	}
2457	}	2695	}
2458	}	2696	}
2459	}	2697	}
2460		2698
2461	=item $client->ext_event ($type, %msg)	2699	=item $client->ext_msg ($type, @msg)
2462		2700
2463	Sends an ext event to the client.	2701	Sends an ext event to the client.
2464		2702
2465	=cut	2703	=cut
2466		2704
2467	sub cf::client::ext_event($$%) {	2705	sub cf::client::ext_msg($$@) {
2468	my ($self, $type, %msg) = @_;	2706	my ($self, $type, @msg) = @_;
2469		2707
		2708	if ($self->extcmd == 2) {
		2709	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2710	} elsif ($self->extcmd == 1) { # TODO: remove
2470	$msg{msgtype} = "event_$type";	2711	push @msg, msgtype => "event_$type";
2471	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2712	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2713	}
		2714	}
		2715
		2716	=item $client->ext_reply ($msgid, @msg)
		2717
		2718	Sends an ext reply to the client.
		2719
		2720	=cut
		2721
		2722	sub cf::client::ext_reply($$@) {
		2723	my ($self, $id, @msg) = @_;
		2724
		2725	if ($self->extcmd == 2) {
		2726	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2727	} elsif ($self->extcmd == 1) {
		2728	#TODO: version 1, remove
		2729	unshift @msg, msgtype => "reply", msgid => $id;
		2730	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2731	}
2472	}	2732	}
2473		2733
2474	=item $success = $client->query ($flags, "text", \&cb)	2734	=item $success = $client->query ($flags, "text", \&cb)
2475		2735
2476	Queues a query to the client, calling the given callback with	2736	Queues a query to the client, calling the given callback with
…		…
2531	my ($ns, $buf) = @_;	2791	my ($ns, $buf) = @_;
2532		2792
2533	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2793	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2534		2794
2535	if (ref $msg) {	2795	if (ref $msg) {
		2796	my ($type, $reply, @payload) =
		2797	"ARRAY" eq ref $msg
		2798	? @$msg
		2799	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2800
		2801	my @reply;
		2802
2536	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2803	if (my $cb = $EXTICMD{$type}) {
2537	if (my %reply = $cb->($ns, $msg)) {	2804	@reply = $cb->($ns, @payload);
2538	$reply{msgid} = $msg->{msgid};
2539	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2540	}
2541	}	2805	}
		2806
		2807	$ns->ext_reply ($reply, @reply)
		2808	if $reply;
		2809
2542	} else {	2810	} else {
2543	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2811	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2544	}	2812	}
2545		2813
2546	cf::override;	2814	cf::override;
…		…
2593	our $safe = new Safe "safe";	2861	our $safe = new Safe "safe";
2594	our $safe_hole = new Safe::Hole;	2862	our $safe_hole = new Safe::Hole;
2595		2863
2596	$SIG{FPE} = 'IGNORE';	2864	$SIG{FPE} = 'IGNORE';
2597		2865
2598	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2866	$safe->permit_only (Opcode::opset qw(
		2867	:base_core :base_mem :base_orig :base_math
		2868	grepstart grepwhile mapstart mapwhile
		2869	sort time
		2870	));
2599		2871
2600	# here we export the classes and methods available to script code	2872	# here we export the classes and methods available to script code
2601		2873
2602	=pod	2874	=pod
2603		2875
2604	The following functions and methods are available within a safe environment:	2876	The following functions and methods are available within a safe environment:
2605		2877
2606	cf::object	2878	cf::object
2607	contr pay_amount pay_player map x y force_find force_add	2879	contr pay_amount pay_player map x y force_find force_add
2608	insert remove	2880	insert remove name archname title slaying race decrease_ob_nr
2609		2881
2610	cf::object::player	2882	cf::object::player
2611	player	2883	player
2612		2884
2613	cf::player	2885	cf::player
…		…
2618		2890
2619	=cut	2891	=cut
2620		2892
2621	for (	2893	for (
2622	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	2894	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2895	insert remove inv name archname title slaying race
2623	insert remove)],	2896	decrease_ob_nr)],
2624	["cf::object::player" => qw(player)],	2897	["cf::object::player" => qw(player)],
2625	["cf::player" => qw(peaceful)],	2898	["cf::player" => qw(peaceful)],
2626	["cf::map" => qw(trigger)],	2899	["cf::map" => qw(trigger)],
2627	) {	2900	) {
2628	no strict 'refs';	2901	no strict 'refs';
…		…
2704	# the server's init and main functions	2977	# the server's init and main functions
2705		2978
2706	sub load_facedata($) {	2979	sub load_facedata($) {
2707	my ($path) = @_;	2980	my ($path) = @_;
2708		2981
		2982	# HACK to clear player env face cache, we need some signal framework
		2983	# for this (global event?)
		2984	%ext::player_env::MUSIC_FACE_CACHE = ();
		2985
		2986	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		2987
2709	warn "loading facedata from $path\n";	2988	warn "loading facedata from $path\n";
2710		2989
2711	my $facedata;	2990	my $facedata;
2712	0 < aio_load $path, $facedata	2991	0 < aio_load $path, $facedata
2713	or die "$path: $!";	2992	or die "$path: $!";
…		…
2715	$facedata = Coro::Storable::thaw $facedata;	2994	$facedata = Coro::Storable::thaw $facedata;
2716		2995
2717	$facedata->{version} == 2	2996	$facedata->{version} == 2
2718	or cf::cleanup "$path: version mismatch, cannot proceed.";	2997	or cf::cleanup "$path: version mismatch, cannot proceed.";
2719		2998
		2999	# patch in the exptable
		3000	$facedata->{resource}{"res/exp_table"} = {
		3001	type => FT_RSRC,
		3002	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3003	};
		3004	cf::cede_to_tick;
		3005
2720	{	3006	{
2721	my $faces = $facedata->{faceinfo};	3007	my $faces = $facedata->{faceinfo};
2722		3008
2723	while (my ($face, $info) = each %$faces) {	3009	while (my ($face, $info) = each %$faces) {
2724	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3010	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2725	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3011	cf::face::set_visibility $idx, $info->{visibility};
		3012	cf::face::set_magicmap $idx, $info->{magicmap};
2726	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3013	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2727	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3014	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2728	Coro::cede;	3015
		3016	cf::cede_to_tick;
2729	}	3017	}
2730		3018
2731	while (my ($face, $info) = each %$faces) {	3019	while (my ($face, $info) = each %$faces) {
2732	next unless $info->{smooth};	3020	next unless $info->{smooth};
2733	my $idx = cf::face::find $face	3021	my $idx = cf::face::find $face
2734	or next;	3022	or next;
2735	if (my $smooth = cf::face::find $info->{smooth}) {	3023	if (my $smooth = cf::face::find $info->{smooth}) {
		3024	cf::face::set_smooth $idx, $smooth;
2736	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3025	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2737	} else {	3026	} else {
2738	warn "smooth face '$info->{smooth}' not found for face '$face'";	3027	warn "smooth face '$info->{smooth}' not found for face '$face'";
2739	}	3028	}
2740	Coro::cede;	3029
		3030	cf::cede_to_tick;
2741	}	3031	}
2742	}	3032	}
2743		3033
2744	{	3034	{
2745	my $anims = $facedata->{animinfo};	3035	my $anims = $facedata->{animinfo};
2746		3036
2747	while (my ($anim, $info) = each %$anims) {	3037	while (my ($anim, $info) = each %$anims) {
2748	cf::anim::set $anim, $info->{frames}, $info->{facings};	3038	cf::anim::set $anim, $info->{frames}, $info->{facings};
2749	Coro::cede;	3039	cf::cede_to_tick;
2750	}	3040	}
2751		3041
2752	cf::anim::invalidate_all; # d'oh	3042	cf::anim::invalidate_all; # d'oh
2753	}	3043	}
2754		3044
		3045	{
		3046	# TODO: for gcfclient pleasure, we should give resources
		3047	# that gcfclient doesn't grok a >10000 face index.
		3048	my $res = $facedata->{resource};
		3049
		3050	my $soundconf = delete $res->{"res/sound.conf"};
		3051
		3052	while (my ($name, $info) = each %$res) {
		3053	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3054	my $data;
		3055
		3056	if ($info->{type} & 1) {
		3057	# prepend meta info
		3058
		3059	my $meta = $enc->encode ({
		3060	name => $name,
		3061	%{ $info->{meta} \|\| {} },
		3062	});
		3063
		3064	$data = pack "(w/a)", $meta, $info->{data};
		3065	} else {
		3066	$data = $info->{data};
		3067	}
		3068
		3069	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3070	cf::face::set_type $idx, $info->{type};
		3071
		3072	cf::cede_to_tick;
		3073	}
		3074
		3075	if ($soundconf) {
		3076	$soundconf = $enc->decode (delete $soundconf->{data});
		3077
		3078	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3079	my $sound = $soundconf->{compat}[$_]
		3080	or next;
		3081
		3082	my $face = cf::face::find "sound/$sound->[1]";
		3083	cf::sound::set $sound->[0] => $face;
		3084	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3085	}
		3086
		3087	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3088	my $face = cf::face::find "sound/$v";
		3089	cf::sound::set $k => $face;
		3090	}
		3091	}
		3092	}
		3093
2755	1	3094	1
2756	}	3095	}
2757		3096
		3097	register_exticmd fx_want => sub {
		3098	my ($ns, $want) = @_;
		3099
		3100	while (my ($k, $v) = each %$want) {
		3101	$ns->fx_want ($k, $v);
		3102	}
		3103	};
		3104
2758	sub reload_regions {	3105	sub reload_regions {
		3106	# HACK to clear player env face cache, we need some signal framework
		3107	# for this (global event?)
		3108	%ext::player_env::MUSIC_FACE_CACHE = ();
		3109
2759	load_resource_file "$MAPDIR/regions"	3110	load_resource_file "$MAPDIR/regions"
2760	or die "unable to load regions file\n";	3111	or die "unable to load regions file\n";
		3112
		3113	for (cf::region::list) {
		3114	$_->{match} = qr/$_->{match}/
		3115	if exists $_->{match};
		3116	}
2761	}	3117	}
2762		3118
2763	sub reload_facedata {	3119	sub reload_facedata {
2764	load_facedata "$DATADIR/facedata"	3120	load_facedata "$DATADIR/facedata"
2765	or die "unable to load facedata\n";	3121	or die "unable to load facedata\n";
…		…
2794		3150
2795	sub init {	3151	sub init {
2796	reload_resources;	3152	reload_resources;
2797	}	3153	}
2798		3154
2799	sub cfg_load {	3155	sub reload_config {
2800	open my $fh, "<:utf8", "$CONFDIR/config"	3156	open my $fh, "<:utf8", "$CONFDIR/config"
2801	or return;	3157	or return;
2802		3158
2803	local $/;	3159	local $/;
2804	*CFG = YAML::Syck::Load <$fh>;	3160	*CFG = YAML::Syck::Load <$fh>;
…		…
2824	(async {	3180	(async {
2825	Event::one_event;	3181	Event::one_event;
2826	})->prio (Coro::PRIO_MAX);	3182	})->prio (Coro::PRIO_MAX);
2827	};	3183	};
2828		3184
2829	cfg_load;	3185	reload_config;
2830	db_init;	3186	db_init;
2831	load_extensions;	3187	load_extensions;
2832		3188
2833	$TICK_WATCHER->start;	3189	$TICK_WATCHER->start;
2834	Event::loop;	3190	Event::loop;
…		…
3027	warn "reloading cf.pm";	3383	warn "reloading cf.pm";
3028	require cf;	3384	require cf;
3029	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3385	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3030		3386
3031	warn "loading config and database again";	3387	warn "loading config and database again";
3032	cf::cfg_load;	3388	cf::reload_config;
3033		3389
3034	warn "loading extensions";	3390	warn "loading extensions";
3035	cf::load_extensions;	3391	cf::load_extensions;
3036		3392
3037	warn "reattaching attachments to objects/players";	3393	warn "reattaching attachments to objects/players";
…		…
3102	my $signal = new Coro::Signal;	3458	my $signal = new Coro::Signal;
3103	push @WAIT_FOR_TICK_BEGIN, $signal;	3459	push @WAIT_FOR_TICK_BEGIN, $signal;
3104	$signal->wait;	3460	$signal->wait;
3105	}	3461	}
3106		3462
3107	my $min = 1e6;#d#	3463	our $stat_fh;
3108	my $avg = 10;	3464	sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND \| Fcntl::O_CREAT \| Fcntl::O_WRONLY, 0600;#d#
		3465
3109	$TICK_WATCHER = Event->timer (	3466	$TICK_WATCHER = Event->timer (
3110	reentrant => 0,	3467	reentrant => 0,
3111	parked => 1,	3468	parked => 1,
3112	prio => 0,	3469	prio => 0,
3113	at => $NEXT_TICK \|\| $TICK,	3470	at => $NEXT_TICK \|\| $TICK,
…		…
3117	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3474	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3118	unless ++$bug_warning > 10;	3475	unless ++$bug_warning > 10;
3119	return;	3476	return;
3120	}	3477	}
3121		3478
		3479	my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
		3480
3122	$NOW = $tick_start = Event::time;	3481	$NOW = $tick_start = Event::time;
3123		3482
3124	cf::server_tick; # one server iteration	3483	cf::server_tick; # one server iteration
3125
3126	0 && sync_job {#d#
3127	for(1..10) {
3128	my $t = Event::time;
3129	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3130	or die;
3131
3132	$map->width (50);
3133	$map->height (50);
3134	$map->alloc;
3135	$map->_load_objects ("/tmp/x.map", 1);
3136	my $t = Event::time - $t;
3137
3138	#next unless $t < 0.0013;#d#
3139	if ($t < $min) {
3140	$min = $t;
3141	}
3142	$avg = $avg * 0.99 + $t * 0.01;
3143	}
3144	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3145	exit 0;
3146	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3147	};
3148		3484
3149	$RUNTIME += $TICK;	3485	$RUNTIME += $TICK;
3150	$NEXT_TICK += $TICK;	3486	$NEXT_TICK += $TICK;
3151		3487
3152	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3488	if ($NOW >= $NEXT_RUNTIME_WRITE) {
…		…
3178	$LOAD = ($NOW - $tick_start) / $TICK;	3514	$LOAD = ($NOW - $tick_start) / $TICK;
3179	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3515	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3180		3516
3181	_post_tick;	3517	_post_tick;
3182		3518
3183		3519	# gather some statistics#d#
		3520	$stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
		3521	IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
3184	},	3522	},
3185	);	3523	);
3186		3524
3187	{	3525	{
		3526	BDB::min_parallel 8;
3188	BDB::max_poll_time $TICK * 0.1;	3527	BDB::max_poll_time $TICK * 0.1;
3189	$BDB_POLL_WATCHER = Event->io (	3528	$BDB_POLL_WATCHER = Event->io (
3190	reentrant => 0,	3529	reentrant => 0,
3191	fd => BDB::poll_fileno,	3530	fd => BDB::poll_fileno,
3192	poll => 'r',	3531	poll => 'r',
3193	prio => 0,	3532	prio => 0,
3194	data => WF_AUTOCANCEL,	3533	data => WF_AUTOCANCEL,
3195	cb => \&BDB::poll_cb,	3534	cb => \&BDB::poll_cb,
3196	);	3535	);
3197	BDB::min_parallel 8;
3198		3536
3199	BDB::set_sync_prepare {	3537	BDB::set_sync_prepare {
3200	my $status;	3538	my $status;
3201	my $current = $Coro::current;	3539	my $current = $Coro::current;
3202	(	3540	(
…		…
3223	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3561	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3224	0666;	3562	0666;
3225		3563
3226	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3564	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3227		3565
3228	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);	3566	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC
		3567	\| BDB::LOG_AUTOREMOVE, 1);
3229	$DB_ENV->set_lk_detect;	3568	$DB_ENV->set_lk_detect;
3230	};	3569	};
3231		3570
3232	cf::cleanup "db_env_open(db): $@" if $@;	3571	cf::cleanup "db_env_open(db): $@" if $@;
3233	};	3572	};
3234	}	3573	}
		3574
		3575	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3576	after => 11,
		3577	interval => 60,
		3578	hard => 1,
		3579	prio => 0,
		3580	data => WF_AUTOCANCEL,
		3581	cb => sub {
		3582	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3583	},
		3584	);
		3585	$BDB_TRICKLE_WATCHER = Event->timer (
		3586	after => 5,
		3587	interval => 10,
		3588	hard => 1,
		3589	prio => 0,
		3590	data => WF_AUTOCANCEL,
		3591	cb => sub {
		3592	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3593	},
		3594	);
3235	}	3595	}
3236		3596
3237	{	3597	{
3238	IO::AIO::min_parallel 8;	3598	IO::AIO::min_parallel 8;
3239		3599

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.300 by root, Tue Jul 10 06:44:29 2007 UTC vs. Revision 1.367 by root, Wed Sep 12 11:10:11 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.300 by root, Tue Jul 10 06:44:29 2007 UTC vs.
Revision 1.367 by root, Wed Sep 12 11:10:11 2007 UTC