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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.296 by root, Wed Jul 4 07:09:06 2007 UTC vs.
Revision 1.373 by root, Sat Sep 15 15:58:06 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
…		…
949	sub object_freezer_save {	1028	sub object_freezer_save {
950	my ($filename, $rdata, $objs) = @_;	1029	my ($filename, $rdata, $objs) = @_;
951		1030
952	sync_job {	1031	sync_job {
953	if (length $$rdata) {	1032	if (length $$rdata) {
		1033	utf8::decode (my $decname = $filename);
954	warn sprintf "saving %s (%d,%d)\n",	1034	warn sprintf "saving %s (%d,%d)\n",
955	$filename, length $$rdata, scalar @$objs;	1035	$decname, length $$rdata, scalar @$objs;
956		1036
957	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1037	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
958	chmod SAVE_MODE, $fh;	1038	chmod SAVE_MODE, $fh;
959	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1039	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960	aio_fsync $fh if $cf::USE_FSYNC;	1040	aio_fsync $fh if $cf::USE_FSYNC;
…		…
979	}	1059	}
980	} else {	1060	} else {
981	aio_unlink $filename;	1061	aio_unlink $filename;
982	aio_unlink "$filename.pst";	1062	aio_unlink "$filename.pst";
983	}	1063	}
984	}	1064	};
985	}	1065	}
986		1066
987	sub object_freezer_as_string {	1067	sub object_freezer_as_string {
988	my ($rdata, $objs) = @_;	1068	my ($rdata, $objs) = @_;
989		1069
…		…
1001	or return;	1081	or return;
1002		1082
1003	unless (aio_stat "$filename.pst") {	1083	unless (aio_stat "$filename.pst") {
1004	(aio_load "$filename.pst", $av) >= 0	1084	(aio_load "$filename.pst", $av) >= 0
1005	or return;	1085	or return;
		1086
1006	$av = eval { (Storable::thaw $av)->{objs} };	1087	$av = eval { (Storable::thaw $av)->{objs} };
1007	}	1088	}
1008		1089
		1090	utf8::decode (my $decname = $filename);
1009	warn sprintf "loading %s (%d)\n",	1091	warn sprintf "loading %s (%d,%d)\n",
1010	$filename, length $data, scalar @{$av \|\| []};	1092	$decname, length $data, scalar @{$av \|\| []};
		1093
1011	return ($data, $av);	1094	($data, $av)
1012	}	1095	}
1013		1096
1014	=head2 COMMAND CALLBACKS	1097	=head2 COMMAND CALLBACKS
1015		1098
1016	=over 4	1099	=over 4
…		…
1089	my ($pl, $buf) = @_;	1172	my ($pl, $buf) = @_;
1090		1173
1091	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1174	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092		1175
1093	if (ref $msg) {	1176	if (ref $msg) {
		1177	my ($type, $reply, @payload) =
		1178	"ARRAY" eq ref $msg
		1179	? @$msg
		1180	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1181
		1182	my @reply;
		1183
1094	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1184	if (my $cb = $EXTCMD{$type}) {
1095	if (my %reply = $cb->($pl, $msg)) {	1185	@reply = $cb->($pl, @payload);
1096	$pl->ext_reply ($msg->{msgid}, %reply);
1097	}
1098	}	1186	}
		1187
		1188	$pl->ext_reply ($reply, @reply)
		1189	if $reply;
		1190
1099	} else {	1191	} else {
1100	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1192	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101	}	1193	}
1102		1194
1103	cf::override;	1195	cf::override;
…		…
1193		1285
1194	=head3 cf::player	1286	=head3 cf::player
1195		1287
1196	=over 4	1288	=over 4
1197		1289
		1290	=item cf::player::num_playing
		1291
		1292	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1293
		1294	=cut
		1295
		1296	sub num_playing {
		1297	scalar grep
		1298	$_->ob->map
		1299	&& !$_->hidden
		1300	&& !$_->ob->flag (cf::FLAG_WIZ),
		1301	cf::player::list
		1302	}
		1303
1198	=item cf::player::find $login	1304	=item cf::player::find $login
1199		1305
1200	Returns the given player object, loading it if necessary (might block).	1306	Returns the given player object, loading it if necessary (might block).
1201		1307
1202	=cut	1308	=cut
…		…
1237	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1343	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1344	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1345	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240	aio_unlink +(playerdir $login) . "/$login.pl";	1346	aio_unlink +(playerdir $login) . "/$login.pl";
1241		1347
1242	my $pl = load_pl path $login	1348	my $f = new_from_file cf::object::thawer path $login
1243	or return;	1349	or return;
		1350
		1351	my $pl = cf::player::load_pl $f
		1352	or return;
		1353	local $cf::PLAYER_LOADING{$login} = $pl;
		1354	$f->resolve_delayed_derefs;
