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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.290 by root, Mon Jul 2 03:15:30 2007 UTC vs.
Revision 1.372 by root, Sat Sep 15 13:25:33 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	my $pl = cf::player::load_pl $f
		1359	or return;
		1360	local $cf::PLAYER_LOADING{$login} = $pl;
		1361	$f->resolve_delayed_derefs;
1244	$cf::PLAYER{$login} = $pl	1362	$cf::PLAYER{$login} = $pl
1245	}	1363	}
1246	}	1364	}
1247	}	1365	}
1248		1366
…		…
1258		1376
1259	aio_mkdir playerdir $pl, 0770;	1377	aio_mkdir playerdir $pl, 0770;
1260	$pl->{last_save} = $cf::RUNTIME;	1378	$pl->{last_save} = $cf::RUNTIME;
1261		1379
1262	$pl->save_pl ($path);	1380	$pl->save_pl ($path);
1263	Coro::cede;	1381	cf::cede_to_tick;
1264	}	1382	}
1265		1383
1266	sub new($) {	1384	sub new($) {
1267	my ($login) = @_;	1385	my ($login) = @_;
1268		1386
…		…
1272	$self->{deny_save} = 1;	1390	$self->{deny_save} = 1;
1273		1391
1274	$cf::PLAYER{$login} = $self;	1392	$cf::PLAYER{$login} = $self;
1275		1393
1276	$self	1394	$self
		1395	}
		1396
		1397	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1398
		1399	=cut
		1400
		1401	sub send_msg {
		1402	my $ns = shift->ns
		1403	or return;
		1404	$ns->send_msg (@_);
1277	}	1405	}
1278		1406
1279	=item $pl->quit_character	1407	=item $pl->quit_character
1280		1408
1281	Nukes the player without looking back. If logged in, the connection will	1409	Nukes the player without looking back. If logged in, the connection will
…		…
1336	or return [];	1464	or return [];
1337		1465
1338	my @logins;	1466	my @logins;
1339		1467
1340	for my $login (@$dirs) {	1468	for my $login (@$dirs) {
		1469	my $path = path $login;
		1470
		1471	# a .pst is a dead give-away for a valid player
		1472	unless (-e "$path.pst") {
1341	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1473	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342	aio_read $fh, 0, 512, my $buf, 0 or next;	1474	aio_read $fh, 0, 512, my $buf, 0 or next;
1343	$buf !~ /^password -------------$/m or next; # official not-valid tag	1475	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1476	}
1344		1477
1345	utf8::decode $login;	1478	utf8::decode $login;
1346	push @logins, $login;	1479	push @logins, $login;
1347	}	1480	}
1348		1481
…		…
1386	sub expand_cfpod {	1519	sub expand_cfpod {
1387	((my $self), (local $_)) = @_;	1520	((my $self), (local $_)) = @_;
1388		1521
1389	# escape & and <	1522	# escape & and <
1390	s/&/&/g;	1523	s/&/&/g;
1391	s/(?<![BIUGH])</</g;	1524	s/(?<![BIUGHT])</</g;
1392		1525
1393	# this is buggy, it needs to properly take care of nested <'s	1526	# this is buggy, it needs to properly take care of nested <'s
1394		1527
1395	1 while	1528	1 while
1396	# replace B<>, I<>, U<> etc.	1529	# replace B<>, I<>, U<> etc.
1397	s/B<([^\>]*)>/<b>$1<\/b>/	1530	s/B<([^\>]*)>/<b>$1<\/b>/
1398	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1531	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1399	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1532	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1533	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1400	# replace G<male\|female> tags	1534	# replace G<male\|female> tags
1401	\|\| s{G<([^>\|])\\|([^>])>}{	1535	\|\| s{G<([^>\|])\\|([^>])>}{
1402	$self->gender ? $2 : $1	1536	$self->gender ? $2 : $1
1403	}ge	1537	}ge
1404	# replace H<hint text>	1538	# replace H<hint text>
1405	\|\| s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;	1539	\|\| s{H<([^\>]*)>}
		1540	{
		1541	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1542	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1543	"")
		1544	[$self->{hintmode}]
		1545	}ge;
1406		1546
1407	# create single paragraphs (very hackish)	1547	# create single paragraphs (very hackish)
1408	s/(?<=\S)\n(?=\w)/ /g;	1548	s/(?<=\S)\n(?=\w)/ /g;
1409		1549
		1550	# compress some whitespace
		1551	s/\s+\n/\n/g; # ws line-ends
		1552	s/\n\n+/\n/g; # double lines
		1553	s/^\n+//; # beginning lines
		1554	s/\n+$//; # ending lines
		1555
1410	$_	1556	$_
1411	}	1557	}
1412		1558
		1559	sub hintmode {
		1560	$_[0]{hintmode} = $_[1] if @_ > 1;
		1561	$_[0]{hintmode}
		1562	}
		1563
