[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.371 by root, Thu Sep 13 16:16:01 2007 UTC

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

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.371 by root, Thu Sep 13 16:16:01 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.371 by root, Thu Sep 13 16:16:01 2007 UTC