1244	$cf::PLAYER{$login} = $pl	1355	$cf::PLAYER{$login} = $pl
1245	}	1356	}
1246	}	1357	}
1247	}	1358	}
1248		1359
…		…
1258		1369
1259	aio_mkdir playerdir $pl, 0770;	1370	aio_mkdir playerdir $pl, 0770;
1260	$pl->{last_save} = $cf::RUNTIME;	1371	$pl->{last_save} = $cf::RUNTIME;
1261		1372
1262	$pl->save_pl ($path);	1373	$pl->save_pl ($path);
1263	Coro::cede;	1374	cf::cede_to_tick;
1264	}	1375	}
1265		1376
1266	sub new($) {	1377	sub new($) {
1267	my ($login) = @_;	1378	my ($login) = @_;
1268		1379
…		…
1272	$self->{deny_save} = 1;	1383	$self->{deny_save} = 1;
1273		1384
1274	$cf::PLAYER{$login} = $self;	1385	$cf::PLAYER{$login} = $self;
1275		1386
1276	$self	1387	$self
		1388	}
		1389
		1390	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1391
		1392	=cut
		1393
		1394	sub send_msg {
		1395	my $ns = shift->ns
		1396	or return;
		1397	$ns->send_msg (@_);
1277	}	1398	}
1278		1399
1279	=item $pl->quit_character	1400	=item $pl->quit_character
1280		1401
1281	Nukes the player without looking back. If logged in, the connection will	1402	Nukes the player without looking back. If logged in, the connection will
…		…
1336	or return [];	1457	or return [];
1337		1458
1338	my @logins;	1459	my @logins;
1339		1460
1340	for my $login (@$dirs) {	1461	for my $login (@$dirs) {
		1462	my $path = path $login;
		1463
		1464	# a .pst is a dead give-away for a valid player
		1465	unless (-e "$path.pst") {
1341	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1466	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342	aio_read $fh, 0, 512, my $buf, 0 or next;	1467	aio_read $fh, 0, 512, my $buf, 0 or next;
1343	$buf !~ /^password -------------$/m or next; # official not-valid tag	1468	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1469	}
1344		1470
1345	utf8::decode $login;	1471	utf8::decode $login;
1346	push @logins, $login;	1472	push @logins, $login;
1347	}	1473	}
1348		1474
…		…
1386	sub expand_cfpod {	1512	sub expand_cfpod {
1387	((my $self), (local $_)) = @_;	1513	((my $self), (local $_)) = @_;
1388		1514
1389	# escape & and <	1515	# escape & and <
1390	s/&/&/g;	1516	s/&/&/g;
1391	s/(?<![BIUGH])</</g;	1517	s/(?<![BIUGHT])</</g;
1392		1518
1393	# this is buggy, it needs to properly take care of nested <'s	1519	# this is buggy, it needs to properly take care of nested <'s
1394		1520
1395	1 while	1521	1 while
1396	# replace B<>, I<>, U<> etc.	1522	# replace B<>, I<>, U<> etc.
1397	s/B<([^\>]*)>/<b>$1<\/b>/	1523	s/B<([^\>]*)>/<b>$1<\/b>/
1398	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1524	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1399	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1525	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1526	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1400	# replace G<male\|female> tags	1527	# replace G<male\|female> tags
1401	\|\| s{G<([^>\|])\\|([^>])>}{	1528	\|\| s{G<([^>\|])\\|([^>])>}{
1402	$self->gender ? $2 : $1	1529	$self->gender ? $2 : $1
1403	}ge	1530	}ge
1404	# replace H<hint text>	1531	# replace H<hint text>
…		…
1425	sub hintmode {	1552	sub hintmode {
1426	$_[0]{hintmode} = $_[1] if @_ > 1;	1553	$_[0]{hintmode} = $_[1] if @_ > 1;
1427	$_[0]{hintmode}	1554	$_[0]{hintmode}
1428	}	1555	}
1429		1556
1430	=item $player->ext_reply ($msgid, %msg)	1557	=item $player->ext_reply ($msgid, @msg)
1431		1558
1432	Sends an ext reply to the player.	1559	Sends an ext reply to the player.
1433		1560
1434	=cut	1561	=cut
1435		1562
1436	sub ext_reply($$%) {	1563	sub ext_reply($$@) {
1437	my ($self, $id, %msg) = @_;	1564	my ($self, $id, @msg) = @_;
1438		1565
1439	$msg{msgid} = $id;	1566	$self->ns->ext_reply ($id, @msg)
1440	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1441	}	1567	}
1442		1568
1443	=item $player->ext_event ($type, %msg)	1569	=item $player->ext_msg ($type, @msg)
1444		1570
1445	Sends an ext event to the client.	1571	Sends an ext event to the client.
1446		1572
1447	=cut	1573	=cut
1448		1574
1449	sub ext_event($$%) {	1575	sub ext_msg($$@) {
1450	my ($self, $type, %msg) = @_;	1576	my ($self, $type, @msg) = @_;
1451		1577
1452	$self->ns->ext_event ($type, %msg);	1578	$self->ns->ext_msg ($type, @msg);
1453	}	1579	}
1454		1580
1455	=head3 cf::region	1581	=head3 cf::region
1456		1582
1457	=over 4	1583	=over 4
…		…
1470	my ($path) = @_;	1596	my ($path) = @_;
1471		1597
1472	my ($match, $specificity);	1598	my ($match, $specificity);
1473		1599
1474	for my $region (list) {	1600	for my $region (list) {
1475	if ($region->match && $path =~ $region->match) {	1601	if ($region->{match} && $path =~ $region->{match}) {
1476	($match, $specificity) = ($region, $region->specificity)	1602	($match, $specificity) = ($region, $region->specificity)
1477	if $region->specificity > $specificity;	1603	if $region->specificity > $specificity;
1478	}	1604	}
1479	}	1605	}
1480		1606
…		…
1600	$self->init; # pass $1 etc.	1726	$self->init; # pass $1 etc.
1601	return $self;	1727	return $self;
1602	}	1728	}
1603	}	1729	}
1604		1730
1605	Carp::carp "unable to resolve path '$path' (base '$base').";	1731	Carp::cluck "unable to resolve path '$path' (base '$base').";
1606	()	1732	()
1607	}	1733	}
1608		1734
1609	sub init {	1735	sub init {
1610	my ($self) = @_;	1736	my ($self) = @_;
…		…
1673		1799
1674	sub load_header_from($) {	1800	sub load_header_from($) {
1675	my ($self, $path) = @_;	1801	my ($self, $path) = @_;
1676		1802
1677	utf8::encode $path;	1803	utf8::encode $path;
1678	#aio_open $path, O_RDONLY, 0	1804	my $f = new_from_file cf::object::thawer $path
1679	# or return;
1680
1681	$self->_load_header ($path)
1682	or return;	1805	or return;
		1806
		1807	$self->_load_header ($f)
		1808	or return;
		1809
		1810	local $MAP_LOADING{$self->{path}} = $self;
		1811	$f->resolve_delayed_derefs;
1683		1812
1684	$self->{load_path} = $path;	1813	$self->{load_path} = $path;
1685		1814
1686	1	1815	1
1687	}	1816	}
…		…
1741	sub find {	1870	sub find {
1742	my ($path, $origin) = @_;	1871	my ($path, $origin) = @_;
1743		1872
1744	$path = normalise $path, $origin && $origin->path;	1873	$path = normalise $path, $origin && $origin->path;
1745		1874
		1875	cf::lock_wait "map_data:$path";#d#remove
1746	cf::lock_wait "map_find:$path";	1876	cf::lock_wait "map_find:$path";
1747		1877
1748	$cf::MAP{$path} \|\| do {	1878	$cf::MAP{$path} \|\| do {
1749	my $guard = cf::lock_acquire "map_find:$path";	1879	my $guard1 = cf::lock_acquire "map_find:$path";
		1880	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1881
1750	my $map = new_from_path cf::map $path	1882	my $map = new_from_path cf::map $path
1751	or return;	1883	or return;
1752		1884
1753	$map->{last_save} = $cf::RUNTIME;	1885	$map->{last_save} = $cf::RUNTIME;
1754		1886
…		…
1756	or return;	1888	or return;
1757		1889
1758	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1890	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1759	# doing this can freeze the server in a sync job, obviously	1891	# doing this can freeze the server in a sync job, obviously
1760	#$cf::WAIT_FOR_TICK->wait;	1892	#$cf::WAIT_FOR_TICK->wait;
		1893	undef $guard1;
		1894	undef $guard2;
1761	$map->reset;	1895	$map->reset;
1762	undef $guard;
1763	return find $path;	1896	return find $path;
1764	}	1897	}
1765		1898
1766	$cf::MAP{$path} = $map	1899	$cf::MAP{$path} = $map
1767	}	1900	}
…		…
1776	local $self->{deny_reset} = 1; # loading can take a long time	1909	local $self->{deny_reset} = 1; # loading can take a long time
1777		1910
1778	my $path = $self->{path};	1911	my $path = $self->{path};
1779		1912
1780	{	1913	{
1781	my $guard = cf::lock_acquire "map_load:$path";	1914	my $guard = cf::lock_acquire "map_data:$path";
1782		1915
		1916	return unless $self->valid;
1783	return if $self->in_memory != cf::MAP_SWAPPED;	1917	return unless $self->in_memory == cf::MAP_SWAPPED;
1784		1918
1785	$self->in_memory (cf::MAP_LOADING);	1919	$self->in_memory (cf::MAP_LOADING);
1786		1920
1787	$self->alloc;	1921	$self->alloc;
1788		1922
1789	$self->pre_load;	1923	$self->pre_load;
1790	Coro::cede;	1924	cf::cede_to_tick;
1791		1925
		1926	my $f = new_from_file cf::object::thawer $self->{load_path};
		1927	$f->skip_block;
1792	$self->_load_objects ($self->{load_path}, 1)	1928	$self->_load_objects ($f)
1793	or return;	1929	or return;
1794		1930
1795	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1931	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1796	if delete $self->{load_original};	1932	if delete $self->{load_original};
1797		1933
1798	if (my $uniq = $self->uniq_path) {	1934	if (my $uniq = $self->uniq_path) {
1799	utf8::encode $uniq;	1935	utf8::encode $uniq;
1800	if (aio_open $uniq, O_RDONLY, 0) {	1936	unless (aio_stat $uniq) {
		1937	if (my $f = new_from_file cf::object::thawer $uniq) {
1801	$self->clear_unique_items;	1938	$self->clear_unique_items;
1802	$self->_load_objects ($uniq, 0);	1939	$self->_load_objects ($f);
		1940	$f->resolve_delayed_derefs;
		1941	}
1803	}	1942	}
1804	}	1943	}
1805		1944
1806	Coro::cede;	1945	$f->resolve_delayed_derefs;
		1946
		1947	cf::cede_to_tick;
1807	# now do the right thing for maps	1948	# now do the right thing for maps
1808	$self->link_multipart_objects;	1949	$self->link_multipart_objects;
1809	$self->difficulty ($self->estimate_difficulty)	1950	$self->difficulty ($self->estimate_difficulty)
1810	unless $self->difficulty;	1951	unless $self->difficulty;
1811	Coro::cede;	1952	cf::cede_to_tick;
1812		1953
1813	unless ($self->{deny_activate}) {	1954	unless ($self->{deny_activate}) {
1814	$self->decay_objects;	1955	$self->decay_objects;
1815	$self->fix_auto_apply;	1956	$self->fix_auto_apply;
1816	$self->update_buttons;	1957	$self->update_buttons;
1817	Coro::cede;	1958	cf::cede_to_tick;
1818	$self->set_darkness_map;	1959	$self->set_darkness_map;
1819	Coro::cede;	1960	cf::cede_to_tick;
1820	$self->activate;	1961	$self->activate;
1821	}	1962	}
		1963
		1964	$self->{last_save} = $cf::RUNTIME;
		1965	$self->last_access ($cf::RUNTIME);
1822		1966
1823	$self->in_memory (cf::MAP_IN_MEMORY);	1967	$self->in_memory (cf::MAP_IN_MEMORY);
1824	}	1968	}
1825		1969
1826	$self->post_load;	1970	$self->post_load;
…		…
1837		1981
1838	$self	1982	$self
1839	}	1983	}
1840		1984
1841	# find and load all maps in the 3x3 area around a map	1985	# find and load all maps in the 3x3 area around a map
1842	sub load_diag {	1986	sub load_neighbours {
1843	my ($map) = @_;	1987	my ($map) = @_;
1844		1988
1845	my @diag; # diagonal neighbours	1989	my @neigh; # diagonal neighbours
1846		1990
1847	for (0 .. 3) {	1991	for (0 .. 3) {
1848	my $neigh = $map->tile_path ($_)	1992	my $neigh = $map->tile_path ($_)
1849	or next;	1993	or next;
1850	$neigh = find $neigh, $map	1994	$neigh = find $neigh, $map
1851	or next;	1995	or next;
1852	$neigh->load;	1996	$neigh->load;
1853		1997
		1998	push @neigh,
1854	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	1999	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1855	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2000	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1856	}	2001	}
1857		2002
1858	for (@diag) {	2003	for (grep defined $_->[0], @neigh) {
		2004	my ($path, $origin) = @$_;
1859	my $neigh = find @$_	2005	my $neigh = find $path, $origin
1860	or next;	2006	or next;
1861	$neigh->load;	2007	$neigh->load;
1862	}	2008	}
1863	}	2009	}
1864		2010
…		…
1869	}	2015	}
1870		2016
1871	sub do_load_sync {	2017	sub do_load_sync {
1872	my ($map) = @_;	2018	my ($map) = @_;
1873		2019
		2020	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2021	if $Coro::current == $Coro::main;
		2022
1874	cf::sync_job { $map->load };	2023	cf::sync_job { $map->load };
1875	}	2024	}
1876		2025
1877	our %MAP_PREFETCH;	2026	our %MAP_PREFETCH;
1878	our $MAP_PREFETCHER = undef;	2027	our $MAP_PREFETCHER = undef;
1879		2028
1880	sub find_async {	2029	sub find_async {
1881	my ($path, $origin) = @_;	2030	my ($path, $origin, $load) = @_;
1882		2031
1883	$path = normalise $path, $origin && $origin->{path};	2032	$path = normalise $path, $origin && $origin->{path};
1884		2033
1885	if (my $map = $cf::MAP{$path}) {	2034	if (my $map = $cf::MAP{$path}) {
1886	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2035	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1887	}	2036	}
1888		2037
1889	undef $MAP_PREFETCH{$path};	2038	$MAP_PREFETCH{$path} \|= $load;
		2039
1890	$MAP_PREFETCHER \|\|= cf::async {	2040	$MAP_PREFETCHER \|\|= cf::async {
1891	while (%MAP_PREFETCH) {	2041	while (%MAP_PREFETCH) {
1892	for my $path (keys %MAP_PREFETCH) {	2042	while (my ($k, $v) = each %MAP_PREFETCH) {
1893	my $map = find $path	2043	if (my $map = find $k) {
1894	or next;
1895	$map->load;	2044	$map->load if $v;
		2045	}
1896		2046
1897	delete $MAP_PREFETCH{$path};	2047	delete $MAP_PREFETCH{$k};
1898	}	2048	}
1899	}	2049	}
1900	undef $MAP_PREFETCHER;	2050	undef $MAP_PREFETCHER;
1901	};	2051	};
1902	$MAP_PREFETCHER->prio (6);	2052	$MAP_PREFETCHER->prio (6);
…		…
1905	}	2055	}
1906		2056
1907	sub save {	2057	sub save {
1908	my ($self) = @_;	2058	my ($self) = @_;
1909		2059
1910	my $lock = cf::lock_acquire "map_data:" . $self->path;	2060	my $lock = cf::lock_acquire "map_data:$self->{path}";
1911		2061
1912	$self->{last_save} = $cf::RUNTIME;	2062	$self->{last_save} = $cf::RUNTIME;
1913		2063
1914	return unless $self->dirty;	2064	return unless $self->dirty;
1915		2065
…		…
1938	my ($self) = @_;	2088	my ($self) = @_;
1939		2089
1940	# save first because save cedes	2090	# save first because save cedes
1941	$self->save;	2091	$self->save;
1942		2092
1943	my $lock = cf::lock_acquire "map_data:" . $self->path;	2093	my $lock = cf::lock_acquire "map_data:$self->{path}";
1944		2094
1945	return if $self->players;	2095	return if $self->players;
1946	return if $self->in_memory != cf::MAP_IN_MEMORY;	2096	return if $self->in_memory != cf::MAP_IN_MEMORY;
1947	return if $self->{deny_save};	2097	return if $self->{deny_save};
1948		2098
		2099	$self->in_memory (cf::MAP_SWAPPED);
		2100
		2101	$self->deactivate;
		2102	$_->clear_links_to ($self) for values %cf::MAP;
1949	$self->clear;	2103	$self->clear;
1950	$self->in_memory (cf::MAP_SWAPPED);
1951	}	2104	}
1952		2105
1953	sub reset_at {	2106	sub reset_at {
1954	my ($self) = @_;	2107	my ($self) = @_;
1955		2108
…		…
1987	if $uniq;	2140	if $uniq;
1988	}	2141	}
1989		2142
1990	delete $cf::MAP{$self->path};	2143	delete $cf::MAP{$self->path};
1991		2144
		2145	$self->deactivate;
		2146	$_->clear_links_to ($self) for values %cf::MAP;
