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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.309 by elmex, Mon Jul 16 15:27: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 ();
…		…
79	our $NEXT_TICK;	80	our $NEXT_TICK;
80	our $NOW;	81	our $NOW;
81	our $USE_FSYNC = 1; # use fsync to write maps - default off	82	our $USE_FSYNC = 1; # use fsync to write maps - default off
82		83
83	our $BDB_POLL_WATCHER;	84	our $BDB_POLL_WATCHER;
		85	our $BDB_DEADLOCK_WATCHER;
		86	our $BDB_CHECKPOINT_WATCHER;
		87	our $BDB_TRICKLE_WATCHER;
84	our $DB_ENV;	88	our $DB_ENV;
85		89
86	our %CFG;	90	our %CFG;
87		91
88	our $UPTIME; $UPTIME \|\|= time;	92	our $UPTIME; $UPTIME \|\|= time;
89	our $RUNTIME;	93	our $RUNTIME;
90		94
91	our %PLAYER; # all users	95	our (%PLAYER, %PLAYER_LOADING); # all users
92	our %MAP; # all maps	96	our (%MAP, %MAP_LOADING ); # all maps
93	our $LINK_MAP; # the special {link} map, which is always available	97	our $LINK_MAP; # the special {link} map, which is always available
94		98
95	# 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 ∕
96	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	100	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97		101
…		…
167		171
168	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
169	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
170	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.
171		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
172	=back	182	=back
173		183
174	=cut	184	=cut
175		185
176	BEGIN {	186	BEGIN {
…		…
180	$msg .= "\n"	190	$msg .= "\n"
181	unless $msg =~ /\n$/;	191	unless $msg =~ /\n$/;
182		192
183	$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;
184		194
185	utf8::encode $msg;
186	LOG llevError, $msg;	195	LOG llevError, $msg;
187	};	196	};
188	}	197	}
189		198
190	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	199	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
265	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
266	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,
267	for example when the coroutine gets canceled), the lock is automatically	276	for example when the coroutine gets canceled), the lock is automatically
268	returned.	277	returned.
269		278
		279	Locks are not recursive, locking from the same coro twice results in a
		280	deadlocked coro.
		281
270	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
271	uses map_find and cf::map::load uses map_load).	283	uses map_find and cf::map::load uses map_load).
272		284
273	=item $locked = cf::lock_active $string	285	=item $locked = cf::lock_active $string
274		286
275	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.
276		288
277	=cut	289	=cut
278		290
279	our %LOCK;	291	our %LOCK;
		292	our %LOCKER;#d#