1413	=item $player->ext_reply ($msgid, %msg)	1564	=item $player->ext_reply ($msgid, @msg)
1414		1565
1415	Sends an ext reply to the player.	1566	Sends an ext reply to the player.
1416		1567
1417	=cut	1568	=cut
1418		1569
1419	sub ext_reply($$%) {	1570	sub ext_reply($$@) {
1420	my ($self, $id, %msg) = @_;	1571	my ($self, $id, @msg) = @_;
1421		1572
1422	$msg{msgid} = $id;	1573	$self->ns->ext_reply ($id, @msg)
1423	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1424	}	1574	}
1425		1575
1426	=item $player->ext_event ($type, %msg)	1576	=item $player->ext_msg ($type, @msg)
1427		1577
1428	Sends an ext event to the client.	1578	Sends an ext event to the client.
1429		1579
1430	=cut	1580	=cut
1431		1581
1432	sub ext_event($$%) {	1582	sub ext_msg($$@) {
1433	my ($self, $type, %msg) = @_;	1583	my ($self, $type, @msg) = @_;
1434		1584
1435	$self->ns->ext_event ($type, %msg);	1585	$self->ns->ext_msg ($type, @msg);
1436	}	1586	}
1437		1587
1438	=head3 cf::region	1588	=head3 cf::region
1439		1589
1440	=over 4	1590	=over 4
…		…
1453	my ($path) = @_;	1603	my ($path) = @_;
1454		1604
1455	my ($match, $specificity);	1605	my ($match, $specificity);
1456		1606
1457	for my $region (list) {	1607	for my $region (list) {
1458	if ($region->match && $path =~ $region->match) {	1608	if ($region->{match} && $path =~ $region->{match}) {
1459	($match, $specificity) = ($region, $region->specificity)	1609	($match, $specificity) = ($region, $region->specificity)
1460	if $region->specificity > $specificity;	1610	if $region->specificity > $specificity;
1461	}	1611	}
1462	}	1612	}
1463		1613
…		…
1583	$self->init; # pass $1 etc.	1733	$self->init; # pass $1 etc.
1584	return $self;	1734	return $self;
1585	}	1735	}
1586	}	1736	}
1587		1737
1588	Carp::carp "unable to resolve path '$path' (base '$base').";	1738	Carp::cluck "unable to resolve path '$path' (base '$base').";
1589	()	1739	()
1590	}	1740	}
1591		1741
1592	sub init {	1742	sub init {
1593	my ($self) = @_;	1743	my ($self) = @_;
…		…
1656		1806
1657	sub load_header_from($) {	1807	sub load_header_from($) {
1658	my ($self, $path) = @_;	1808	my ($self, $path) = @_;
1659		1809
1660	utf8::encode $path;	1810	utf8::encode $path;
1661	#aio_open $path, O_RDONLY, 0	1811	my $f = new_from_file cf::object::thawer $path
1662	# or return;
1663
1664	$self->_load_header ($path)
1665	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;
1666		1819
1667	$self->{load_path} = $path;	1820	$self->{load_path} = $path;
1668		1821
1669	1	1822	1
1670	}	1823	}
…		…
1724	sub find {	1877	sub find {
1725	my ($path, $origin) = @_;	1878	my ($path, $origin) = @_;
1726		1879
1727	$path = normalise $path, $origin && $origin->path;	1880	$path = normalise $path, $origin && $origin->path;
1728		1881
		1882	cf::lock_wait "map_data:$path";#d#remove
1729	cf::lock_wait "map_find:$path";	1883	cf::lock_wait "map_find:$path";
1730		1884
1731	$cf::MAP{$path} \|\| do {	1885	$cf::MAP{$path} \|\| do {
1732	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
1733	my $map = new_from_path cf::map $path	1889	my $map = new_from_path cf::map $path
1734	or return;	1890	or return;
1735		1891
1736	$map->{last_save} = $cf::RUNTIME;	1892	$map->{last_save} = $cf::RUNTIME;
1737		1893
…		…
1739	or return;	1895	or return;
1740		1896
1741	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1897	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1742	# doing this can freeze the server in a sync job, obviously	1898	# doing this can freeze the server in a sync job, obviously
1743	#$cf::WAIT_FOR_TICK->wait;	1899	#$cf::WAIT_FOR_TICK->wait;
		1900	undef $guard1;
		1901	undef $guard2;
1744	$map->reset;	1902	$map->reset;
1745	undef $guard;
1746	return find $path;	1903	return find $path;
1747	}	1904	}
1748		1905
1749	$cf::MAP{$path} = $map	1906	$cf::MAP{$path} = $map
1750	}	1907	}
…		…
1759	local $self->{deny_reset} = 1; # loading can take a long time	1916	local $self->{deny_reset} = 1; # loading can take a long time
1760		1917
1761	my $path = $self->{path};	1918	my $path = $self->{path};
1762		1919
1763	{	1920	{
1764	my $guard = cf::lock_acquire "map_load:$path";	1921	my $guard = cf::lock_acquire "map_data:$path";
1765		1922
		1923	return unless $self->valid;
1766	return if $self->in_memory != cf::MAP_SWAPPED;	1924	return unless $self->in_memory == cf::MAP_SWAPPED;
1767		1925
1768	$self->in_memory (cf::MAP_LOADING);	1926	$self->in_memory (cf::MAP_LOADING);
1769		1927
1770	$self->alloc;	1928	$self->alloc;
1771		1929
1772	$self->pre_load;	1930	$self->pre_load;
1773	Coro::cede;	1931	cf::cede_to_tick;
1774		1932
		1933	my $f = new_from_file cf::object::thawer $self->{load_path};
		1934	$f->skip_block;
1775	$self->_load_objects ($self->{load_path}, 1)	1935	$self->_load_objects ($f)
1776	or return;	1936	or return;
1777		1937
1778	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1938	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1779	if delete $self->{load_original};	1939	if delete $self->{load_original};
1780		1940
1781	if (my $uniq = $self->uniq_path) {	1941	if (my $uniq = $self->uniq_path) {
1782	utf8::encode $uniq;	1942	utf8::encode $uniq;
1783	if (aio_open $uniq, O_RDONLY, 0) {	1943	unless (aio_stat $uniq) {
		1944	if (my $f = new_from_file cf::object::thawer $uniq) {
1784	$self->clear_unique_items;	1945	$self->clear_unique_items;
1785	$self->_load_objects ($uniq, 0);	1946	$self->_load_objects ($f);
		1947	$f->resolve_delayed_derefs;
		1948	}
1786	}	1949	}
1787	}	1950	}
1788		1951
1789	Coro::cede;	1952	$f->resolve_delayed_derefs;
		1953
		1954	cf::cede_to_tick;
1790	# now do the right thing for maps	1955	# now do the right thing for maps
1791	$self->link_multipart_objects;	1956	$self->link_multipart_objects;
1792	$self->difficulty ($self->estimate_difficulty)	1957	$self->difficulty ($self->estimate_difficulty)
1793	unless $self->difficulty;	1958	unless $self->difficulty;
1794	Coro::cede;	1959	cf::cede_to_tick;
1795		1960
1796	unless ($self->{deny_activate}) {	1961	unless ($self->{deny_activate}) {
1797	$self->decay_objects;	1962	$self->decay_objects;
1798	$self->fix_auto_apply;	1963	$self->fix_auto_apply;
1799	$self->update_buttons;	1964	$self->update_buttons;
1800	Coro::cede;	1965	cf::cede_to_tick;
1801	$self->set_darkness_map;	1966	$self->set_darkness_map;
1802	Coro::cede;	1967	cf::cede_to_tick;
1803	$self->activate;	1968	$self->activate;
1804	}	1969	}
		1970
		1971	$self->{last_save} = $cf::RUNTIME;
		1972	$self->last_access ($cf::RUNTIME);
1805		1973
1806	$self->in_memory (cf::MAP_IN_MEMORY);	1974	$self->in_memory (cf::MAP_IN_MEMORY);
1807	}	1975	}
1808		1976
1809	$self->post_load;	1977	$self->post_load;
…		…
1820		1988
1821	$self	1989	$self
1822	}	1990	}
1823		1991
1824	# 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
1825	sub load_diag {	1993	sub load_neighbours {
1826	my ($map) = @_;	1994	my ($map) = @_;
1827		1995
1828	my @diag; # diagonal neighbours	1996	my @neigh; # diagonal neighbours
1829		1997
1830	for (0 .. 3) {	1998	for (0 .. 3) {
1831	my $neigh = $map->tile_path ($_)	1999	my $neigh = $map->tile_path ($_)
1832	or next;	2000	or next;
1833	$neigh = find $neigh, $map	2001	$neigh = find $neigh, $map
1834	or next;	2002	or next;
1835	$neigh->load;	2003	$neigh->load;
1836		2004
		2005	push @neigh,
1837	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2006	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1838	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2007	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1839	}	2008	}
1840		2009
1841	for (@diag) {	2010	for (grep defined $_->[0], @neigh) {
		2011	my ($path, $origin) = @$_;
1842	my $neigh = find @$_	2012	my $neigh = find $path, $origin
1843	or next;	2013	or next;
1844	$neigh->load;	2014	$neigh->load;
1845	}	2015	}
1846	}	2016	}
1847		2017
…		…
1852	}	2022	}
1853		2023
1854	sub do_load_sync {	2024	sub do_load_sync {
1855	my ($map) = @_;	2025	my ($map) = @_;
1856		2026
		2027	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2028	if $Coro::current == $Coro::main;
		2029
1857	cf::sync_job { $map->load };	2030	cf::sync_job { $map->load };
1858	}	2031	}
1859		2032
1860	our %MAP_PREFETCH;	2033	our %MAP_PREFETCH;
1861	our $MAP_PREFETCHER = undef;	2034	our $MAP_PREFETCHER = undef;
1862		2035
1863	sub find_async {	2036	sub find_async {
1864	my ($path, $origin) = @_;	2037	my ($path, $origin, $load) = @_;
1865		2038
1866	$path = normalise $path, $origin && $origin->{path};	2039	$path = normalise $path, $origin && $origin->{path};
1867		2040
1868	if (my $map = $cf::MAP{$path}) {	2041	if (my $map = $cf::MAP{$path}) {
1869	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2042	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1870	}	2043	}
1871		2044
1872	undef $MAP_PREFETCH{$path};	2045	$MAP_PREFETCH{$path} \|= $load;
		2046
1873	$MAP_PREFETCHER \|\|= cf::async {	2047	$MAP_PREFETCHER \|\|= cf::async {
1874	while (%MAP_PREFETCH) {	2048	while (%MAP_PREFETCH) {
1875	for my $path (keys %MAP_PREFETCH) {	2049	while (my ($k, $v) = each %MAP_PREFETCH) {
1876	my $map = find $path	2050	if (my $map = find $k) {
1877	or next;
1878	$map->load;	2051	$map->load if $v;
		2052	}
1879		2053
1880	delete $MAP_PREFETCH{$path};	2054	delete $MAP_PREFETCH{$k};
1881	}	2055	}
1882	}	2056	}
1883	undef $MAP_PREFETCHER;	2057	undef $MAP_PREFETCHER;
1884	};	2058	};
1885	$MAP_PREFETCHER->prio (6);	2059	$MAP_PREFETCHER->prio (6);
…		…
1888	}	2062	}
1889		2063
1890	sub save {	2064	sub save {
1891	my ($self) = @_;	2065	my ($self) = @_;
1892		2066
1893	my $lock = cf::lock_acquire "map_data:" . $self->path;	2067	my $lock = cf::lock_acquire "map_data:$self->{path}";
1894		2068
1895	$self->{last_save} = $cf::RUNTIME;	2069	$self->{last_save} = $cf::RUNTIME;
1896		2070
1897	return unless $self->dirty;	2071	return unless $self->dirty;
1898		2072
…		…
1921	my ($self) = @_;	2095	my ($self) = @_;
1922		2096
1923	# save first because save cedes	2097	# save first because save cedes
1924	$self->save;	2098	$self->save;
1925		2099
1926	my $lock = cf::lock_acquire "map_data:" . $self->path;	2100	my $lock = cf::lock_acquire "map_data:$self->{path}";
1927		2101
1928	return if $self->players;	2102	return if $self->players;
1929	return if $self->in_memory != cf::MAP_IN_MEMORY;	2103	return if $self->in_memory != cf::MAP_IN_MEMORY;
1930	return if $self->{deny_save};	2104	return if $self->{deny_save};
1931		2105
		2106	$self->in_memory (cf::MAP_SWAPPED);
		2107
		2108	$self->deactivate;
		2109	$_->clear_links_to ($self) for values %cf::MAP;
1932	$self->clear;	2110	$self->clear;
1933	$self->in_memory (cf::MAP_SWAPPED);
1934	}	2111	}
1935		2112
1936	sub reset_at {	2113	sub reset_at {
1937	my ($self) = @_;	2114	my ($self) = @_;
1938		2115
…		…
1970	if $uniq;	2147	if $uniq;
1971	}	2148	}
1972		2149
1973	delete $cf::MAP{$self->path};	2150	delete $cf::MAP{$self->path};
1974		2151
		2152	$self->deactivate;
		2153	$_->clear_links_to ($self) for values %cf::MAP;