1992	$self->clear;	2147	$self->clear;
1993
1994	$_->clear_links_to ($self) for values %cf::MAP;
1995		2148
1996	$self->unlink_save;	2149	$self->unlink_save;
1997	$self->destroy;	2150	$self->destroy;
1998	}	2151	}
1999		2152
2000	my $nuke_counter = "aaaa";	2153	my $nuke_counter = "aaaa";
2001		2154
2002	sub nuke {	2155	sub nuke {
2003	my ($self) = @_;	2156	my ($self) = @_;
2004		2157
		2158	{
		2159	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2160
2005	delete $cf::MAP{$self->path};	2161	delete $cf::MAP{$self->path};
2006		2162
2007	$self->unlink_save;	2163	$self->unlink_save;
2008		2164
2009	bless $self, "cf::map";	2165	bless $self, "cf::map";
2010	delete $self->{deny_reset};	2166	delete $self->{deny_reset};
2011	$self->{deny_save} = 1;	2167	$self->{deny_save} = 1;
2012	$self->reset_timeout (1);	2168	$self->reset_timeout (1);
2013	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2169	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2014		2170
2015	$cf::MAP{$self->path} = $self;	2171	$cf::MAP{$self->path} = $self;
		2172	}
2016		2173
2017	$self->reset; # polite request, might not happen	2174	$self->reset; # polite request, might not happen
2018	}	2175	}
2019		2176
2020	=item $maps = cf::map::tmp_maps	2177	=item $maps = cf::map::tmp_maps
…		…
2096		2253
2097	sub inv_recursive {	2254	sub inv_recursive {
2098	inv_recursive_ inv $_[0]	2255	inv_recursive_ inv $_[0]
2099	}	2256	}
2100		2257
		2258	=item $ref = $ob->ref
		2259
		2260	creates and returns a persistent reference to an objetc that can be stored as a string.
		2261
		2262	=item $ob = cf::object::deref ($refstring)
		2263
		2264	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2265	even if the object actually exists. May block.
		2266
		2267	=cut
		2268
		2269	sub deref {
		2270	my ($ref) = @_;
		2271
		2272	# temporary compatibility#TODO#remove
		2273	$ref =~ s{^<}{player/<};
		2274
		2275	if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
		2276	my ($uuid, $name) = ($1, $2);
		2277	my $pl = $cf::PLAYER_LOADING{$name} \|\| cf::player::find $name
		2278	or return;
		2279	$pl->ob->uuid eq $uuid
		2280	or return;
		2281
		2282	$pl->ob
		2283	} else {
		2284	warn "$ref: cannot resolve object reference\n";
		2285	undef
		2286	}
		2287	}
		2288