280		293
281	sub lock_wait($) {	294	sub lock_wait($) {
282	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#
283		301
284	# wait for lock, if any	302	# wait for lock, if any
285	while ($LOCK{$key}) {	303	while ($LOCK{$key}) {
286	push @{ $LOCK{$key} }, $Coro::current;	304	push @{ $LOCK{$key} }, $Coro::current;
287	Coro::schedule;	305	Coro::schedule;
…		…
293		311
294	# wait, to be sure we are not locked	312	# wait, to be sure we are not locked
295	lock_wait $key;	313	lock_wait $key;
296		314
297	$LOCK{$key} = [];	315	$LOCK{$key} = [];
		316	$LOCKER{$key} = $Coro::current;#d#
298		317
299	Coro::guard {	318	Coro::guard {
		319	delete $LOCKER{$key};#d#
300	# wake up all waiters, to be on the safe side	320	# wake up all waiters, to be on the safe side
301	$_->ready for @{ delete $LOCK{$key} };	321	$_->ready for @{ delete $LOCK{$key} };
302	}	322	}
303	}	323	}
304		324
…		…
314	my $guard = Coro::guard {	334	my $guard = Coro::guard {
315	$TICK_WATCHER->start;	335	$TICK_WATCHER->start;
316	};	336	};
317	$TICK_WATCHER->stop;	337	$TICK_WATCHER->stop;
318	$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;
319	}	395	}
320		396
321	=item cf::async { BLOCK }	397	=item cf::async { BLOCK }
322		398
323	Currently the same as Coro::async_pool, meaning you cannot use	399	Currently the same as Coro::async_pool, meaning you cannot use
…		…
410	Coro::Storable. May, of course, block. Note that the executed sub may	486	Coro::Storable. May, of course, block. Note that the executed sub may
411	never block itself or use any form of Event handling.	487	never block itself or use any form of Event handling.
412		488
413	=cut	489	=cut
414		490
415	sub _store_scalar {
416	open my $fh, ">", \my $buf
417	or die "fork_call: cannot open fh-to-buf in child : $!";
418	Storable::store_fd $_[0], $fh;
419	close $fh;
420
421	$buf
422	}
423
424	sub fork_call(&@) {	491	sub fork_call(&@) {
425	my ($cb, @args) = @_;	492	my ($cb, @args) = @_;
426		493
427	# 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,
428	# or die "socketpair: $!";	495	# otherwise perl prematurely frees the stuff :/
429	pipe my $fh1, my $fh2	496	# TODO: investigate and fix (likely this will be rather laborious)
430	or die "pipe: $!";
431		497
432	if (my $pid = fork) {	498	my @res = Coro::Util::fork_eval {
433	close $fh2;
434
435	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436	warn "pst<$res>" unless $res =~ /^pst/;
437	$res = Coro::Storable::thaw $res;
438
439	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
440
441	Carp::confess $$res unless "ARRAY" eq ref $res;
442
443	return wantarray ? @$res : $res->[-1];
444	} else {
445	reset_signals;	499	reset_signals;
446	local $SIG{__WARN__};	500	&$cb
447	local $SIG{__DIE__};	501	}, @args;
448	# just in case, this hack effectively disables event
449	# in the child. cleaner and slower would be canceling all watchers,
450	# but this works for the time being.
451	local $Coro::idle;
452	$Coro::current->prio (Coro::PRIO_MAX);
453		502
454	eval {	503	wantarray ? @res : $res[-1]
455	close $fh1;
456
457	my @res = eval { $cb->(@args) };
458
459	syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
460	close $fh2;
461	};
462
463	warn $@ if $@;
464	_exit 0;
465	}
466	}	504	}
467		505
468	=item $value = cf::db_get $family => $key	506	=item $value = cf::db_get $family => $key
469		507
470	Returns a single value from the environment database.	508	Returns a single value from the environment database.
…		…
472	=item cf::db_put $family => $key => $value	510	=item cf::db_put $family => $key => $value
473		511
474	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
475	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).
476		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
477	=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	}
478		538
479	our $DB;	539	our $DB;
480		540
481	sub db_init {	541	sub db_init {
482	unless ($DB) {
483	$DB = BDB::db_create $DB_ENV;
484
485	cf::sync_job {	542	cf::sync_job {
486	eval {	543	$DB \|\|= db_table "db";
487	$DB->set_flags (BDB::CHKSUM);
488
489	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
490	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
491	cf::cleanup "db_open(db): $!" if $!;
492	};
493	cf::cleanup "db_open(db): $@" if $@;
494	};
495	}	544	};
496	}	545	}
497		546
498	sub db_get($$) {	547	sub db_get($$) {
499	my $key = "$_[0]/$_[1]";	548	my $key = "$_[0]/$_[1]";
500		549
…		…
550	if (1) {	599	if (1) {
551	$md5 =	600	$md5 =
552	join "\x00",	601	join "\x00",
553	$processversion,	602	$processversion,
554	map {	603	map {
555	Coro::cede;	604	cf::cede_to_tick;
556	($src->[$_], Digest::MD5::md5_hex $data[$_])	605	($src->[$_], Digest::MD5::md5_hex $data[$_])
557	} 0.. $#$src;	606	} 0.. $#$src;
558		607
559		608
560	my $dbmd5 = db_get cache => "$id/md5";	609	my $dbmd5 = db_get cache => "$id/md5";
…		…
866	";	915	";
867	die if $@;	916	die if $@;
868	}	917	}
869		918
870	our $override;	919	our $override;
871	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?
872		921
873	sub override {	922	sub override {
874	$override = 1;	923	$override = 1;
875	@invoke_results = (@_);	924	@INVOKE_RESULTS = (@_);
876	}	925	}
877		926
878	sub do_invoke {	927	sub do_invoke {
879	my $event = shift;	928	my $event = shift;
880	my $callbacks = shift;	929	my $callbacks = shift;
881		930
882	@invoke_results = ();	931	@INVOKE_RESULTS = ();
883		932
884	local $override;	933	local $override;
885		934
886	for (@$callbacks) {	935	for (@$callbacks) {
887	eval { &{$_->[1]} };	936	eval { &{$_->[1]} };
…		…
904		953
905	Generate an object-specific event with the given arguments.	954	Generate an object-specific event with the given arguments.
906		955
907	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
908	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
909	results (if you must, access C<@cf::invoke_results> directly).	958	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910		959
911	=back	960	=back
912		961
913	=cut	962	=cut
914		963
915	#############################################################################	964	#############################################################################
916	# 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	}
917		977
918	sub reattach {	978	sub reattach {
919	# basically do the same as instantiate, without calling instantiate	979	# basically do the same as instantiate, without calling instantiate
920	my ($obj) = @_;	980	my ($obj) = @_;
921		981
…		…
968	sub object_freezer_save {	1028	sub object_freezer_save {
969	my ($filename, $rdata, $objs) = @_;	1029	my ($filename, $rdata, $objs) = @_;
970		1030
971	sync_job {	1031	sync_job {
972	if (length $$rdata) {	1032	if (length $$rdata) {
		1033	utf8::decode (my $decname = $filename);
973	warn sprintf "saving %s (%d,%d)\n",	1034	warn sprintf "saving %s (%d,%d)\n",
974	$filename, length $$rdata, scalar @$objs;	1035	$decname, length $$rdata, scalar @$objs;
975		1036
976	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1037	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
977	chmod SAVE_MODE, $fh;	1038	chmod SAVE_MODE, $fh;
978	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1039	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
979	aio_fsync $fh if $cf::USE_FSYNC;	1040	aio_fsync $fh if $cf::USE_FSYNC;
…		…
998	}	1059	}
999	} else {	1060	} else {
1000	aio_unlink $filename;	1061	aio_unlink $filename;
1001	aio_unlink "$filename.pst";	1062	aio_unlink "$filename.pst";
1002	}	1063	}
1003	}	1064	};
1004	}	1065	}
1005		1066
1006	sub object_freezer_as_string {	1067	sub object_freezer_as_string {
1007	my ($rdata, $objs) = @_;	1068	my ($rdata, $objs) = @_;
1008		1069
…		…
1020	or return;	1081	or return;
1021		1082
1022	unless (aio_stat "$filename.pst") {	1083	unless (aio_stat "$filename.pst") {
1023	(aio_load "$filename.pst", $av) >= 0	1084	(aio_load "$filename.pst", $av) >= 0
1024	or return;	1085	or return;
		1086
1025	$av = eval { (Storable::thaw $av)->{objs} };	1087	$av = eval { (Storable::thaw $av)->{objs} };
1026	}	1088	}
1027		1089
		1090	utf8::decode (my $decname = $filename);
1028	warn sprintf "loading %s (%d)\n",	1091	warn sprintf "loading %s (%d,%d)\n",
1029	$filename, length $data, scalar @{$av \|\| []};	1092	$decname, length $data, scalar @{$av \|\| []};
		1093
1030	return ($data, $av);	1094	($data, $av)
1031	}	1095	}
1032		1096
1033	=head2 COMMAND CALLBACKS	1097	=head2 COMMAND CALLBACKS
1034		1098
1035	=over 4	1099	=over 4
…		…
1108	my ($pl, $buf) = @_;	1172	my ($pl, $buf) = @_;
1109		1173
1110	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1174	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111		1175
1112	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
1113	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1184	if (my $cb = $EXTCMD{$type}) {
1114	if (my %reply = $cb->($pl, $msg)) {	1185	@reply = $cb->($pl, @payload);
1115	$pl->ext_reply ($msg->{msgid}, %reply);
1116	}
1117	}	1186	}
		1187
		1188	$pl->ext_reply ($reply, @reply)
		1189	if $reply;
		1190
1118	} else {	1191	} else {
1119	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1192	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120	}	1193	}
1121		1194
1122	cf::override;	1195	cf::override;
…		…
1212		1285
1213	=head3 cf::player	1286	=head3 cf::player
1214		1287
1215	=over 4	1288	=over 4
1216		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
1217	=item cf::player::find $login	1304	=item cf::player::find $login
1218		1305
1219	Returns the given player object, loading it if necessary (might block).	1306	Returns the given player object, loading it if necessary (might block).
1220		1307
1221	=cut	1308	=cut
…		…
1256	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1343	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1344	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1345	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259	aio_unlink +(playerdir $login) . "/$login.pl";	1346	aio_unlink +(playerdir $login) . "/$login.pl";
1260		1347
1261	my $pl = load_pl path $login	1348	my $f = new_from_file cf::object::thawer path $login
1262	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;
1263	$cf::PLAYER{$login} = $pl	1355	$cf::PLAYER{$login} = $pl
1264	}	1356	}
1265	}	1357	}
1266	}	1358	}
1267		1359
…		…
1277		1369
1278	aio_mkdir playerdir $pl, 0770;	1370	aio_mkdir playerdir $pl, 0770;
1279	$pl->{last_save} = $cf::RUNTIME;	1371	$pl->{last_save} = $cf::RUNTIME;
1280		1372
1281	$pl->save_pl ($path);	1373	$pl->save_pl ($path);
1282	Coro::cede;	1374	cf::cede_to_tick;
1283	}	1375	}
1284		1376
1285	sub new($) {	1377	sub new($) {
1286	my ($login) = @_;	1378	my ($login) = @_;
1287		1379
…		…
1291	$self->{deny_save} = 1;	1383	$self->{deny_save} = 1;
1292		1384
1293	$cf::PLAYER{$login} = $self;	1385	$cf::PLAYER{$login} = $self;
1294		1386
1295	$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 (@_);
1296	}	1398	}
1297		1399
1298	=item $pl->quit_character	1400	=item $pl->quit_character
1299		1401
1300	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
…		…
1355	or return [];	1457	or return [];
1356		1458
1357	my @logins;	1459	my @logins;
1358		1460
1359	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") {
1360	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1466	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361	aio_read $fh, 0, 512, my $buf, 0 or next;	1467	aio_read $fh, 0, 512, my $buf, 0 or next;
1362	$buf !~ /^password -------------$/m or next; # official not-valid tag	1468	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1469	}
1363		1470
1364	utf8::decode $login;	1471	utf8::decode $login;
1365	push @logins, $login;	1472	push @logins, $login;
1366	}	1473	}
1367		1474
…		…
1405	sub expand_cfpod {	1512	sub expand_cfpod {
1406	((my $self), (local $_)) = @_;	1513	((my $self), (local $_)) = @_;
1407		1514
1408	# escape & and <	1515	# escape & and <
1409	s/&/&/g;	1516	s/&/&/g;
1410	s/(?<![BIUGH])</</g;	1517	s/(?<![BIUGHT])</</g;
1411		1518
1412	# 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
1413		1520
1414	1 while	1521	1 while
1415	# replace B<>, I<>, U<> etc.	1522	# replace B<>, I<>, U<> etc.
1416	s/B<([^\>]*)>/<b>$1<\/b>/	1523	s/B<([^\>]*)>/<b>$1<\/b>/
1417	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1524	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1418	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1525	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1526	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1419	# replace G<male\|female> tags	1527	# replace G<male\|female> tags
1420	\|\| s{G<([^>\|])\\|([^>])>}{	1528	\|\| s{G<([^>\|])\\|([^>])>}{
1421	$self->gender ? $2 : $1	1529	$self->gender ? $2 : $1
1422	}ge	1530	}ge
1423	# replace H<hint text>	1531	# replace H<hint text>
…		…
1444	sub hintmode {	1552	sub hintmode {
1445	$_[0]{hintmode} = $_[1] if @_ > 1;	1553	$_[0]{hintmode} = $_[1] if @_ > 1;
1446	$_[0]{hintmode}	1554	$_[0]{hintmode}
1447	}	1555	}
1448		1556
1449	=item $player->ext_reply ($msgid, %msg)	1557	=item $player->ext_reply ($msgid, @msg)
1450		1558
1451	Sends an ext reply to the player.	1559	Sends an ext reply to the player.
1452		1560
1453	=cut	1561	=cut
1454		1562
1455	sub ext_reply($$%) {	1563	sub ext_reply($$@) {
1456	my ($self, $id, %msg) = @_;	1564	my ($self, $id, @msg) = @_;
1457		1565
1458	$msg{msgid} = $id;	1566	$self->ns->ext_reply ($id, @msg)
1459	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460	}	1567	}
1461		1568
1462	=item $player->ext_event ($type, %msg)	1569	=item $player->ext_msg ($type, @msg)
1463		1570
1464	Sends an ext event to the client.	1571	Sends an ext event to the client.
1465		1572
1466	=cut	1573	=cut
1467		1574
1468	sub ext_event($$%) {	1575	sub ext_msg($$@) {
1469	my ($self, $type, %msg) = @_;	1576	my ($self, $type, @msg) = @_;
1470		1577
1471	$self->ns->ext_event ($type, %msg);	1578	$self->ns->ext_msg ($type, @msg);
1472	}	1579	}
1473		1580
1474	=head3 cf::region	1581	=head3 cf::region
1475		1582
1476	=over 4	1583	=over 4
…		…
1692		1799
1693	sub load_header_from($) {	1800	sub load_header_from($) {
1694	my ($self, $path) = @_;	1801	my ($self, $path) = @_;
1695		1802
1696	utf8::encode $path;	1803	utf8::encode $path;
1697	#aio_open $path, O_RDONLY, 0	1804	my $f = new_from_file cf::object::thawer $path
1698	# or return;
1699
1700	$self->_load_header ($path)
1701	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;
1702		1812
1703	$self->{load_path} = $path;	1813	$self->{load_path} = $path;
1704		1814
1705	1	1815	1
1706	}	1816	}
…		…
1760	sub find {	1870	sub find {
1761	my ($path, $origin) = @_;	1871	my ($path, $origin) = @_;
1762		1872
1763	$path = normalise $path, $origin && $origin->path;	1873	$path = normalise $path, $origin && $origin->path;
1764		1874
		1875	cf::lock_wait "map_data:$path";#d#remove
1765	cf::lock_wait "map_find:$path";	1876	cf::lock_wait "map_find:$path";
1766		1877
1767	$cf::MAP{$path} \|\| do {	1878	$cf::MAP{$path} \|\| do {
1768	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
1769	my $map = new_from_path cf::map $path	1882	my $map = new_from_path cf::map $path
1770	or return;	1883	or return;
1771		1884
1772	$map->{last_save} = $cf::RUNTIME;	1885	$map->{last_save} = $cf::RUNTIME;
1773		1886
…		…
1775	or return;	1888	or return;
1776		1889
1777	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1890	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778	# doing this can freeze the server in a sync job, obviously	1891	# doing this can freeze the server in a sync job, obviously
1779	#$cf::WAIT_FOR_TICK->wait;	1892	#$cf::WAIT_FOR_TICK->wait;
		1893	undef $guard1;
		1894	undef $guard2;
1780	$map->reset;	1895	$map->reset;
1781	undef $guard;
1782	return find $path;	1896	return find $path;
1783	}	1897	}
1784		1898
1785	$cf::MAP{$path} = $map	1899	$cf::MAP{$path} = $map
1786	}	1900	}
…		…
1795	local $self->{deny_reset} = 1; # loading can take a long time	1909	local $self->{deny_reset} = 1; # loading can take a long time
1796		1910
1797	my $path = $self->{path};	1911	my $path = $self->{path};
1798		1912
1799	{	1913	{
1800	my $guard = cf::lock_acquire "map_load:$path";	1914	my $guard = cf::lock_acquire "map_data:$path";
1801		1915
		1916	return unless $self->valid;
1802	return if $self->in_memory != cf::MAP_SWAPPED;	1917	return unless $self->in_memory == cf::MAP_SWAPPED;
1803		1918
1804	$self->in_memory (cf::MAP_LOADING);	1919	$self->in_memory (cf::MAP_LOADING);
1805		1920
1806	$self->alloc;	1921	$self->alloc;
1807		1922
1808	$self->pre_load;	1923	$self->pre_load;
1809	Coro::cede;	1924	cf::cede_to_tick;
1810		1925
		1926	my $f = new_from_file cf::object::thawer $self->{load_path};
		1927	$f->skip_block;
1811	$self->_load_objects ($self->{load_path}, 1)	1928	$self->_load_objects ($f)
1812	or return;	1929	or return;
1813		1930
1814	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1931	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1815	if delete $self->{load_original};	1932	if delete $self->{load_original};
1816		1933
1817	if (my $uniq = $self->uniq_path) {	1934	if (my $uniq = $self->uniq_path) {
1818	utf8::encode $uniq;	1935	utf8::encode $uniq;
1819	if (aio_open $uniq, O_RDONLY, 0) {	1936	unless (aio_stat $uniq) {
		1937	if (my $f = new_from_file cf::object::thawer $uniq) {
1820	$self->clear_unique_items;	1938	$self->clear_unique_items;
1821	$self->_load_objects ($uniq, 0);	1939	$self->_load_objects ($f);
		1940	$f->resolve_delayed_derefs;
		1941	}
1822	}	1942	}
1823	}	1943	}
1824		1944
1825	Coro::cede;	1945	$f->resolve_delayed_derefs;
		1946
		1947	cf::cede_to_tick;
1826	# now do the right thing for maps	1948	# now do the right thing for maps
1827	$self->link_multipart_objects;	1949	$self->link_multipart_objects;
1828	$self->difficulty ($self->estimate_difficulty)	1950	$self->difficulty ($self->estimate_difficulty)
1829	unless $self->difficulty;	1951	unless $self->difficulty;
1830	Coro::cede;	1952	cf::cede_to_tick;
1831		1953
1832	unless ($self->{deny_activate}) {	1954	unless ($self->{deny_activate}) {
1833	$self->decay_objects;	1955	$self->decay_objects;
1834	$self->fix_auto_apply;	1956	$self->fix_auto_apply;
1835	$self->update_buttons;	1957	$self->update_buttons;
1836	Coro::cede;	1958	cf::cede_to_tick;
1837	$self->set_darkness_map;	1959	$self->set_darkness_map;
1838	Coro::cede;	1960	cf::cede_to_tick;
1839	$self->activate;	1961	$self->activate;
1840	}	1962	}
		1963
		1964	$self->{last_save} = $cf::RUNTIME;
		1965	$self->last_access ($cf::RUNTIME);
1841		1966
1842	$self->in_memory (cf::MAP_IN_MEMORY);	1967	$self->in_memory (cf::MAP_IN_MEMORY);
1843	}	1968	}
1844		1969
1845	$self->post_load;	1970	$self->post_load;
…		…
1856		1981
1857	$self	1982	$self
1858	}	1983	}
1859		1984
1860	# 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
1861	sub load_diag {	1986	sub load_neighbours {
1862	my ($map) = @_;	1987	my ($map) = @_;
1863		1988
1864	my @diag; # diagonal neighbours	1989	my @neigh; # diagonal neighbours
1865		1990
1866	for (0 .. 3) {	1991	for (0 .. 3) {
1867	my $neigh = $map->tile_path ($_)	1992	my $neigh = $map->tile_path ($_)
1868	or next;	1993	or next;
1869	$neigh = find $neigh, $map	1994	$neigh = find $neigh, $map
1870	or next;	1995	or next;
1871	$neigh->load;	1996	$neigh->load;
1872		1997
		1998	push @neigh,
1873	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	1999	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1874	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2000	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1875	}	2001	}
1876		2002
1877	for (@diag) {	2003	for (grep defined $_->[0], @neigh) {
		2004	my ($path, $origin) = @$_;
1878	my $neigh = find @$_	2005	my $neigh = find $path, $origin
1879	or next;	2006	or next;
1880	$neigh->load;	2007	$neigh->load;
1881	}	2008	}
1882	}	2009	}
1883		2010
…		…
1888	}	2015	}
1889		2016
1890	sub do_load_sync {	2017	sub do_load_sync {
1891	my ($map) = @_;	2018	my ($map) = @_;
1892		2019
		2020	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2021	if $Coro::current == $Coro::main;
		2022
1893	cf::sync_job { $map->load };	2023	cf::sync_job { $map->load };
1894	}	2024	}
1895		2025
1896	our %MAP_PREFETCH;	2026	our %MAP_PREFETCH;
1897	our $MAP_PREFETCHER = undef;	2027	our $MAP_PREFETCHER = undef;
1898		2028
1899	sub find_async {	2029	sub find_async {
1900	my ($path, $origin) = @_;	2030	my ($path, $origin, $load) = @_;
1901		2031
1902	$path = normalise $path, $origin && $origin->{path};	2032	$path = normalise $path, $origin && $origin->{path};
1903		2033
1904	if (my $map = $cf::MAP{$path}) {	2034	if (my $map = $cf::MAP{$path}) {
1905	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2035	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1906	}	2036	}
1907		2037
1908	undef $MAP_PREFETCH{$path};	2038	$MAP_PREFETCH{$path} \|= $load;
		2039
1909	$MAP_PREFETCHER \|\|= cf::async {	2040	$MAP_PREFETCHER \|\|= cf::async {
1910	while (%MAP_PREFETCH) {	2041	while (%MAP_PREFETCH) {
1911	for my $path (keys %MAP_PREFETCH) {	2042	while (my ($k, $v) = each %MAP_PREFETCH) {
1912	if (my $map = find $path) {	2043	if (my $map = find $k) {
1913	$map->load;	2044	$map->load if $v;
1914	}	2045	}
1915		2046
1916	delete $MAP_PREFETCH{$path};	2047	delete $MAP_PREFETCH{$k};
1917	}	2048	}
1918	}	2049	}
1919	undef $MAP_PREFETCHER;	2050	undef $MAP_PREFETCHER;
1920	};	2051	};
1921	$MAP_PREFETCHER->prio (6);	2052	$MAP_PREFETCHER->prio (6);
…		…
1924	}	2055	}
1925		2056
1926	sub save {	2057	sub save {
1927	my ($self) = @_;	2058	my ($self) = @_;
1928		2059
1929	my $lock = cf::lock_acquire "map_data:" . $self->path;	2060	my $lock = cf::lock_acquire "map_data:$self->{path}";
1930		2061
1931	$self->{last_save} = $cf::RUNTIME;	2062	$self->{last_save} = $cf::RUNTIME;
1932		2063
1933	return unless $self->dirty;	2064	return unless $self->dirty;
1934		2065
…		…
1957	my ($self) = @_;	2088	my ($self) = @_;
1958		2089
1959	# save first because save cedes	2090	# save first because save cedes
1960	$self->save;	2091	$self->save;
1961		2092
1962	my $lock = cf::lock_acquire "map_data:" . $self->path;	2093	my $lock = cf::lock_acquire "map_data:$self->{path}";
1963		2094
1964	return if $self->players;	2095	return if $self->players;
1965	return if $self->in_memory != cf::MAP_IN_MEMORY;	2096	return if $self->in_memory != cf::MAP_IN_MEMORY;
1966	return if $self->{deny_save};	2097	return if $self->{deny_save};
1967		2098
		2099	$self->in_memory (cf::MAP_SWAPPED);
		2100
		2101	$self->deactivate;
		2102	$_->clear_links_to ($self) for values %cf::MAP;
1968	$self->clear;	2103	$self->clear;
1969	$self->in_memory (cf::MAP_SWAPPED);
1970	}	2104	}
1971		2105
1972	sub reset_at {	2106	sub reset_at {
1973	my ($self) = @_;	2107	my ($self) = @_;
1974		2108
…		…
2006	if $uniq;	2140	if $uniq;
2007	}	2141	}
2008		2142
2009	delete $cf::MAP{$self->path};	2143	delete $cf::MAP{$self->path};
2010		2144
		2145	$self->deactivate;
		2146	$_->clear_links_to ($self) for values %cf::MAP;