1975	$self->clear;	2154	$self->clear;
1976
1977	$_->clear_links_to ($self) for values %cf::MAP;
1978		2155
1979	$self->unlink_save;	2156	$self->unlink_save;
1980	$self->destroy;	2157	$self->destroy;
1981	}	2158	}
1982		2159
1983	my $nuke_counter = "aaaa";	2160	my $nuke_counter = "aaaa";
1984		2161
1985	sub nuke {	2162	sub nuke {
1986	my ($self) = @_;	2163	my ($self) = @_;
1987		2164
		2165	{
		2166	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2167
1988	delete $cf::MAP{$self->path};	2168	delete $cf::MAP{$self->path};
1989		2169
1990	$self->unlink_save;	2170	$self->unlink_save;
1991		2171
1992	bless $self, "cf::map";	2172	bless $self, "cf::map";
1993	delete $self->{deny_reset};	2173	delete $self->{deny_reset};
1994	$self->{deny_save} = 1;	2174	$self->{deny_save} = 1;
1995	$self->reset_timeout (1);	2175	$self->reset_timeout (1);
1996	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2176	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1997		2177
1998	$cf::MAP{$self->path} = $self;	2178	$cf::MAP{$self->path} = $self;
		2179	}
1999		2180
2000	$self->reset; # polite request, might not happen	2181	$self->reset; # polite request, might not happen
2001	}	2182	}
2002		2183
2003	=item $maps = cf::map::tmp_maps	2184	=item $maps = cf::map::tmp_maps
…		…
2079		2260
2080	sub inv_recursive {	2261	sub inv_recursive {
2081	inv_recursive_ inv $_[0]	2262	inv_recursive_ inv $_[0]
2082	}	2263	}
2083		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
2084	package cf;	2296	package cf;
2085		2297
2086	=back	2298	=back
2087		2299
2088	=head3 cf::object::player	2300	=head3 cf::object::player
…		…
2110		2322
2111	} else {	2323	} else {
2112	my $pl = $self->contr;	2324	my $pl = $self->contr;
2113		2325
2114	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2326	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2115	my $diag = $pl->{npc_dialog};	2327	my $dialog = $pl->{npc_dialog};
2116	$diag->{pl}->ext_reply (	2328	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2117	$diag->{id},
2118	msgtype => "reply",
2119	msg => $diag->{pl}->expand_cfpod ($msg),
2120	add_topics => []
2121	);
2122		2329
2123	} else {	2330	} else {
2124	$msg = $npc->name . " says: $msg" if $npc;	2331	$msg = $npc->name . " says: $msg" if $npc;
2125	$self->message ($msg, $flags);	2332	$self->message ($msg, $flags);
2126	}	2333	}
2127	}	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 (@_);
2128	}	2345	}
2129		2346
2130	=item $player_object->may ("access")	2347	=item $player_object->may ("access")
2131		2348
2132	Returns wether the given player is authorized to access resource "access"	2349	Returns wether the given player is authorized to access resource "access"
…		…
2211	# use -1 or undef as default coordinates, not 0, 0	2428	# use -1 or undef as default coordinates, not 0, 0
2212	($x, $y) = ($map->enter_x, $map->enter_y)	2429	($x, $y) = ($map->enter_x, $map->enter_y)
2213	if $x <=0 && $y <= 0;	2430	if $x <=0 && $y <= 0;
2214		2431
2215	$map->load;	2432	$map->load;
2216	$map->load_diag;	2433	$map->load_neighbours;
2217		2434
2218	return unless $self->contr->active;	2435	return unless $self->contr->active;
2219	$self->activate_recursive;	2436	$self->activate_recursive;
2220		2437
2221	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2438	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2222	$self->enter_map ($map, $x, $y);	2439	$self->enter_map ($map, $x, $y);
2223	}	2440	}
2224		2441
2225	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2442	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2226		2443
2227	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
2228	her, loading and preparing them map, calling the provided $check callback	2445	her, loading and preparing them map, calling the provided $check callback
2229	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
2230	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.
2231		2449
2232	=cut	2450	=cut
2233		2451
2234	our $GOTOGEN;	2452	our $GOTOGEN;
2235		2453
2236	sub cf::object::player::goto {	2454	sub cf::object::player::goto {
2237	my ($self, $path, $x, $y, $check) = @_;	2455	my ($self, $path, $x, $y, $check, $done) = @_;
2238		2456
2239	# 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
2240	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2458	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2241		2459
2242	$self->enter_link;	2460	$self->enter_link;
2243		2461
2244	(async {	2462	(async {
		2463	# *tag paths override both path and x\|y
		2464	if ($path =~ /^\(.)$/) {
		2465	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2466	my $ob = $obs[rand @obs];
		2467
		2468	# see if we actually can go there
		2469	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2470	$ob = $obs[rand @obs];
		2471	} else {
		2472	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE \| cf::NDI_RED);
		2473	}
		2474	# else put us there anyways for now #d#
		2475
		2476	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2477	} else {
		2478	($path, $x, $y) = (undef, undef, undef);
		2479	}
		2480	}
		2481
2245	my $map = eval {	2482	my $map = eval {
2246	my $map = cf::map::find $path;	2483	my $map = defined $path ? cf::map::find $path : undef;
2247		2484
2248	if ($map) {	2485	if ($map) {
2249	$map = $map->customise_for ($self);	2486	$map = $map->customise_for ($self);
2250	$map = $check->($map) if $check && $map;	2487	$map = $check->($map) if $check && $map;
2251	} else {	2488	} else {
2252	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);	2489	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE \| cf::NDI_RED);
2253	}	2490	}
2254		2491
2255	$map	2492	$map
2256	};	2493	};
2257		2494
…		…
2262		2499
2263	if ($gen == $self->{_goto_generation}) {	2500	if ($gen == $self->{_goto_generation}) {
2264	delete $self->{_goto_generation};	2501	delete $self->{_goto_generation};
2265	$self->leave_link ($map, $x, $y);	2502	$self->leave_link ($map, $x, $y);
2266	}	2503	}
		2504
		2505	$done->() if $done;
2267	})->prio (1);	2506	})->prio (1);
2268	}	2507	}
2269		2508
2270	=item $player_object->enter_exit ($exit_object)	2509	=item $player_object->enter_exit ($exit_object)
2271		2510
…		…
2340	my $hp = $exit->stats->hp;	2579	my $hp = $exit->stats->hp;
2341	my $sp = $exit->stats->sp;	2580	my $sp = $exit->stats->sp;
2342		2581
2343	$self->enter_link;	2582	$self->enter_link;
2344		2583
		2584	# if exit is damned, update players death & WoR home-position
		2585	$self->contr->savebed ($slaying, $hp, $sp)
		2586	if $exit->flag (FLAG_DAMNED);
		2587