2101	package cf;	2289	package cf;
2102		2290
2103	=back	2291	=back
2104		2292
2105	=head3 cf::object::player	2293	=head3 cf::object::player
…		…
2127		2315
2128	} else {	2316	} else {
2129	my $pl = $self->contr;	2317	my $pl = $self->contr;
2130		2318
2131	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2319	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2132	my $diag = $pl->{npc_dialog};	2320	my $dialog = $pl->{npc_dialog};
2133	$diag->{pl}->ext_reply (	2321	$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		2322
2140	} else {	2323	} else {
2141	$msg = $npc->name . " says: $msg" if $npc;	2324	$msg = $npc->name . " says: $msg" if $npc;
2142	$self->message ($msg, $flags);	2325	$self->message ($msg, $flags);
2143	}	2326	}
2144	}	2327	}
		2328	}
		2329
		2330	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2331
		2332	=cut
		2333
		2334	sub cf::object::send_msg {
		2335	my $pl = shift->contr
		2336	or return;
		2337	$pl->send_msg (@_);
2145	}	2338	}
2146		2339
2147	=item $player_object->may ("access")	2340	=item $player_object->may ("access")
2148		2341
2149	Returns wether the given player is authorized to access resource "access"	2342	Returns wether the given player is authorized to access resource "access"
…		…
2228	# use -1 or undef as default coordinates, not 0, 0	2421	# use -1 or undef as default coordinates, not 0, 0
2229	($x, $y) = ($map->enter_x, $map->enter_y)	2422	($x, $y) = ($map->enter_x, $map->enter_y)
2230	if $x <=0 && $y <= 0;	2423	if $x <=0 && $y <= 0;
2231		2424
2232	$map->load;	2425	$map->load;
2233	$map->load_diag;	2426	$map->load_neighbours;
2234		2427
2235	return unless $self->contr->active;	2428	return unless $self->contr->active;
2236	$self->activate_recursive;	2429	$self->activate_recursive;
2237		2430
2238	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2431	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2239	$self->enter_map ($map, $x, $y);	2432	$self->enter_map ($map, $x, $y);
2240	}	2433	}
2241		2434
2242	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2435	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2243		2436
2244	Moves the player to the given map-path and coordinates by first freezing	2437	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	2438	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	2439	that has to return the map if sucecssful, and then unfreezes the player on
2247	the new (success) or old (failed) map position.	2440	the new (success) or old (failed) map position. In either case, $done will
		2441	be called at the end of this process.