2011	$self->clear;	2147	$self->clear;
2012
2013	$_->clear_links_to ($self) for values %cf::MAP;
2014		2148
2015	$self->unlink_save;	2149	$self->unlink_save;
2016	$self->destroy;	2150	$self->destroy;
2017	}	2151	}
2018		2152
2019	my $nuke_counter = "aaaa";	2153	my $nuke_counter = "aaaa";
2020		2154
2021	sub nuke {	2155	sub nuke {
2022	my ($self) = @_;	2156	my ($self) = @_;
2023		2157
		2158	{
		2159	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2160
2024	delete $cf::MAP{$self->path};	2161	delete $cf::MAP{$self->path};
2025		2162
2026	$self->unlink_save;	2163	$self->unlink_save;
2027		2164
2028	bless $self, "cf::map";	2165	bless $self, "cf::map";
2029	delete $self->{deny_reset};	2166	delete $self->{deny_reset};
2030	$self->{deny_save} = 1;	2167	$self->{deny_save} = 1;
2031	$self->reset_timeout (1);	2168	$self->reset_timeout (1);
2032	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2169	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033		2170
2034	$cf::MAP{$self->path} = $self;	2171	$cf::MAP{$self->path} = $self;
		2172	}
2035		2173
2036	$self->reset; # polite request, might not happen	2174	$self->reset; # polite request, might not happen
2037	}	2175	}
2038		2176
2039	=item $maps = cf::map::tmp_maps	2177	=item $maps = cf::map::tmp_maps
…		…
2115		2253
2116	sub inv_recursive {	2254	sub inv_recursive {
2117	inv_recursive_ inv $_[0]	2255	inv_recursive_ inv $_[0]
2118	}	2256	}
2119		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
2120	package cf;	2289	package cf;
2121		2290
2122	=back	2291	=back
2123		2292
2124	=head3 cf::object::player	2293	=head3 cf::object::player
…		…
2146		2315
2147	} else {	2316	} else {
2148	my $pl = $self->contr;	2317	my $pl = $self->contr;
2149		2318
2150	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2319	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151	my $diag = $pl->{npc_dialog};	2320	my $dialog = $pl->{npc_dialog};
2152	$diag->{pl}->ext_reply (	2321	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153	$diag->{id},
2154	msgtype => "reply",
2155	msg => $diag->{pl}->expand_cfpod ($msg),
2156	add_topics => []
2157	);
2158		2322
2159	} else {	2323	} else {
2160	$msg = $npc->name . " says: $msg" if $npc;	2324	$msg = $npc->name . " says: $msg" if $npc;
2161	$self->message ($msg, $flags);	2325	$self->message ($msg, $flags);
2162	}	2326	}
2163	}	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 (@_);
2164	}	2338	}
2165		2339
2166	=item $player_object->may ("access")	2340	=item $player_object->may ("access")
2167		2341
2168	Returns wether the given player is authorized to access resource "access"	2342	Returns wether the given player is authorized to access resource "access"
…		…
2247	# use -1 or undef as default coordinates, not 0, 0	2421	# use -1 or undef as default coordinates, not 0, 0
2248	($x, $y) = ($map->enter_x, $map->enter_y)	2422	($x, $y) = ($map->enter_x, $map->enter_y)
2249	if $x <=0 && $y <= 0;	2423	if $x <=0 && $y <= 0;
2250		2424
2251	$map->load;	2425	$map->load;
2252	$map->load_diag;	2426	$map->load_neighbours;
2253		2427
2254	return unless $self->contr->active;	2428	return unless $self->contr->active;
2255	$self->activate_recursive;	2429	$self->activate_recursive;
2256		2430
2257	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2431	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
…		…
2277	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2451	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2278		2452
2279	$self->enter_link;	2453	$self->enter_link;
2280		2454
2281	(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
2282	my $map = eval {	2475	my $map = eval {
2283	my $map = cf::map::find $path;	2476	my $map = defined $path ? cf::map::find $path : undef;
2284		2477
2285	if ($map) {	2478	if ($map) {
2286	$map = $map->customise_for ($self);	2479	$map = $map->customise_for ($self);
2287	$map = $check->($map) if $check && $map;	2480	$map = $check->($map) if $check && $map;
2288	} else {	2481	} else {
2289	$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);
2290	}	2483	}
2291		2484
2292	$map	2485	$map
2293	};	2486	};
2294		2487
…		…
2419		2612
2420	utf8::encode $text;	2613	utf8::encode $text;
2421	$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);
2422	}	2615	}
2423		2616
2424	=item $client->send_msg ($color, $type, $msg, [extra...])	2617	=item $client->send_msg ($channel, $msg, $color, [extra...])
2425		2618
2426	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
2427	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
2428	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
2429	the message unless the client supports the msg packet.	2622	the message unless the client supports the msg packet.
2430		2623
2431	=cut	2624	=cut
2432		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
2433	sub cf::client::send_msg {	2641	sub cf::client::send_msg {
2434	my ($self, $color, $type, $msg, @extra) = @_;	2642	my ($self, $channel, $msg, $color, @extra) = @_;
2435		2643
2436	$msg = $self->pl->expand_cfpod ($msg);	2644	$msg = $self->pl->expand_cfpod ($msg);
2437		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
2438	return unless @extra \|\| length $msg;	2662	return unless @extra \|\| length $msg;
2439		2663
2440	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
2441	$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]));
2442	} else {	2671	} else {
2443	# replace some tags by gcfclient-compatible ones
2444	for ($msg) {
2445	1 while
2446	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2447	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2448	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2449	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2450	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2451	}
2452
2453	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
2454	if (0 && $msg =~ /\[/) {	2687	if (0 && $msg =~ /\[/) {
		2688	# COMMAND/INFO
2455	$self->send_packet ("drawextinfo $color 4 0 $msg")	2689	$self->send_packet ("drawextinfo $color 10 8 $msg")
2456	} else {	2690	} else {
2457	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2691	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2458	$self->send_packet ("drawinfo $color $msg")	2692	$self->send_packet ("drawinfo $color $msg")
2459	}	2693	}
2460	}	2694	}
2461	}	2695	}
2462	}	2696	}
2463		2697
2464	=item $client->ext_event ($type, %msg)	2698	=item $client->ext_msg ($type, @msg)
2465		2699
2466	Sends an ext event to the client.	2700	Sends an ext event to the client.
2467		2701
2468	=cut	2702	=cut
2469		2703
2470	sub cf::client::ext_event($$%) {	2704	sub cf::client::ext_msg($$@) {
2471	my ($self, $type, %msg) = @_;	2705	my ($self, $type, @msg) = @_;
2472		2706
2473	return unless $self->extcmd;	2707	if ($self->extcmd == 2) {
2474		2708	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2709	} elsif ($self->extcmd == 1) { # TODO: remove
2475	$msg{msgtype} = "event_$type";	2710	push @msg, msgtype => "event_$type";
2476	$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	}
2477	}	2731	}
2478		2732
2479	=item $success = $client->query ($flags, "text", \&cb)	2733	=item $success = $client->query ($flags, "text", \&cb)
2480		2734
2481	Queues a query to the client, calling the given callback with	2735	Queues a query to the client, calling the given callback with
…		…
2536	my ($ns, $buf) = @_;	2790	my ($ns, $buf) = @_;
2537		2791
2538	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2792	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2539		2793
2540	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
2541	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2802	if (my $cb = $EXTICMD{$type}) {
2542	if (my %reply = $cb->($ns, $msg)) {	2803	@reply = $cb->($ns, @payload);
2543	$reply{msgid} = $msg->{msgid};
2544	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2545	}
2546	}	2804	}
		2805
		2806	$ns->ext_reply ($reply, @reply)
		2807	if $reply;
		2808