2345	(async {	2588	(async {
2346	$self->deactivate_recursive; # just to be sure	2589	$self->deactivate_recursive; # just to be sure
2347	unless (eval {	2590	unless (eval {
2348	$self->goto ($slaying, $hp, $sp);	2591	$self->goto ($slaying, $hp, $sp);
2349		2592
…		…
2376		2619
2377	utf8::encode $text;	2620	utf8::encode $text;
2378	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2621	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2379	}	2622	}
2380		2623
2381	=item $client->send_msg ($color, $type, $msg, [extra...])	2624	=item $client->send_msg ($channel, $msg, $color, [extra...])
2382		2625
2383	Send a drawinfo or msg packet to the client, formatting the msg for the	2626	Send a drawinfo or msg packet to the client, formatting the msg for the
2384	client if neccessary. C<$type> should be a string identifying the type of	2627	client if neccessary. C<$type> should be a string identifying the type of
2385	the message, with C<log> being the default. If C<$color> is negative, suppress	2628	the message, with C<log> being the default. If C<$color> is negative, suppress
2386	the message unless the client supports the msg packet.	2629	the message unless the client supports the msg packet.
2387		2630
2388	=cut	2631	=cut
2389		2632
		2633	our %CHANNEL = (
		2634	"c/identify" => {
		2635	id => "identify",
		2636	title => "Identify",
		2637	reply => undef,
		2638	tooltip => "Items recently identified",
		2639	},
		2640	"c/examine" => {
		2641	id => "examine",
		2642	title => "Examine",
		2643	reply => undef,
		2644	tooltip => "Signs and other items you examined",
		2645	},
		2646	);
		2647
2390	sub cf::client::send_msg {	2648	sub cf::client::send_msg {
2391	my ($self, $color, $type, $msg, @extra) = @_;	2649	my ($self, $channel, $msg, $color, @extra) = @_;
2392		2650
2393	$msg = $self->pl->expand_cfpod ($msg);	2651	$msg = $self->pl->expand_cfpod ($msg);
2394		2652
		2653	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2654
		2655	# check predefined channels, for the benefit of C
		2656	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};
		2657
		2658	if (ref $channel) {
		2659	# send meta info to client, if not yet sent
		2660	unless (exists $self->{channel}{$channel->{id}}) {
		2661	$self->{channel}{$channel->{id}} = $channel;
		2662	$self->ext_msg (channel_info => $channel)
		2663	if $self->can_msg;
		2664	}
		2665
		2666	$channel = $channel->{id};
		2667	}
		2668
		2669	return unless @extra \|\| length $msg;
		2670
2395	if ($self->can_msg) {	2671	if ($self->can_msg) {
		2672	# default colour, mask it out
		2673	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2674	if $color & cf::NDI_DEF;
		2675
2396	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));	2676	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2677	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2397	} else {	2678	} else {
2398	# replace some tags by gcfclient-compatible ones
2399	for ($msg) {
2400	1 while
2401	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2402	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2403	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2404	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2405	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2406	}
2407
2408	if ($color >= 0) {	2679	if ($color >= 0) {
		2680	# replace some tags by gcfclient-compatible ones
		2681	for ($msg) {
		2682	1 while
		2683	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2684	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2685	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2686	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2687	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2688	}
		2689
		2690	$color &= cf::NDI_COLOR_MASK;
		2691
		2692	utf8::encode $msg;
		2693
2409	if (0 && $msg =~ /\[/) {	2694	if (0 && $msg =~ /\[/) {
		2695	# COMMAND/INFO
2410	$self->send_packet ("drawextinfo $color 4 0 $msg")	2696	$self->send_packet ("drawextinfo $color 10 8 $msg")
2411	} else {	2697	} else {
2412	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2698	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2413	$self->send_packet ("drawinfo $color $msg")	2699	$self->send_packet ("drawinfo $color $msg")
2414	}	2700	}
2415	}	2701	}
2416	}	2702	}
2417	}	2703	}
2418		2704
2419	=item $client->ext_event ($type, %msg)	2705	=item $client->ext_msg ($type, @msg)
2420		2706
2421	Sends an ext event to the client.	2707	Sends an ext event to the client.
2422		2708
2423	=cut	2709	=cut
2424		2710
2425	sub cf::client::ext_event($$%) {	2711	sub cf::client::ext_msg($$@) {
2426	my ($self, $type, %msg) = @_;	2712	my ($self, $type, @msg) = @_;
2427		2713
		2714	if ($self->extcmd == 2) {
		2715	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2716	} elsif ($self->extcmd == 1) { # TODO: remove
2428	$msg{msgtype} = "event_$type";	2717	push @msg, msgtype => "event_$type";
2429	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2718	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2719	}
		2720	}
		2721
		2722	=item $client->ext_reply ($msgid, @msg)
		2723
		2724	Sends an ext reply to the client.
		2725
		2726	=cut
		2727
		2728	sub cf::client::ext_reply($$@) {
		2729	my ($self, $id, @msg) = @_;
		2730
		2731	if ($self->extcmd == 2) {
		2732	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2733	} elsif ($self->extcmd == 1) {
		2734	#TODO: version 1, remove
		2735	unshift @msg, msgtype => "reply", msgid => $id;
		2736	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2737	}
2430	}	2738	}
2431		2739
2432	=item $success = $client->query ($flags, "text", \&cb)	2740	=item $success = $client->query ($flags, "text", \&cb)
2433		2741
2434	Queues a query to the client, calling the given callback with	2742	Queues a query to the client, calling the given callback with
…		…
2489	my ($ns, $buf) = @_;	2797	my ($ns, $buf) = @_;
2490		2798
2491	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2799	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2492		2800
2493	if (ref $msg) {	2801	if (ref $msg) {
		2802	my ($type, $reply, @payload) =
		2803	"ARRAY" eq ref $msg
		2804	? @$msg
		2805	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2806
		2807	my @reply;
		2808
2494	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2809	if (my $cb = $EXTICMD{$type}) {
2495	if (my %reply = $cb->($ns, $msg)) {	2810	@reply = $cb->($ns, @payload);
2496	$reply{msgid} = $msg->{msgid};
2497	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2498	}
2499	}	2811	}
		2812
		2813	$ns->ext_reply ($reply, @reply)
		2814	if $reply;
		2815
2500	} else {	2816	} else {
2501	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2817	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2502	}	2818	}
2503		2819
2504	cf::override;	2820	cf::override;
…		…
2551	our $safe = new Safe "safe";	2867	our $safe = new Safe "safe";
2552	our $safe_hole = new Safe::Hole;	2868	our $safe_hole = new Safe::Hole;
2553		2869
2554	$SIG{FPE} = 'IGNORE';	2870	$SIG{FPE} = 'IGNORE';
2555		2871
2556	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2872	$safe->permit_only (Opcode::opset qw(
		2873	:base_core :base_mem :base_orig :base_math
		2874	grepstart grepwhile mapstart mapwhile
		2875	sort time
		2876	));
2557		2877
2558	# here we export the classes and methods available to script code	2878	# here we export the classes and methods available to script code
2559		2879
2560	=pod	2880	=pod
2561		2881
2562	The following functions and methods are available within a safe environment:	2882	The following functions and methods are available within a safe environment:
2563		2883
2564	cf::object contr pay_amount pay_player map	2884	cf::object
		2885	contr pay_amount pay_player map x y force_find force_add
		2886	insert remove name archname title slaying race decrease_ob_nr
		2887
2565	cf::object::player player	2888	cf::object::player
2566	cf::player peaceful	2889	player
2567	cf::map trigger	2890
		2891	cf::player
		2892	peaceful
		2893
		2894	cf::map
		2895	trigger
2568		2896
2569	=cut	2897	=cut
2570		2898
2571	for (	2899	for (
2572	["cf::object" => qw(contr pay_amount pay_player map)],	2900	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2901	insert remove inv name archname title slaying race
		2902	decrease_ob_nr)],
2573	["cf::object::player" => qw(player)],	2903	["cf::object::player" => qw(player)],
2574	["cf::player" => qw(peaceful)],	2904	["cf::player" => qw(peaceful)],
2575	["cf::map" => qw(trigger)],	2905	["cf::map" => qw(trigger)],
2576	) {	2906	) {
2577	no strict 'refs';	2907	no strict 'refs';
…		…
2653	# the server's init and main functions	2983	# the server's init and main functions
2654		2984
2655	sub load_facedata($) {	2985	sub load_facedata($) {
2656	my ($path) = @_;	2986	my ($path) = @_;
2657		2987
		2988	# HACK to clear player env face cache, we need some signal framework
		2989	# for this (global event?)
		2990	%ext::player_env::MUSIC_FACE_CACHE = ();
		2991
		2992	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		2993
2658	warn "loading facedata from $path\n";	2994	warn "loading facedata from $path\n";
2659		2995
2660	my $facedata;	2996	my $facedata;
2661	0 < aio_load $path, $facedata	2997	0 < aio_load $path, $facedata
2662	or die "$path: $!";	2998	or die "$path: $!";
…		…
2664	$facedata = Coro::Storable::thaw $facedata;	3000	$facedata = Coro::Storable::thaw $facedata;
2665		3001
2666	$facedata->{version} == 2	3002	$facedata->{version} == 2
2667	or cf::cleanup "$path: version mismatch, cannot proceed.";	3003	or cf::cleanup "$path: version mismatch, cannot proceed.";
2668		3004
		3005	# patch in the exptable
		3006	$facedata->{resource}{"res/exp_table"} = {
		3007	type => FT_RSRC,
		3008	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3009	};
		3010	cf::cede_to_tick;
		3011
2669	{	3012	{
2670	my $faces = $facedata->{faceinfo};	3013	my $faces = $facedata->{faceinfo};
2671		3014
2672	while (my ($face, $info) = each %$faces) {	3015	while (my ($face, $info) = each %$faces) {
2673	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3016	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2674	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3017	cf::face::set_visibility $idx, $info->{visibility};
		3018	cf::face::set_magicmap $idx, $info->{magicmap};
2675	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3019	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2676	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3020	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2677	Coro::cede;	3021
		3022	cf::cede_to_tick;
2678	}	3023	}
2679		3024
2680	while (my ($face, $info) = each %$faces) {	3025	while (my ($face, $info) = each %$faces) {
2681	next unless $info->{smooth};	3026	next unless $info->{smooth};
2682	my $idx = cf::face::find $face	3027	my $idx = cf::face::find $face
2683	or next;	3028	or next;
2684	if (my $smooth = cf::face::find $info->{smooth}) {	3029	if (my $smooth = cf::face::find $info->{smooth}) {
		3030	cf::face::set_smooth $idx, $smooth;
2685	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3031	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2686	} else {	3032	} else {
2687	warn "smooth face '$info->{smooth}' not found for face '$face'";	3033	warn "smooth face '$info->{smooth}' not found for face '$face'";
2688	}	3034	}
2689	Coro::cede;	3035
		3036	cf::cede_to_tick;
2690	}	3037	}
2691	}	3038	}
2692		3039
2693	{	3040	{
2694	my $anims = $facedata->{animinfo};	3041	my $anims = $facedata->{animinfo};
2695		3042
2696	while (my ($anim, $info) = each %$anims) {	3043	while (my ($anim, $info) = each %$anims) {
2697	cf::anim::set $anim, $info->{frames}, $info->{facings};	3044	cf::anim::set $anim, $info->{frames}, $info->{facings};
2698	Coro::cede;	3045	cf::cede_to_tick;
2699	}	3046	}
2700		3047
2701	cf::anim::invalidate_all; # d'oh	3048	cf::anim::invalidate_all; # d'oh
2702	}	3049	}
2703		3050
		3051	{
		3052	# TODO: for gcfclient pleasure, we should give resources
		3053	# that gcfclient doesn't grok a >10000 face index.
		3054	my $res = $facedata->{resource};
		3055
		3056	my $soundconf = delete $res->{"res/sound.conf"};
		3057
		3058	while (my ($name, $info) = each %$res) {
		3059	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3060	my $data;
		3061
		3062	if ($info->{type} & 1) {
		3063	# prepend meta info
		3064
		3065	my $meta = $enc->encode ({
		3066	name => $name,
		3067	%{ $info->{meta} \|\| {} },
		3068	});
		3069
		3070	$data = pack "(w/a)", $meta, $info->{data};
		3071	} else {
		3072	$data = $info->{data};
		3073	}
		3074
		3075	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3076	cf::face::set_type $idx, $info->{type};
		3077
		3078	cf::cede_to_tick;
		3079	}
		3080
		3081	if ($soundconf) {
		3082	$soundconf = $enc->decode (delete $soundconf->{data});
		3083
		3084	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3085	my $sound = $soundconf->{compat}[$_]
		3086	or next;
		3087
		3088	my $face = cf::face::find "sound/$sound->[1]";
		3089	cf::sound::set $sound->[0] => $face;
		3090	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3091	}
		3092
		3093	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3094	my $face = cf::face::find "sound/$v";
		3095	cf::sound::set $k => $face;
		3096	}
		3097	}
		3098	}
		3099
2704	1	3100	1
2705	}	3101	}
2706		3102
		3103	register_exticmd fx_want => sub {
		3104	my ($ns, $want) = @_;
		3105
		3106	while (my ($k, $v) = each %$want) {
		3107	$ns->fx_want ($k, $v);
		3108	}
		3109	};
		3110
2707	sub reload_regions {	3111	sub reload_regions {
		3112	# HACK to clear player env face cache, we need some signal framework
		3113	# for this (global event?)
		3114	%ext::player_env::MUSIC_FACE_CACHE = ();
		3115
2708	load_resource_file "$MAPDIR/regions"	3116	load_resource_file "$MAPDIR/regions"
2709	or die "unable to load regions file\n";	3117	or die "unable to load regions file\n";
		3118
		3119	for (cf::region::list) {
		3120	$_->{match} = qr/$_->{match}/
		3121	if exists $_->{match};
		3122	}
2710	}	3123	}
2711		3124
2712	sub reload_facedata {	3125	sub reload_facedata {
2713	load_facedata "$DATADIR/facedata"	3126	load_facedata "$DATADIR/facedata"
2714	or die "unable to load facedata\n";	3127	or die "unable to load facedata\n";
…		…
2743		3156
2744	sub init {	3157	sub init {
2745	reload_resources;	3158	reload_resources;
2746	}	3159	}
2747		3160
2748	sub cfg_load {	3161	sub reload_config {
2749	open my $fh, "<:utf8", "$CONFDIR/config"	3162	open my $fh, "<:utf8", "$CONFDIR/config"
2750	or return;	3163	or return;
2751		3164
2752	local $/;	3165	local $/;
2753	*CFG = YAML::Syck::Load <$fh>;	3166	*CFG = YAML::Syck::Load <$fh>;
…		…
2773	(async {	3186	(async {
2774	Event::one_event;	3187	Event::one_event;
2775	})->prio (Coro::PRIO_MAX);	3188	})->prio (Coro::PRIO_MAX);
2776	};	3189	};
2777		3190
2778	cfg_load;	3191	reload_config;
2779	db_init;	3192	db_init;
2780	load_extensions;	3193	load_extensions;
2781		3194
2782	$TICK_WATCHER->start;	3195	$TICK_WATCHER->start;
2783	Event::loop;	3196	Event::loop;
…		…
2976	warn "reloading cf.pm";	3389	warn "reloading cf.pm";
2977	require cf;	3390	require cf;
2978	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3391	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2979		3392
2980	warn "loading config and database again";	3393	warn "loading config and database again";
2981	cf::cfg_load;	3394	cf::reload_config;
2982		3395
2983	warn "loading extensions";	3396	warn "loading extensions";
2984	cf::load_extensions;	3397	cf::load_extensions;
2985		3398
2986	warn "reattaching attachments to objects/players";	3399	warn "reattaching attachments to objects/players";
…		…
3051	my $signal = new Coro::Signal;	3464	my $signal = new Coro::Signal;
3052	push @WAIT_FOR_TICK_BEGIN, $signal;	3465	push @WAIT_FOR_TICK_BEGIN, $signal;
3053	$signal->wait;	3466	$signal->wait;
3054	}	3467	}
3055		3468
3056	my $min = 1e6;#d#
3057	my $avg = 10;
3058	$TICK_WATCHER = Event->timer (	3469	$TICK_WATCHER = Event->timer (
3059	reentrant => 0,	3470	reentrant => 0,
3060	parked => 1,	3471	parked => 1,
3061	prio => 0,	3472	prio => 0,
3062	at => $NEXT_TICK \|\| $TICK,	3473	at => $NEXT_TICK \|\| $TICK,
…		…
3070		3481
3071	$NOW = $tick_start = Event::time;	3482	$NOW = $tick_start = Event::time;
3072		3483
3073	cf::server_tick; # one server iteration	3484	cf::server_tick; # one server iteration
3074		3485
3075	0 && sync_job {#d#
3076	for(1..10) {
3077	my $t = Event::time;
3078	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3079	or die;
3080
3081	$map->width (50);
3082	$map->height (50);
3083	$map->alloc;
3084	$map->_load_objects ("/tmp/x.map", 1);
3085	my $t = Event::time - $t;
3086
3087	#next unless $t < 0.0013;#d#
3088	if ($t < $min) {
3089	$min = $t;
3090	}
3091	$avg = $avg * 0.99 + $t * 0.01;
3092	}
3093	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3094	exit 0;
3095	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3096	};
3097
3098	$RUNTIME += $TICK;	3486	$RUNTIME += $TICK;
3099	$NEXT_TICK += $TICK;	3487	$NEXT_TICK += $TICK;
3100		3488
3101	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3489	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3102	$NEXT_RUNTIME_WRITE = $NOW + 10;	3490	$NEXT_RUNTIME_WRITE = $NOW + 10;
…		…
3104	write_runtime	3492	write_runtime
3105	or warn "ERROR: unable to write runtime file: $!";	3493	or warn "ERROR: unable to write runtime file: $!";
3106	};	3494	};
3107	}	3495	}
3108		3496
3109	# my $AFTER = Event::time;
3110	# warn $AFTER - $NOW;#d#
3111
3112	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3497	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3113	$sig->send;	3498	$sig->send;
3114	}	3499	}
3115	while (my $sig = shift @WAIT_FOR_TICK) {	3500	while (my $sig = shift @WAIT_FOR_TICK) {
3116	$sig->send;	3501	$sig->send;
…		…
3126		3511
3127	$LOAD = ($NOW - $tick_start) / $TICK;	3512	$LOAD = ($NOW - $tick_start) / $TICK;
3128	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3513	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3129		3514
3130	_post_tick;	3515	_post_tick;
3131
3132
3133	},	3516	},
3134	);	3517	);
3135		3518
3136	{	3519	{
		3520	BDB::min_parallel 8;
3137	BDB::max_poll_time $TICK * 0.1;	3521	BDB::max_poll_time $TICK * 0.1;
3138	$BDB_POLL_WATCHER = Event->io (	3522	$BDB_POLL_WATCHER = Event->io (
3139	reentrant => 0,	3523	reentrant => 0,
3140	fd => BDB::poll_fileno,	3524	fd => BDB::poll_fileno,
3141	poll => 'r',	3525	poll => 'r',
3142	prio => 0,	3526	prio => 0,
3143	data => WF_AUTOCANCEL,	3527	data => WF_AUTOCANCEL,
3144	cb => \&BDB::poll_cb,	3528	cb => \&BDB::poll_cb,
3145	);	3529	);
3146	BDB::min_parallel 8;
3147		3530
3148	BDB::set_sync_prepare {	3531	BDB::set_sync_prepare {
3149	my $status;	3532	my $status;
3150	my $current = $Coro::current;	3533	my $current = $Coro::current;
3151	(	3534	(
…		…
3160	)	3543	)
3161	};	3544	};
3162		3545
3163	unless ($DB_ENV) {	3546	unless ($DB_ENV) {
3164	$DB_ENV = BDB::db_env_create;	3547	$DB_ENV = BDB::db_env_create;
		3548	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC
		3549	\| BDB::LOG_AUTOREMOVE, 1);
		3550	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3551	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3165		3552
3166	cf::sync_job {	3553	cf::sync_job {
3167	eval {	3554	eval {
3168	BDB::db_env_open	3555	BDB::db_env_open
3169	$DB_ENV,	3556	$DB_ENV,
…		…
3171	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN	3558	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN
3172	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3559	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3173	0666;	3560	0666;
3174		3561
3175	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3562	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3176
3177	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
3178	$DB_ENV->set_lk_detect;
3179	};	3563	};
3180		3564
3181	cf::cleanup "db_env_open(db): $@" if $@;	3565	cf::cleanup "db_env_open(db): $@" if $@;
3182	};	3566	};
3183	}	3567	}
		3568
		3569	$BDB_DEADLOCK_WATCHER = Event->timer (
		3570	after => 3,
		3571	interval => 1,
		3572	hard => 1,
		3573	prio => 0,
		3574	data => WF_AUTOCANCEL,
		3575	cb => sub {
		3576	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3577	},
		3578	);
		3579	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3580	after => 11,
		3581	interval => 60,
		3582	hard => 1,
		3583	prio => 0,
		3584	data => WF_AUTOCANCEL,
		3585	cb => sub {
		3586	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3587	},
		3588	);
		3589	$BDB_TRICKLE_WATCHER = Event->timer (
		3590	after => 5,
		3591	interval => 10,
		3592	hard => 1,
		3593	prio => 0,
		3594	data => WF_AUTOCANCEL,
		3595	cb => sub {
		3596	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3597	},
		3598	);
3184	}	3599	}
3185		3600
3186	{	3601	{
3187	IO::AIO::min_parallel 8;	3602	IO::AIO::min_parallel 8;
3188		3603

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.290 by root, Mon Jul 2 03:15:30 2007 UTC vs. Revision 1.372 by root, Sat Sep 15 13:25:33 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.290 by root, Mon Jul 2 03:15:30 2007 UTC vs.
Revision 1.372 by root, Sat Sep 15 13:25:33 2007 UTC