2248		2442
2249	=cut	2443	=cut
2250		2444
2251	our $GOTOGEN;	2445	our $GOTOGEN;
2252		2446
2253	sub cf::object::player::goto {	2447	sub cf::object::player::goto {
2254	my ($self, $path, $x, $y, $check) = @_;	2448	my ($self, $path, $x, $y, $check, $done) = @_;
2255		2449
2256	# do generation counting so two concurrent goto's will be executed in-order	2450	# do generation counting so two concurrent goto's will be executed in-order
2257	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2451	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2258		2452
2259	$self->enter_link;	2453	$self->enter_link;
2260		2454
2261	(async {	2455	(async {
		2456	# *tag paths override both path and x\|y
		2457	if ($path =~ /^\(.)$/) {
		2458	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2459	my $ob = $obs[rand @obs];
		2460
		2461	# see if we actually can go there
		2462	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2463	$ob = $obs[rand @obs];
		2464	} else {
		2465	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE \| cf::NDI_RED);
		2466	}
		2467	# else put us there anyways for now #d#
		2468
		2469	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2470	} else {
		2471	($path, $x, $y) = (undef, undef, undef);
		2472	}
		2473	}
		2474
2262	my $map = eval {	2475	my $map = eval {
2263	my $map = cf::map::find $path;	2476	my $map = defined $path ? cf::map::find $path : undef;
2264		2477
2265	if ($map) {	2478	if ($map) {
2266	$map = $map->customise_for ($self);	2479	$map = $map->customise_for ($self);
2267	$map = $check->($map) if $check && $map;	2480	$map = $check->($map) if $check && $map;
2268	} else {	2481	} else {
2269	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);	2482	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE \| cf::NDI_RED);
2270	}	2483	}
2271		2484
2272	$map	2485	$map
2273	};	2486	};
2274		2487
…		…
2279		2492
2280	if ($gen == $self->{_goto_generation}) {	2493	if ($gen == $self->{_goto_generation}) {
2281	delete $self->{_goto_generation};	2494	delete $self->{_goto_generation};
2282	$self->leave_link ($map, $x, $y);	2495	$self->leave_link ($map, $x, $y);
2283	}	2496	}
		2497
		2498	$done->() if $done;
2284	})->prio (1);	2499	})->prio (1);
2285	}	2500	}
2286		2501
2287	=item $player_object->enter_exit ($exit_object)	2502	=item $player_object->enter_exit ($exit_object)
2288		2503
…		…
2397		2612
2398	utf8::encode $text;	2613	utf8::encode $text;
2399	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2614	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2400	}	2615	}
2401		2616
2402	=item $client->send_msg ($color, $type, $msg, [extra...])	2617	=item $client->send_msg ($channel, $msg, $color, [extra...])
2403		2618
2404	Send a drawinfo or msg packet to the client, formatting the msg for the	2619	Send a drawinfo or msg packet to the client, formatting the msg for the
2405	client if neccessary. C<$type> should be a string identifying the type of	2620	client if neccessary. C<$type> should be a string identifying the type of
2406	the message, with C<log> being the default. If C<$color> is negative, suppress	2621	the message, with C<log> being the default. If C<$color> is negative, suppress
2407	the message unless the client supports the msg packet.	2622	the message unless the client supports the msg packet.
2408		2623
2409	=cut	2624	=cut
2410		2625
		2626	our %CHANNEL = (
		2627	"c/identify" => {
		2628	id => "identify",
		2629	title => "Identify",
		2630	reply => undef,
		2631	tooltip => "Items recently identified",
		2632	},
		2633	"c/examine" => {
		2634	id => "examine",
		2635	title => "Examine",
		2636	reply => undef,
		2637	tooltip => "Signs and other items you examined",
		2638	},
		2639	);
		2640