2547	} else {	2809	} else {
2548	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";
2549	}	2811	}
2550		2812
2551	cf::override;	2813	cf::override;
…		…
2598	our $safe = new Safe "safe";	2860	our $safe = new Safe "safe";
2599	our $safe_hole = new Safe::Hole;	2861	our $safe_hole = new Safe::Hole;
2600		2862
2601	$SIG{FPE} = 'IGNORE';	2863	$SIG{FPE} = 'IGNORE';
2602		2864
2603	$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	));
2604		2870
2605	# here we export the classes and methods available to script code	2871	# here we export the classes and methods available to script code
2606		2872
2607	=pod	2873	=pod
2608		2874
2609	The following functions and methods are available within a safe environment:	2875	The following functions and methods are available within a safe environment:
2610		2876
2611	cf::object	2877	cf::object
2612	contr pay_amount pay_player map x y force_find force_add	2878	contr pay_amount pay_player map x y force_find force_add
2613	insert remove	2879	insert remove name archname title slaying race decrease_ob_nr
2614		2880
2615	cf::object::player	2881	cf::object::player
2616	player	2882	player
2617		2883
2618	cf::player	2884	cf::player
…		…
2623		2889
2624	=cut	2890	=cut
2625		2891
2626	for (	2892	for (
2627	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	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
2628	insert remove)],	2895	decrease_ob_nr)],
2629	["cf::object::player" => qw(player)],	2896	["cf::object::player" => qw(player)],
2630	["cf::player" => qw(peaceful)],	2897	["cf::player" => qw(peaceful)],
2631	["cf::map" => qw(trigger)],	2898	["cf::map" => qw(trigger)],
2632	) {	2899	) {
2633	no strict 'refs';	2900	no strict 'refs';
…		…
2709	# the server's init and main functions	2976	# the server's init and main functions
2710		2977
2711	sub load_facedata($) {	2978	sub load_facedata($) {
2712	my ($path) = @_;	2979	my ($path) = @_;
2713		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
2714	warn "loading facedata from $path\n";	2987	warn "loading facedata from $path\n";
2715		2988
2716	my $facedata;	2989	my $facedata;
2717	0 < aio_load $path, $facedata	2990	0 < aio_load $path, $facedata
2718	or die "$path: $!";	2991	or die "$path: $!";
2719		2992
2720	$facedata = Coro::Storable::thaw $facedata;	2993	$facedata = Coro::Storable::thaw $facedata;
2721		2994
2722	$facedata->{version} == 2	2995	$facedata->{version} == 2
2723	or cf::cleanup "$path: version mismatch, cannot proceed.";	2996	or cf::cleanup "$path: version mismatch, cannot proceed.";
		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;
2724		3004
2725	{	3005	{
2726	my $faces = $facedata->{faceinfo};	3006	my $faces = $facedata->{faceinfo};
2727		3007
2728	while (my ($face, $info) = each %$faces) {	3008	while (my ($face, $info) = each %$faces) {
2729	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3009	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2730	cf::face::set_visibility $idx, $info->{visibility};	3010	cf::face::set_visibility $idx, $info->{visibility};
2731	cf::face::set_magicmap $idx, $info->{magicmap};	3011	cf::face::set_magicmap $idx, $info->{magicmap};
2732	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3012	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2733	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3013	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2734		3014
2735	cf::cede_to_tick;	3015	cf::cede_to_tick;
2736	}	3016	}
2737		3017
2738	while (my ($face, $info) = each %$faces) {	3018	while (my ($face, $info) = each %$faces) {
…		…
2763		3043
2764	{	3044	{
2765	# TODO: for gcfclient pleasure, we should give resources	3045	# TODO: for gcfclient pleasure, we should give resources
2766	# that gcfclient doesn't grok a >10000 face index.	3046	# that gcfclient doesn't grok a >10000 face index.
2767	my $res = $facedata->{resource};	3047	my $res = $facedata->{resource};
2768	my $enc = JSON::XS->new->utf8->canonical;	3048
		3049	my $soundconf = delete $res->{"res/sound.conf"};
2769		3050
2770	while (my ($name, $info) = each %$res) {	3051	while (my ($name, $info) = each %$res) {
2771	my $meta = $enc->encode ({
2772	name => $name,
2773	type => $info->{type},
2774	copyright => $info->{copyright}, #TODO#
2775	});
2776
2777	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3052	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3053	my $data;
2778		3054
2779	if ($name =~ /\.jpg$/) {	3055	if ($info->{type} & 1) {
2780	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack	3056	# prepend meta info
2781	cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack	3057
		3058	my $meta = $enc->encode ({
		3059	name => $name,
		3060	%{ $info->{meta} \|\| {} },
		3061	});
		3062
		3063	$data = pack "(w/a)", $meta, $info->{data};
2782	} else {	3064	} else {
2783	my $data = pack "(w/a)", $meta, $info->{data};	3065	$data = $info->{data};
2784	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2785
2786	cf::face::set_type $idx, 1;
2787	cf::face::set_data $idx, 0, $data, $chk;
2788	}	3066	}
2789		3067
		3068	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3069	cf::face::set_type $idx, $info->{type};
		3070
2790	cf::cede_to_tick;	3071	cf::cede_to_tick;
2791	}	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	}
2792	}	3091	}
2793		3092
2794	1	3093	1
2795	}	3094	}
2796		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
2797	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
2798	load_resource_file "$MAPDIR/regions"	3109	load_resource_file "$MAPDIR/regions"
2799	or die "unable to load regions file\n";	3110	or die "unable to load regions file\n";
2800		3111
2801	for (cf::region::list) {	3112	for (cf::region::list) {
2802	$_->{match} = qr/$_->{match}/	3113	$_->{match} = qr/$_->{match}/
…		…
2838		3149
2839	sub init {	3150	sub init {
2840	reload_resources;	3151	reload_resources;
2841	}	3152	}
2842		3153
2843	sub cfg_load {	3154	sub reload_config {
2844	open my $fh, "<:utf8", "$CONFDIR/config"	3155	open my $fh, "<:utf8", "$CONFDIR/config"
2845	or return;	3156	or return;
2846		3157
2847	local $/;	3158	local $/;
2848	*CFG = YAML::Syck::Load <$fh>;	3159	*CFG = YAML::Syck::Load <$fh>;
…		…
2868	(async {	3179	(async {
2869	Event::one_event;	3180	Event::one_event;
2870	})->prio (Coro::PRIO_MAX);	3181	})->prio (Coro::PRIO_MAX);
2871	};	3182	};
2872		3183
2873	cfg_load;	3184	reload_config;
2874	db_init;	3185	db_init;
2875	load_extensions;	3186	load_extensions;
2876		3187
2877	$TICK_WATCHER->start;	3188	$TICK_WATCHER->start;
2878	Event::loop;	3189	Event::loop;
…		…
3071	warn "reloading cf.pm";	3382	warn "reloading cf.pm";
3072	require cf;	3383	require cf;
3073	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3384	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3074		3385
3075	warn "loading config and database again";	3386	warn "loading config and database again";
3076	cf::cfg_load;	3387	cf::reload_config;
3077		3388
3078	warn "loading extensions";	3389	warn "loading extensions";
3079	cf::load_extensions;	3390	cf::load_extensions;
3080		3391
3081	warn "reattaching attachments to objects/players";	3392	warn "reattaching attachments to objects/players";
…		…
3146	my $signal = new Coro::Signal;	3457	my $signal = new Coro::Signal;
3147	push @WAIT_FOR_TICK_BEGIN, $signal;	3458	push @WAIT_FOR_TICK_BEGIN, $signal;
3148	$signal->wait;	3459	$signal->wait;
3149	}	3460	}
3150		3461
3151	my $min = 1e6;#d#
3152	my $avg = 10;
3153	$TICK_WATCHER = Event->timer (	3462	$TICK_WATCHER = Event->timer (
3154	reentrant => 0,	3463	reentrant => 0,
3155	parked => 1,	3464	parked => 1,
3156	prio => 0,	3465	prio => 0,
3157	at => $NEXT_TICK \|\| $TICK,	3466	at => $NEXT_TICK \|\| $TICK,
…		…
3165		3474
3166	$NOW = $tick_start = Event::time;	3475	$NOW = $tick_start = Event::time;
3167		3476
3168	cf::server_tick; # one server iteration	3477	cf::server_tick; # one server iteration
3169		3478
3170	0 && sync_job {#d#
3171	for(1..10) {
3172	my $t = Event::time;
3173	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3174	or die;
3175
3176	$map->width (50);
3177	$map->height (50);
3178	$map->alloc;
3179	$map->_load_objects ("/tmp/x.map", 1);
3180	my $t = Event::time - $t;
3181
3182	#next unless $t < 0.0013;#d#
3183	if ($t < $min) {
3184	$min = $t;
3185	}
3186	$avg = $avg * 0.99 + $t * 0.01;
3187	}
3188	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3189	exit 0;
3190	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3191	};
3192
3193	$RUNTIME += $TICK;	3479	$RUNTIME += $TICK;
3194	$NEXT_TICK += $TICK;	3480	$NEXT_TICK += $TICK;
3195		3481
3196	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3482	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3197	$NEXT_RUNTIME_WRITE = $NOW + 10;	3483	$NEXT_RUNTIME_WRITE = $NOW + 10;
…		…
3199	write_runtime	3485	write_runtime
3200	or warn "ERROR: unable to write runtime file: $!";	3486	or warn "ERROR: unable to write runtime file: $!";
3201	};	3487	};
3202	}	3488	}
3203		3489
3204	# my $AFTER = Event::time;
3205	# warn $AFTER - $NOW;#d#
3206
3207	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3490	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3208	$sig->send;	3491	$sig->send;
3209	}	3492	}
3210	while (my $sig = shift @WAIT_FOR_TICK) {	3493	while (my $sig = shift @WAIT_FOR_TICK) {
3211	$sig->send;	3494	$sig->send;
…		…
3221		3504
3222	$LOAD = ($NOW - $tick_start) / $TICK;	3505	$LOAD = ($NOW - $tick_start) / $TICK;
3223	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3506	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3224		3507
3225	_post_tick;	3508	_post_tick;
3226
3227
3228	},	3509	},
3229	);	3510	);
3230		3511
3231	{	3512	{
		3513	BDB::min_parallel 8;
3232	BDB::max_poll_time $TICK * 0.1;	3514	BDB::max_poll_time $TICK * 0.1;
3233	$BDB_POLL_WATCHER = Event->io (	3515	$BDB_POLL_WATCHER = Event->io (
3234	reentrant => 0,	3516	reentrant => 0,
3235	fd => BDB::poll_fileno,	3517	fd => BDB::poll_fileno,
3236	poll => 'r',	3518	poll => 'r',
3237	prio => 0,	3519	prio => 0,
3238	data => WF_AUTOCANCEL,	3520	data => WF_AUTOCANCEL,
3239	cb => \&BDB::poll_cb,	3521	cb => \&BDB::poll_cb,
3240	);	3522	);
3241	BDB::min_parallel 8;
3242		3523
3243	BDB::set_sync_prepare {	3524	BDB::set_sync_prepare {
3244	my $status;	3525	my $status;
3245	my $current = $Coro::current;	3526	my $current = $Coro::current;
3246	(	3527	(
…		…
3255	)	3536	)
3256	};	3537	};
3257		3538
3258	unless ($DB_ENV) {	3539	unless ($DB_ENV) {
3259	$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);
3260		3545
3261	cf::sync_job {	3546	cf::sync_job {
3262	eval {	3547	eval {
3263	BDB::db_env_open	3548	BDB::db_env_open
3264	$DB_ENV,	3549	$DB_ENV,
…		…
3266	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
3267	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3552	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3268	0666;	3553	0666;
3269		3554
3270	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3555	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3271
3272	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
3273	$DB_ENV->set_lk_detect;
3274	};	3556	};
3275		3557
3276	cf::cleanup "db_env_open(db): $@" if $@;	3558	cf::cleanup "db_env_open(db): $@" if $@;
3277	};	3559	};
3278	}	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	);
3279	}	3592	}
3280		3593
3281	{	3594	{
3282	IO::AIO::min_parallel 8;	3595	IO::AIO::min_parallel 8;
3283		3596

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.309 by elmex, Mon Jul 16 15:27: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.309 by elmex, Mon Jul 16 15:27:06 2007 UTC vs.
Revision 1.373 by root, Sat Sep 15 15:58:06 2007 UTC