2411	sub cf::client::send_msg {	2641	sub cf::client::send_msg {
2412	my ($self, $color, $type, $msg, @extra) = @_;	2642	my ($self, $channel, $msg, $color, @extra) = @_;
2413		2643
2414	$msg = $self->pl->expand_cfpod ($msg);	2644	$msg = $self->pl->expand_cfpod ($msg);
2415		2645
		2646	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2647
		2648	# check predefined channels, for the benefit of C
		2649	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};
		2650
		2651	if (ref $channel) {
		2652	# send meta info to client, if not yet sent
		2653	unless (exists $self->{channel}{$channel->{id}}) {
		2654	$self->{channel}{$channel->{id}} = $channel;
		2655	$self->ext_msg (channel_info => $channel)
		2656	if $self->can_msg;
		2657	}
		2658
		2659	$channel = $channel->{id};
		2660	}
		2661
2416	return unless @extra \|\| length $msg;	2662	return unless @extra \|\| length $msg;
2417		2663
2418	if ($self->can_msg) {	2664	if ($self->can_msg) {
		2665	# default colour, mask it out
		2666	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2667	if $color & cf::NDI_DEF;
		2668
2419	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));	2669	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2670	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2420	} else {	2671	} else {
2421	# replace some tags by gcfclient-compatible ones
2422	for ($msg) {
2423	1 while
2424	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2425	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2426	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2427	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2428	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2429	}
2430
2431	if ($color >= 0) {	2672	if ($color >= 0) {
		2673	# replace some tags by gcfclient-compatible ones
		2674	for ($msg) {
		2675	1 while
		2676	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2677	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2678	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2679	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2680	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2681	}
		2682
		2683	$color &= cf::NDI_COLOR_MASK;
		2684
		2685	utf8::encode $msg;
		2686
2432	if (0 && $msg =~ /\[/) {	2687	if (0 && $msg =~ /\[/) {
		2688	# COMMAND/INFO
2433	$self->send_packet ("drawextinfo $color 4 0 $msg")	2689	$self->send_packet ("drawextinfo $color 10 8 $msg")
2434	} else {	2690	} else {
2435	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2691	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2436	$self->send_packet ("drawinfo $color $msg")	2692	$self->send_packet ("drawinfo $color $msg")
2437	}	2693	}
2438	}	2694	}
2439	}	2695	}
2440	}	2696	}
2441		2697
2442	=item $client->ext_event ($type, %msg)	2698	=item $client->ext_msg ($type, @msg)
2443		2699
2444	Sends an ext event to the client.	2700	Sends an ext event to the client.
2445		2701
2446	=cut	2702	=cut
2447		2703
2448	sub cf::client::ext_event($$%) {	2704	sub cf::client::ext_msg($$@) {
2449	my ($self, $type, %msg) = @_;	2705	my ($self, $type, @msg) = @_;
2450		2706
		2707	if ($self->extcmd == 2) {
		2708	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2709	} elsif ($self->extcmd == 1) { # TODO: remove
2451	$msg{msgtype} = "event_$type";	2710	push @msg, msgtype => "event_$type";
2452	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2711	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2712	}
		2713	}
		2714
		2715	=item $client->ext_reply ($msgid, @msg)
		2716
		2717	Sends an ext reply to the client.
		2718
		2719	=cut
		2720
		2721	sub cf::client::ext_reply($$@) {
		2722	my ($self, $id, @msg) = @_;
		2723
		2724	if ($self->extcmd == 2) {
		2725	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2726	} elsif ($self->extcmd == 1) {
		2727	#TODO: version 1, remove
		2728	unshift @msg, msgtype => "reply", msgid => $id;
		2729	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2730	}
2453	}	2731	}
2454		2732
2455	=item $success = $client->query ($flags, "text", \&cb)	2733	=item $success = $client->query ($flags, "text", \&cb)
2456		2734
2457	Queues a query to the client, calling the given callback with	2735	Queues a query to the client, calling the given callback with
…		…
2512	my ($ns, $buf) = @_;	2790	my ($ns, $buf) = @_;
2513		2791
2514	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2792	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2515		2793
2516	if (ref $msg) {	2794	if (ref $msg) {
		2795	my ($type, $reply, @payload) =
		2796	"ARRAY" eq ref $msg
		2797	? @$msg
		2798	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2799
		2800	my @reply;
		2801
2517	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2802	if (my $cb = $EXTICMD{$type}) {
2518	if (my %reply = $cb->($ns, $msg)) {	2803	@reply = $cb->($ns, @payload);
2519	$reply{msgid} = $msg->{msgid};
2520	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2521	}
2522	}	2804	}
		2805
		2806	$ns->ext_reply ($reply, @reply)
		2807	if $reply;
		2808
2523	} else {	2809	} else {
2524	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2810	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2525	}	2811	}
2526		2812
2527	cf::override;	2813	cf::override;
…		…
2574	our $safe = new Safe "safe";	2860	our $safe = new Safe "safe";
2575	our $safe_hole = new Safe::Hole;	2861	our $safe_hole = new Safe::Hole;
2576		2862
2577	$SIG{FPE} = 'IGNORE';	2863	$SIG{FPE} = 'IGNORE';
2578		2864
2579	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2865	$safe->permit_only (Opcode::opset qw(
		2866	:base_core :base_mem :base_orig :base_math
		2867	grepstart grepwhile mapstart mapwhile
		2868	sort time
		2869	));
2580		2870
2581	# here we export the classes and methods available to script code	2871	# here we export the classes and methods available to script code
2582		2872
2583	=pod	2873	=pod
2584		2874
2585	The following functions and methods are available within a safe environment:	2875	The following functions and methods are available within a safe environment:
2586		2876
2587	cf::object contr pay_amount pay_player map	2877	cf::object
		2878	contr pay_amount pay_player map x y force_find force_add
		2879	insert remove name archname title slaying race decrease_ob_nr
		2880
2588	cf::object::player player	2881	cf::object::player
2589	cf::player peaceful	2882	player
2590	cf::map trigger	2883
		2884	cf::player
		2885	peaceful
		2886
		2887	cf::map
		2888	trigger
2591		2889
2592	=cut	2890	=cut
2593		2891
2594	for (	2892	for (
2595	["cf::object" => qw(contr pay_amount pay_player map)],	2893	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2894	insert remove inv name archname title slaying race
		2895	decrease_ob_nr)],
2596	["cf::object::player" => qw(player)],	2896	["cf::object::player" => qw(player)],
2597	["cf::player" => qw(peaceful)],	2897	["cf::player" => qw(peaceful)],
2598	["cf::map" => qw(trigger)],	2898	["cf::map" => qw(trigger)],
2599	) {	2899	) {
2600	no strict 'refs';	2900	no strict 'refs';
…		…
2676	# the server's init and main functions	2976	# the server's init and main functions
2677		2977
2678	sub load_facedata($) {	2978	sub load_facedata($) {
2679	my ($path) = @_;	2979	my ($path) = @_;
2680		2980
		2981	# HACK to clear player env face cache, we need some signal framework
		2982	# for this (global event?)
		2983	%ext::player_env::MUSIC_FACE_CACHE = ();
		2984
		2985	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		2986
2681	warn "loading facedata from $path\n";	2987	warn "loading facedata from $path\n";
2682		2988
2683	my $facedata;	2989	my $facedata;
2684	0 < aio_load $path, $facedata	2990	0 < aio_load $path, $facedata
2685	or die "$path: $!";	2991	or die "$path: $!";
…		…
2687	$facedata = Coro::Storable::thaw $facedata;	2993	$facedata = Coro::Storable::thaw $facedata;
2688		2994
2689	$facedata->{version} == 2	2995	$facedata->{version} == 2
2690	or cf::cleanup "$path: version mismatch, cannot proceed.";	2996	or cf::cleanup "$path: version mismatch, cannot proceed.";
2691		2997
		2998	# patch in the exptable
		2999	$facedata->{resource}{"res/exp_table"} = {
		3000	type => FT_RSRC,
		3001	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3002	};
		3003	cf::cede_to_tick;
		3004
2692	{	3005	{
2693	my $faces = $facedata->{faceinfo};	3006	my $faces = $facedata->{faceinfo};
2694		3007
2695	while (my ($face, $info) = each %$faces) {	3008	while (my ($face, $info) = each %$faces) {
2696	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3009	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2697	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3010	cf::face::set_visibility $idx, $info->{visibility};
		3011	cf::face::set_magicmap $idx, $info->{magicmap};
2698	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3012	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2699	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3013	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2700	Coro::cede;	3014
		3015	cf::cede_to_tick;
2701	}	3016	}
2702		3017
2703	while (my ($face, $info) = each %$faces) {	3018	while (my ($face, $info) = each %$faces) {
2704	next unless $info->{smooth};	3019	next unless $info->{smooth};
2705	my $idx = cf::face::find $face	3020	my $idx = cf::face::find $face
2706	or next;	3021	or next;
2707	if (my $smooth = cf::face::find $info->{smooth}) {	3022	if (my $smooth = cf::face::find $info->{smooth}) {
		3023	cf::face::set_smooth $idx, $smooth;
2708	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3024	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2709	} else {	3025	} else {
2710	warn "smooth face '$info->{smooth}' not found for face '$face'";	3026	warn "smooth face '$info->{smooth}' not found for face '$face'";
2711	}	3027	}
2712	Coro::cede;	3028
		3029	cf::cede_to_tick;
2713	}	3030	}
2714	}	3031	}
2715		3032
2716	{	3033	{
2717	my $anims = $facedata->{animinfo};	3034	my $anims = $facedata->{animinfo};
2718		3035
2719	while (my ($anim, $info) = each %$anims) {	3036	while (my ($anim, $info) = each %$anims) {
2720	cf::anim::set $anim, $info->{frames}, $info->{facings};	3037	cf::anim::set $anim, $info->{frames}, $info->{facings};
2721	Coro::cede;	3038	cf::cede_to_tick;
2722	}	3039	}
2723		3040
2724	cf::anim::invalidate_all; # d'oh	3041	cf::anim::invalidate_all; # d'oh
2725	}	3042	}
2726		3043
		3044	{
		3045	# TODO: for gcfclient pleasure, we should give resources
		3046	# that gcfclient doesn't grok a >10000 face index.
		3047	my $res = $facedata->{resource};
		3048
		3049	my $soundconf = delete $res->{"res/sound.conf"};
		3050
		3051	while (my ($name, $info) = each %$res) {
		3052	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3053	my $data;
		3054
		3055	if ($info->{type} & 1) {
		3056	# prepend meta info
		3057
		3058	my $meta = $enc->encode ({
		3059	name => $name,
		3060	%{ $info->{meta} \|\| {} },
		3061	});
		3062
		3063	$data = pack "(w/a)", $meta, $info->{data};
		3064	} else {
		3065	$data = $info->{data};
		3066	}
		3067
		3068	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3069	cf::face::set_type $idx, $info->{type};
		3070
		3071	cf::cede_to_tick;
		3072	}
		3073
		3074	if ($soundconf) {
		3075	$soundconf = $enc->decode (delete $soundconf->{data});
		3076
		3077	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3078	my $sound = $soundconf->{compat}[$_]
		3079	or next;
		3080
		3081	my $face = cf::face::find "sound/$sound->[1]";
		3082	cf::sound::set $sound->[0] => $face;
		3083	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3084	}
		3085
		3086	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3087	my $face = cf::face::find "sound/$v";
		3088	cf::sound::set $k => $face;
		3089	}
		3090	}
		3091	}
		3092
2727	1	3093	1
2728	}	3094	}
2729		3095
		3096	register_exticmd fx_want => sub {
		3097	my ($ns, $want) = @_;
		3098
		3099	while (my ($k, $v) = each %$want) {
		3100	$ns->fx_want ($k, $v);
		3101	}
		3102	};
		3103
2730	sub reload_regions {	3104	sub reload_regions {
		3105	# HACK to clear player env face cache, we need some signal framework
		3106	# for this (global event?)
		3107	%ext::player_env::MUSIC_FACE_CACHE = ();
		3108
2731	load_resource_file "$MAPDIR/regions"	3109	load_resource_file "$MAPDIR/regions"
2732	or die "unable to load regions file\n";	3110	or die "unable to load regions file\n";
		3111
		3112	for (cf::region::list) {
		3113	$_->{match} = qr/$_->{match}/
		3114	if exists $_->{match};
		3115	}
2733	}	3116	}
2734		3117
2735	sub reload_facedata {	3118	sub reload_facedata {
2736	load_facedata "$DATADIR/facedata"	3119	load_facedata "$DATADIR/facedata"
2737	or die "unable to load facedata\n";	3120	or die "unable to load facedata\n";
…		…
2766		3149
2767	sub init {	3150	sub init {
2768	reload_resources;	3151	reload_resources;
2769	}	3152	}
2770		3153
2771	sub cfg_load {	3154	sub reload_config {
2772	open my $fh, "<:utf8", "$CONFDIR/config"	3155	open my $fh, "<:utf8", "$CONFDIR/config"
2773	or return;	3156	or return;
2774		3157
2775	local $/;	3158	local $/;
2776	*CFG = YAML::Syck::Load <$fh>;	3159	*CFG = YAML::Syck::Load <$fh>;
…		…
2796	(async {	3179	(async {
2797	Event::one_event;	3180	Event::one_event;
2798	})->prio (Coro::PRIO_MAX);	3181	})->prio (Coro::PRIO_MAX);
2799	};	3182	};
2800		3183
2801	cfg_load;	3184	reload_config;
2802	db_init;	3185	db_init;
2803	load_extensions;	3186	load_extensions;
2804		3187
2805	$TICK_WATCHER->start;	3188	$TICK_WATCHER->start;
2806	Event::loop;	3189	Event::loop;
…		…
2999	warn "reloading cf.pm";	3382	warn "reloading cf.pm";
3000	require cf;	3383	require cf;
3001	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3384	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3002		3385
3003	warn "loading config and database again";	3386	warn "loading config and database again";
3004	cf::cfg_load;	3387	cf::reload_config;
3005		3388
3006	warn "loading extensions";	3389	warn "loading extensions";
3007	cf::load_extensions;	3390	cf::load_extensions;
3008		3391
3009	warn "reattaching attachments to objects/players";	3392	warn "reattaching attachments to objects/players";
…		…
3074	my $signal = new Coro::Signal;	3457	my $signal = new Coro::Signal;
3075	push @WAIT_FOR_TICK_BEGIN, $signal;	3458	push @WAIT_FOR_TICK_BEGIN, $signal;
3076	$signal->wait;	3459	$signal->wait;
3077	}	3460	}
3078		3461
3079	my $min = 1e6;#d#
3080	my $avg = 10;
3081	$TICK_WATCHER = Event->timer (	3462	$TICK_WATCHER = Event->timer (
3082	reentrant => 0,	3463	reentrant => 0,
3083	parked => 1,	3464	parked => 1,
3084	prio => 0,	3465	prio => 0,
3085	at => $NEXT_TICK \|\| $TICK,	3466	at => $NEXT_TICK \|\| $TICK,
…		…
3093		3474
3094	$NOW = $tick_start = Event::time;	3475	$NOW = $tick_start = Event::time;
3095		3476
3096	cf::server_tick; # one server iteration	3477	cf::server_tick; # one server iteration
3097		3478
3098	0 && sync_job {#d#
3099	for(1..10) {
3100	my $t = Event::time;
3101	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3102	or die;
3103
3104	$map->width (50);
3105	$map->height (50);
3106	$map->alloc;
3107	$map->_load_objects ("/tmp/x.map", 1);
3108	my $t = Event::time - $t;
3109
3110	#next unless $t < 0.0013;#d#
3111	if ($t < $min) {
3112	$min = $t;
3113	}
3114	$avg = $avg * 0.99 + $t * 0.01;
3115	}
3116	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3117	exit 0;
3118	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3119	};
3120
3121	$RUNTIME += $TICK;	3479	$RUNTIME += $TICK;
3122	$NEXT_TICK += $TICK;	3480	$NEXT_TICK += $TICK;
3123		3481
3124	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3482	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3125	$NEXT_RUNTIME_WRITE = $NOW + 10;	3483	$NEXT_RUNTIME_WRITE = $NOW + 10;
…		…
3127	write_runtime	3485	write_runtime
3128	or warn "ERROR: unable to write runtime file: $!";	3486	or warn "ERROR: unable to write runtime file: $!";
3129	};	3487	};
3130	}	3488	}
3131		3489
3132	# my $AFTER = Event::time;
3133	# warn $AFTER - $NOW;#d#
3134
3135	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3490	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3136	$sig->send;	3491	$sig->send;
3137	}	3492	}
3138	while (my $sig = shift @WAIT_FOR_TICK) {	3493	while (my $sig = shift @WAIT_FOR_TICK) {
3139	$sig->send;	3494	$sig->send;
…		…
3149		3504
3150	$LOAD = ($NOW - $tick_start) / $TICK;	3505	$LOAD = ($NOW - $tick_start) / $TICK;
3151	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3506	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3152		3507
3153	_post_tick;	3508	_post_tick;
3154
3155
3156	},	3509	},
3157	);	3510	);
3158		3511
3159	{	3512	{
		3513	BDB::min_parallel 8;
3160	BDB::max_poll_time $TICK * 0.1;	3514	BDB::max_poll_time $TICK * 0.1;
3161	$BDB_POLL_WATCHER = Event->io (	3515	$BDB_POLL_WATCHER = Event->io (
3162	reentrant => 0,	3516	reentrant => 0,
3163	fd => BDB::poll_fileno,	3517	fd => BDB::poll_fileno,
3164	poll => 'r',	3518	poll => 'r',
3165	prio => 0,	3519	prio => 0,
3166	data => WF_AUTOCANCEL,	3520	data => WF_AUTOCANCEL,
3167	cb => \&BDB::poll_cb,	3521	cb => \&BDB::poll_cb,
3168	);	3522	);
3169	BDB::min_parallel 8;
3170		3523
3171	BDB::set_sync_prepare {	3524	BDB::set_sync_prepare {
3172	my $status;	3525	my $status;
3173	my $current = $Coro::current;	3526	my $current = $Coro::current;
3174	(	3527	(
…		…
3183	)	3536	)
3184	};	3537	};
3185		3538
3186	unless ($DB_ENV) {	3539	unless ($DB_ENV) {
3187	$DB_ENV = BDB::db_env_create;	3540	$DB_ENV = BDB::db_env_create;
		3541	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC
		3542	\| BDB::LOG_AUTOREMOVE, 1);
		3543	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3544	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3188		3545
3189	cf::sync_job {	3546	cf::sync_job {
3190	eval {	3547	eval {
3191	BDB::db_env_open	3548	BDB::db_env_open
3192	$DB_ENV,	3549	$DB_ENV,
…		…
3194	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN	3551	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN
3195	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3552	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3196	0666;	3553	0666;
3197		3554
3198	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3555	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3199
3200	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
3201	$DB_ENV->set_lk_detect;
3202	};	3556	};
3203		3557
3204	cf::cleanup "db_env_open(db): $@" if $@;	3558	cf::cleanup "db_env_open(db): $@" if $@;
3205	};	3559	};
3206	}	3560	}
		3561
		3562	$BDB_DEADLOCK_WATCHER = Event->timer (
		3563	after => 3,
		3564	interval => 1,
		3565	hard => 1,
		3566	prio => 0,
		3567	data => WF_AUTOCANCEL,
		3568	cb => sub {
		3569	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3570	},
		3571	);
		3572	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3573	after => 11,
		3574	interval => 60,
		3575	hard => 1,
		3576	prio => 0,
		3577	data => WF_AUTOCANCEL,
		3578	cb => sub {
		3579	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3580	},
		3581	);
		3582	$BDB_TRICKLE_WATCHER = Event->timer (
		3583	after => 5,
		3584	interval => 10,
		3585	hard => 1,
		3586	prio => 0,
		3587	data => WF_AUTOCANCEL,
		3588	cb => sub {
		3589	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3590	},
		3591	);
3207	}	3592	}
3208		3593
3209	{	3594	{
3210	IO::AIO::min_parallel 8;	3595	IO::AIO::min_parallel 8;
3211		3596

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.296 by root, Wed Jul 4 07:09:06 2007 UTC vs. Revision 1.373 by root, Sat Sep 15 15:58:06 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.296 by root, Wed Jul 4 07:09:06 2007 UTC vs.
Revision 1.373 by root, Sat Sep 15 15:58:06 2007 UTC