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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.310 by elmex, Mon Jul 16 15:43:49 2007 UTC vs.
Revision 1.374 by root, Wed Sep 19 22:07:16 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
…		…
186	$msg .= "\n"	190	$msg .= "\n"
187	unless $msg =~ /\n$/;	191	unless $msg =~ /\n$/;
188		192
189	$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;
190		194
191	utf8::encode $msg;
192	LOG llevError, $msg;	195	LOG llevError, $msg;
193	};	196	};
194	}	197	}
195		198
196	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	199	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
271	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
272	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,
273	for example when the coroutine gets canceled), the lock is automatically	276	for example when the coroutine gets canceled), the lock is automatically
274	returned.	277	returned.
275		278
		279	Locks are not recursive, locking from the same coro twice results in a
		280	deadlocked coro.
		281
276	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
277	uses map_find and cf::map::load uses map_load).	283	uses map_find and cf::map::load uses map_load).
278		284
279	=item $locked = cf::lock_active $string	285	=item $locked = cf::lock_active $string
280		286
281	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.
282		288
283	=cut	289	=cut
284		290
285	our %LOCK;	291	our %LOCK;
		292	our %LOCKER;#d#
286		293
287	sub lock_wait($) {	294	sub lock_wait($) {
288	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#
289		301
290	# wait for lock, if any	302	# wait for lock, if any
291	while ($LOCK{$key}) {	303	while ($LOCK{$key}) {
292	push @{ $LOCK{$key} }, $Coro::current;	304	push @{ $LOCK{$key} }, $Coro::current;
293	Coro::schedule;	305	Coro::schedule;
…		…
299		311
300	# wait, to be sure we are not locked	312	# wait, to be sure we are not locked
301	lock_wait $key;	313	lock_wait $key;
302		314
303	$LOCK{$key} = [];	315	$LOCK{$key} = [];
		316	$LOCKER{$key} = $Coro::current;#d#
304		317
305	Coro::guard {	318	Coro::guard {
		319	delete $LOCKER{$key};#d#
306	# wake up all waiters, to be on the safe side	320	# wake up all waiters, to be on the safe side
307	$_->ready for @{ delete $LOCK{$key} };	321	$_->ready for @{ delete $LOCK{$key} };
308	}	322	}
309	}	323	}
310		324
…		…
320	my $guard = Coro::guard {	334	my $guard = Coro::guard {
321	$TICK_WATCHER->start;	335	$TICK_WATCHER->start;
322	};	336	};
323	$TICK_WATCHER->stop;	337	$TICK_WATCHER->stop;
324	$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	$Coro::current->desc ("timeslot manager");
		360
		361	my $signal = new Coro::Signal;
		362
		363	while () {
		364	next_job:
		365	my $avail = cf::till_tick;
		366	if ($avail > 0.01) {
		367	for (0 .. $#SLOT_QUEUE) {
		368	if ($SLOT_QUEUE[$_][0] < $avail) {
		369	my $job = splice @SLOT_QUEUE, $_, 1, ();
		370	$job->[2]->send;
		371	Coro::cede;
		372	goto next_job;
		373	}
		374	}
		375	}
		376
		377	if (@SLOT_QUEUE) {
		378	# we do not use wait_For_tick() as it returns immediately when tick is inactive
		379	push @cf::WAIT_FOR_TICK, $signal;
		380	$signal->wait;
		381	} else {
		382	Coro::schedule;
		383	}
		384	}
		385	};
		386
		387	sub get_slot($;$$) {
		388	my ($time, $pri, $name) = @_;
		389
		390	$time = $TICK * .6 if $time > $TICK * .6;
		391	my $sig = new Coro::Signal;
		392
		393	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		394	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		395	$SLOT_QUEUE->ready;
		396	$sig->wait;
325	}	397	}
326		398
327	=item cf::async { BLOCK }	399	=item cf::async { BLOCK }
328		400
329	Currently the same as Coro::async_pool, meaning you cannot use	401	Currently the same as Coro::async_pool, meaning you cannot use
…		…
363		435
364	my $busy = 1;	436	my $busy = 1;
365	my @res;	437	my @res;
366		438
367	(async {	439	(async {
		440	$Coro::current->desc ("sync job coro");
368	@res = eval { $job->() };	441	@res = eval { $job->() };
369	warn $@ if $@;	442	warn $@ if $@;
370	undef $busy;	443	undef $busy;
371	})->prio (Coro::PRIO_MAX);	444	})->prio (Coro::PRIO_MAX);
372		445
…		…
416	Coro::Storable. May, of course, block. Note that the executed sub may	489	Coro::Storable. May, of course, block. Note that the executed sub may
417	never block itself or use any form of Event handling.	490	never block itself or use any form of Event handling.
418		491
419	=cut	492	=cut
420		493
421	sub _store_scalar {
422	open my $fh, ">", \my $buf
423	or die "fork_call: cannot open fh-to-buf in child : $!";
424	Storable::store_fd $_[0], $fh;
425	close $fh;
426
427	$buf
428	}
429
430	sub fork_call(&@) {	494	sub fork_call(&@) {
431	my ($cb, @args) = @_;	495	my ($cb, @args) = @_;
432		496
433	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	497	# we seemingly have to make a local copy of the whole thing,
434	# or die "socketpair: $!";	498	# otherwise perl prematurely frees the stuff :/
435	pipe my $fh1, my $fh2	499	# TODO: investigate and fix (likely this will be rather laborious)
436	or die "pipe: $!";
437		500
438	if (my $pid = fork) {	501	my @res = Coro::Util::fork_eval {
439	close $fh2;
440
441	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442	warn "pst<$res>" unless $res =~ /^pst/;
443	$res = Coro::Storable::thaw $res;
444
445	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447	Carp::confess $$res unless "ARRAY" eq ref $res;
448
449	return wantarray ? @$res : $res->[-1];
450	} else {
451	reset_signals;	502	reset_signals;
452	local $SIG{__WARN__};	503	&$cb
453	local $SIG{__DIE__};	504	}, @args;
454	# just in case, this hack effectively disables event
455	# in the child. cleaner and slower would be canceling all watchers,
456	# but this works for the time being.
457	local $Coro::idle;
458	$Coro::current->prio (Coro::PRIO_MAX);
459		505
460	eval {	506	wantarray ? @res : $res[-1]
461	close $fh1;
462
463	my @res = eval { $cb->(@args) };
464
465	syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466	close $fh2;
467	};
468
469	warn $@ if $@;
470	_exit 0;
471	}
472	}	507	}
473		508
474	=item $value = cf::db_get $family => $key	509	=item $value = cf::db_get $family => $key
475		510
476	Returns a single value from the environment database.	511	Returns a single value from the environment database.
…		…
478	=item cf::db_put $family => $key => $value	513	=item cf::db_put $family => $key => $value
479		514
480	Stores the given C<$value> in the family. It can currently store binary	515	Stores the given C<$value> in the family. It can currently store binary
481	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).	516	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
482		517
		518	=item $db = cf::db_table "name"
		519
		520	Create and/or open a new database table. The string must not be "db" and must be unique
		521	within each server.
		522
483	=cut	523	=cut
		524
		525	sub db_table($) {
		526	my ($name) = @_;
		527	my $db = BDB::db_create $DB_ENV;
		528
		529	eval {
		530	$db->set_flags (BDB::CHKSUM);
		531
		532	utf8::encode $name;
		533	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		534	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
		535	cf::cleanup "db_open(db): $!" if $!;
		536	};
		537	cf::cleanup "db_open(db): $@" if $@;
		538
		539	$db
		540	}
484		541
485	our $DB;	542	our $DB;
486		543
487	sub db_init {	544	sub db_init {
488	unless ($DB) {
489	$DB = BDB::db_create $DB_ENV;
490
491	cf::sync_job {	545	cf::sync_job {
492	eval {	546	$DB \|\|= db_table "db";
493	$DB->set_flags (BDB::CHKSUM);
494
495	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
496	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
497	cf::cleanup "db_open(db): $!" if $!;
498	};
499	cf::cleanup "db_open(db): $@" if $@;
500	};
501	}	547	};
502	}	548	}
503		549
504	sub db_get($$) {	550	sub db_get($$) {
505	my $key = "$_[0]/$_[1]";	551	my $key = "$_[0]/$_[1]";
506		552
…		…
556	if (1) {	602	if (1) {
557	$md5 =	603	$md5 =
558	join "\x00",	604	join "\x00",
559	$processversion,	605	$processversion,
560	map {	606	map {
561	Coro::cede;	607	cf::cede_to_tick;
562	($src->[$_], Digest::MD5::md5_hex $data[$_])	608	($src->[$_], Digest::MD5::md5_hex $data[$_])
563	} 0.. $#$src;	609	} 0.. $#$src;
564		610
565		611
566	my $dbmd5 = db_get cache => "$id/md5";	612	my $dbmd5 = db_get cache => "$id/md5";
…		…
918		964
919	=cut	965	=cut
920		966
921	#############################################################################	967	#############################################################################
922	# object support	968	# object support
		969	#
		970
		971	sub _can_merge {
		972	my ($ob1, $ob2) = @_;
		973
		974	local $Storable::canonical = 1;
		975	my $fob1 = Storable::freeze $ob1;
		976	my $fob2 = Storable::freeze $ob2;
		977
		978	$fob1 eq $fob2
		979	}
923		980
924	sub reattach {	981	sub reattach {
925	# basically do the same as instantiate, without calling instantiate	982	# basically do the same as instantiate, without calling instantiate
926	my ($obj) = @_;	983	my ($obj) = @_;
927		984
…		…
974	sub object_freezer_save {	1031	sub object_freezer_save {
975	my ($filename, $rdata, $objs) = @_;	1032	my ($filename, $rdata, $objs) = @_;
976		1033
977	sync_job {	1034	sync_job {
978	if (length $$rdata) {	1035	if (length $$rdata) {
		1036	utf8::decode (my $decname = $filename);
979	warn sprintf "saving %s (%d,%d)\n",	1037	warn sprintf "saving %s (%d,%d)\n",
980	$filename, length $$rdata, scalar @$objs;	1038	$decname, length $$rdata, scalar @$objs;
981		1039
982	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1040	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
983	chmod SAVE_MODE, $fh;	1041	chmod SAVE_MODE, $fh;
984	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1042	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
985	aio_fsync $fh if $cf::USE_FSYNC;	1043	aio_fsync $fh if $cf::USE_FSYNC;
…		…
1004	}	1062	}
1005	} else {	1063	} else {
1006	aio_unlink $filename;	1064	aio_unlink $filename;
1007	aio_unlink "$filename.pst";	1065	aio_unlink "$filename.pst";
1008	}	1066	}
1009	}	1067	};
1010	}	1068	}
1011		1069
1012	sub object_freezer_as_string {	1070	sub object_freezer_as_string {
1013	my ($rdata, $objs) = @_;	1071	my ($rdata, $objs) = @_;
1014		1072
…		…
1026	or return;	1084	or return;
1027		1085
1028	unless (aio_stat "$filename.pst") {	1086	unless (aio_stat "$filename.pst") {
1029	(aio_load "$filename.pst", $av) >= 0	1087	(aio_load "$filename.pst", $av) >= 0
1030	or return;	1088	or return;
		1089
1031	$av = eval { (Storable::thaw $av)->{objs} };	1090	$av = eval { (Storable::thaw $av)->{objs} };
1032	}	1091	}
1033		1092
		1093	utf8::decode (my $decname = $filename);
1034	warn sprintf "loading %s (%d)\n",	1094	warn sprintf "loading %s (%d,%d)\n",
1035	$filename, length $data, scalar @{$av \|\| []};	1095	$decname, length $data, scalar @{$av \|\| []};
		1096
1036	return ($data, $av);	1097	($data, $av)
1037	}	1098	}
1038		1099
1039	=head2 COMMAND CALLBACKS	1100	=head2 COMMAND CALLBACKS
1040		1101
1041	=over 4	1102	=over 4
…		…
1114	my ($pl, $buf) = @_;	1175	my ($pl, $buf) = @_;
1115		1176
1116	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1177	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117		1178
1118	if (ref $msg) {	1179	if (ref $msg) {
		1180	my ($type, $reply, @payload) =
		1181	"ARRAY" eq ref $msg
		1182	? @$msg
		1183	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1184
		1185	my @reply;
		1186
1119	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1187	if (my $cb = $EXTCMD{$type}) {
1120	if (my %reply = $cb->($pl, $msg)) {	1188	@reply = $cb->($pl, @payload);
1121	$pl->ext_reply ($msg->{msgid}, %reply);
1122	}
1123	}	1189	}
		1190
		1191	$pl->ext_reply ($reply, @reply)
		1192	if $reply;
		1193
1124	} else {	1194	} else {
1125	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1195	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126	}	1196	}
1127		1197
1128	cf::override;	1198	cf::override;
…		…
1218		1288
1219	=head3 cf::player	1289	=head3 cf::player
1220		1290
1221	=over 4	1291	=over 4
1222		1292
		1293	=item cf::player::num_playing
		1294
		1295	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1296
		1297	=cut
		1298
		1299	sub num_playing {
		1300	scalar grep
		1301	$_->ob->map
		1302	&& !$_->hidden
		1303	&& !$_->ob->flag (cf::FLAG_WIZ),
		1304	cf::player::list
		1305	}
		1306
1223	=item cf::player::find $login	1307	=item cf::player::find $login
1224		1308
1225	Returns the given player object, loading it if necessary (might block).	1309	Returns the given player object, loading it if necessary (might block).
1226		1310
1227	=cut	1311	=cut
…		…
1262	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1346	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1263	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1347	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1264	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1348	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1265	aio_unlink +(playerdir $login) . "/$login.pl";	1349	aio_unlink +(playerdir $login) . "/$login.pl";
1266		1350
1267	my $pl = load_pl path $login	1351	my $f = new_from_file cf::object::thawer path $login
1268	or return;	1352	or return;
		1353
		1354	my $pl = cf::player::load_pl $f
		1355	or return;
		1356	local $cf::PLAYER_LOADING{$login} = $pl;
		1357	$f->resolve_delayed_derefs;
1269	$cf::PLAYER{$login} = $pl	1358	$cf::PLAYER{$login} = $pl
1270	}	1359	}
1271	}	1360	}
1272	}	1361	}
1273		1362
…		…
1283		1372
1284	aio_mkdir playerdir $pl, 0770;	1373	aio_mkdir playerdir $pl, 0770;
1285	$pl->{last_save} = $cf::RUNTIME;	1374	$pl->{last_save} = $cf::RUNTIME;
1286		1375
1287	$pl->save_pl ($path);	1376	$pl->save_pl ($path);
1288	Coro::cede;	1377	cf::cede_to_tick;
1289	}	1378	}
1290		1379
1291	sub new($) {	1380	sub new($) {
1292	my ($login) = @_;	1381	my ($login) = @_;
1293		1382
…		…
1297	$self->{deny_save} = 1;	1386	$self->{deny_save} = 1;
1298		1387
1299	$cf::PLAYER{$login} = $self;	1388	$cf::PLAYER{$login} = $self;
1300		1389
1301	$self	1390	$self
		1391	}
		1392
		1393	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1394
		1395	=cut
		1396
		1397	sub send_msg {
		1398	my $ns = shift->ns
		1399	or return;
		1400	$ns->send_msg (@_);
1302	}	1401	}
1303		1402
1304	=item $pl->quit_character	1403	=item $pl->quit_character
1305		1404
1306	Nukes the player without looking back. If logged in, the connection will	1405	Nukes the player without looking back. If logged in, the connection will
…		…
1361	or return [];	1460	or return [];
1362		1461
1363	my @logins;	1462	my @logins;
1364		1463
1365	for my $login (@$dirs) {	1464	for my $login (@$dirs) {
		1465	my $path = path $login;
		1466
		1467	# a .pst is a dead give-away for a valid player
		1468	unless (-e "$path.pst") {
1366	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1469	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1367	aio_read $fh, 0, 512, my $buf, 0 or next;	1470	aio_read $fh, 0, 512, my $buf, 0 or next;
1368	$buf !~ /^password -------------$/m or next; # official not-valid tag	1471	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1472	}
1369		1473
1370	utf8::decode $login;	1474	utf8::decode $login;
1371	push @logins, $login;	1475	push @logins, $login;
1372	}	1476	}
1373		1477
…		…
1411	sub expand_cfpod {	1515	sub expand_cfpod {
1412	((my $self), (local $_)) = @_;	1516	((my $self), (local $_)) = @_;
1413		1517
1414	# escape & and <	1518	# escape & and <
1415	s/&/&/g;	1519	s/&/&/g;
1416	s/(?<![BIUGH])</</g;	1520	s/(?<![BIUGHT])</</g;
1417		1521
1418	# this is buggy, it needs to properly take care of nested <'s	1522	# this is buggy, it needs to properly take care of nested <'s
1419		1523
1420	1 while	1524	1 while
1421	# replace B<>, I<>, U<> etc.	1525	# replace B<>, I<>, U<> etc.
1422	s/B<([^\>]*)>/<b>$1<\/b>/	1526	s/B<([^\>]*)>/<b>$1<\/b>/
1423	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1527	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1424	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1528	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1529	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1425	# replace G<male\|female> tags	1530	# replace G<male\|female> tags
1426	\|\| s{G<([^>\|])\\|([^>])>}{	1531	\|\| s{G<([^>\|])\\|([^>])>}{
1427	$self->gender ? $2 : $1	1532	$self->gender ? $2 : $1
1428	}ge	1533	}ge
1429	# replace H<hint text>	1534	# replace H<hint text>
…		…
1450	sub hintmode {	1555	sub hintmode {
1451	$_[0]{hintmode} = $_[1] if @_ > 1;	1556	$_[0]{hintmode} = $_[1] if @_ > 1;
1452	$_[0]{hintmode}	1557	$_[0]{hintmode}
1453	}	1558	}
1454		1559
1455	=item $player->ext_reply ($msgid, %msg)	1560	=item $player->ext_reply ($msgid, @msg)
1456		1561
1457	Sends an ext reply to the player.	1562	Sends an ext reply to the player.
1458		1563
1459	=cut	1564	=cut
1460		1565
1461	sub ext_reply($$%) {	1566	sub ext_reply($$@) {
1462	my ($self, $id, %msg) = @_;	1567	my ($self, $id, @msg) = @_;
1463		1568
1464	$msg{msgid} = $id;	1569	$self->ns->ext_reply ($id, @msg)
1465	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1466	}	1570	}
1467		1571
1468	=item $player->ext_event ($type, %msg)	1572	=item $player->ext_msg ($type, @msg)
1469		1573
1470	Sends an ext event to the client.	1574	Sends an ext event to the client.
1471		1575
1472	=cut	1576	=cut
1473		1577
1474	sub ext_event($$%) {	1578	sub ext_msg($$@) {
1475	my ($self, $type, %msg) = @_;	1579	my ($self, $type, @msg) = @_;
1476		1580
1477	$self->ns->ext_event ($type, %msg);	1581	$self->ns->ext_msg ($type, @msg);
1478	}	1582	}
1479		1583
1480	=head3 cf::region	1584	=head3 cf::region
1481		1585
1482	=over 4	1586	=over 4
…		…
1698		1802
1699	sub load_header_from($) {	1803	sub load_header_from($) {
1700	my ($self, $path) = @_;	1804	my ($self, $path) = @_;
1701		1805
1702	utf8::encode $path;	1806	utf8::encode $path;
1703	#aio_open $path, O_RDONLY, 0	1807	my $f = new_from_file cf::object::thawer $path
1704	# or return;
1705
1706	$self->_load_header ($path)
1707	or return;	1808	or return;
		1809
		1810	$self->_load_header ($f)
		1811	or return;
		1812
		1813	local $MAP_LOADING{$self->{path}} = $self;
		1814	$f->resolve_delayed_derefs;
1708		1815
1709	$self->{load_path} = $path;	1816	$self->{load_path} = $path;
1710		1817
1711	1	1818	1
1712	}	1819	}
…		…
1766	sub find {	1873	sub find {
1767	my ($path, $origin) = @_;	1874	my ($path, $origin) = @_;
1768		1875
1769	$path = normalise $path, $origin && $origin->path;	1876	$path = normalise $path, $origin && $origin->path;
1770		1877
		1878	cf::lock_wait "map_data:$path";#d#remove
1771	cf::lock_wait "map_find:$path";	1879	cf::lock_wait "map_find:$path";
1772		1880
1773	$cf::MAP{$path} \|\| do {	1881	$cf::MAP{$path} \|\| do {
1774	my $guard = cf::lock_acquire "map_find:$path";	1882	my $guard1 = cf::lock_acquire "map_find:$path";
		1883	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1884
1775	my $map = new_from_path cf::map $path	1885	my $map = new_from_path cf::map $path
1776	or return;	1886	or return;
1777		1887
1778	$map->{last_save} = $cf::RUNTIME;	1888	$map->{last_save} = $cf::RUNTIME;
1779		1889
…		…
1781	or return;	1891	or return;
1782		1892
1783	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1893	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1784	# doing this can freeze the server in a sync job, obviously	1894	# doing this can freeze the server in a sync job, obviously
1785	#$cf::WAIT_FOR_TICK->wait;	1895	#$cf::WAIT_FOR_TICK->wait;
		1896	undef $guard1;
		1897	undef $guard2;
1786	$map->reset;	1898	$map->reset;
1787	undef $guard;
1788	return find $path;	1899	return find $path;
1789	}	1900	}
1790		1901
1791	$cf::MAP{$path} = $map	1902	$cf::MAP{$path} = $map
1792	}	1903	}
…		…
1801	local $self->{deny_reset} = 1; # loading can take a long time	1912	local $self->{deny_reset} = 1; # loading can take a long time
1802		1913
1803	my $path = $self->{path};	1914	my $path = $self->{path};
1804		1915
1805	{	1916	{
1806	my $guard = cf::lock_acquire "map_load:$path";	1917	my $guard = cf::lock_acquire "map_data:$path";
1807		1918
		1919	return unless $self->valid;
1808	return if $self->in_memory != cf::MAP_SWAPPED;	1920	return unless $self->in_memory == cf::MAP_SWAPPED;
1809		1921
1810	$self->in_memory (cf::MAP_LOADING);	1922	$self->in_memory (cf::MAP_LOADING);
1811		1923
1812	$self->alloc;	1924	$self->alloc;
1813		1925
1814	$self->pre_load;	1926	$self->pre_load;
1815	Coro::cede;	1927	cf::cede_to_tick;
1816		1928
		1929	my $f = new_from_file cf::object::thawer $self->{load_path};
		1930	$f->skip_block;
1817	$self->_load_objects ($self->{load_path}, 1)	1931	$self->_load_objects ($f)
1818	or return;	1932	or return;
1819		1933
1820	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1934	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1821	if delete $self->{load_original};	1935	if delete $self->{load_original};
1822		1936
1823	if (my $uniq = $self->uniq_path) {	1937	if (my $uniq = $self->uniq_path) {
1824	utf8::encode $uniq;	1938	utf8::encode $uniq;
1825	if (aio_open $uniq, O_RDONLY, 0) {	1939	unless (aio_stat $uniq) {
		1940	if (my $f = new_from_file cf::object::thawer $uniq) {
1826	$self->clear_unique_items;	1941	$self->clear_unique_items;
1827	$self->_load_objects ($uniq, 0);	1942	$self->_load_objects ($f);
		1943	$f->resolve_delayed_derefs;
		1944	}
1828	}	1945	}
1829	}	1946	}
1830		1947
1831	Coro::cede;	1948	$f->resolve_delayed_derefs;
		1949
		1950	cf::cede_to_tick;
1832	# now do the right thing for maps	1951	# now do the right thing for maps
1833	$self->link_multipart_objects;	1952	$self->link_multipart_objects;
1834	$self->difficulty ($self->estimate_difficulty)	1953	$self->difficulty ($self->estimate_difficulty)
1835	unless $self->difficulty;	1954	unless $self->difficulty;
1836	Coro::cede;	1955	cf::cede_to_tick;
1837		1956
1838	unless ($self->{deny_activate}) {	1957	unless ($self->{deny_activate}) {
1839	$self->decay_objects;	1958	$self->decay_objects;
1840	$self->fix_auto_apply;	1959	$self->fix_auto_apply;
1841	$self->update_buttons;	1960	$self->update_buttons;
1842	Coro::cede;	1961	cf::cede_to_tick;
1843	$self->set_darkness_map;	1962	$self->set_darkness_map;
1844	Coro::cede;	1963	cf::cede_to_tick;
1845	$self->activate;	1964	$self->activate;
1846	}	1965	}
		1966
		1967	$self->{last_save} = $cf::RUNTIME;
		1968	$self->last_access ($cf::RUNTIME);
1847		1969
1848	$self->in_memory (cf::MAP_IN_MEMORY);	1970	$self->in_memory (cf::MAP_IN_MEMORY);
1849	}	1971	}
1850		1972
1851	$self->post_load;	1973	$self->post_load;
…		…
1862		1984
1863	$self	1985	$self
1864	}	1986	}
1865		1987
1866	# find and load all maps in the 3x3 area around a map	1988	# find and load all maps in the 3x3 area around a map
1867	sub load_diag {	1989	sub load_neighbours {
1868	my ($map) = @_;	1990	my ($map) = @_;
1869		1991
1870	my @diag; # diagonal neighbours	1992	my @neigh; # diagonal neighbours
1871		1993
1872	for (0 .. 3) {	1994	for (0 .. 3) {
1873	my $neigh = $map->tile_path ($_)	1995	my $neigh = $map->tile_path ($_)
1874	or next;	1996	or next;
1875	$neigh = find $neigh, $map	1997	$neigh = find $neigh, $map
1876	or next;	1998	or next;
1877	$neigh->load;	1999	$neigh->load;
1878		2000
		2001	push @neigh,
1879	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2002	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1880	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2003	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1881	}	2004	}
1882		2005
1883	for (@diag) {	2006	for (grep defined $_->[0], @neigh) {
		2007	my ($path, $origin) = @$_;
1884	my $neigh = find @$_	2008	my $neigh = find $path, $origin
1885	or next;	2009	or next;
1886	$neigh->load;	2010	$neigh->load;
1887	}	2011	}
1888	}	2012	}
1889		2013
…		…
1894	}	2018	}
1895		2019
1896	sub do_load_sync {	2020	sub do_load_sync {
1897	my ($map) = @_;	2021	my ($map) = @_;
1898		2022
		2023	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2024	if $Coro::current == $Coro::main;
		2025
1899	cf::sync_job { $map->load };	2026	cf::sync_job { $map->load };
1900	}	2027	}
1901		2028
1902	our %MAP_PREFETCH;	2029	our %MAP_PREFETCH;
1903	our $MAP_PREFETCHER = undef;	2030	our $MAP_PREFETCHER = undef;
1904		2031
1905	sub find_async {	2032	sub find_async {
1906	my ($path, $origin) = @_;	2033	my ($path, $origin, $load) = @_;
1907		2034
1908	$path = normalise $path, $origin && $origin->{path};	2035	$path = normalise $path, $origin && $origin->{path};
1909		2036
1910	if (my $map = $cf::MAP{$path}) {	2037	if (my $map = $cf::MAP{$path}) {
1911	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2038	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1912	}	2039	}
1913		2040
1914	undef $MAP_PREFETCH{$path};	2041	$MAP_PREFETCH{$path} \|= $load;
		2042
1915	$MAP_PREFETCHER \|\|= cf::async {	2043	$MAP_PREFETCHER \|\|= cf::async {
		2044	$Coro::current->{desc} = "map prefetcher";
		2045
1916	while (%MAP_PREFETCH) {	2046	while (%MAP_PREFETCH) {
1917	for my $path (keys %MAP_PREFETCH) {	2047	while (my ($k, $v) = each %MAP_PREFETCH) {
1918	if (my $map = find $path) {	2048	if (my $map = find $k) {
1919	$map->load;	2049	$map->load if $v;
1920	}	2050	}
1921		2051
1922	delete $MAP_PREFETCH{$path};	2052	delete $MAP_PREFETCH{$k};
1923	}	2053	}
1924	}	2054	}
1925	undef $MAP_PREFETCHER;	2055	undef $MAP_PREFETCHER;
1926	};	2056	};
1927	$MAP_PREFETCHER->prio (6);	2057	$MAP_PREFETCHER->prio (6);
…		…
1930	}	2060	}
1931		2061
1932	sub save {	2062	sub save {
1933	my ($self) = @_;	2063	my ($self) = @_;
1934		2064
1935	my $lock = cf::lock_acquire "map_data:" . $self->path;	2065	my $lock = cf::lock_acquire "map_data:$self->{path}";
1936		2066
1937	$self->{last_save} = $cf::RUNTIME;	2067	$self->{last_save} = $cf::RUNTIME;
1938		2068
1939	return unless $self->dirty;	2069	return unless $self->dirty;
1940		2070
…		…
1946	return if $self->{deny_save};	2076	return if $self->{deny_save};
1947		2077
1948	local $self->{last_access} = $self->last_access;#d#	2078	local $self->{last_access} = $self->last_access;#d#
1949		2079
1950	cf::async {	2080	cf::async {
		2081	$Coro::current->{desc} = "map player save";
1951	$_->contr->save for $self->players;	2082	$_->contr->save for $self->players;
1952	};	2083	};
1953		2084
1954	if ($uniq) {	2085	if ($uniq) {
1955	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	2086	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
…		…
1963	my ($self) = @_;	2094	my ($self) = @_;
1964		2095
1965	# save first because save cedes	2096	# save first because save cedes
1966	$self->save;	2097	$self->save;
1967		2098
1968	my $lock = cf::lock_acquire "map_data:" . $self->path;	2099	my $lock = cf::lock_acquire "map_data:$self->{path}";
1969		2100
1970	return if $self->players;	2101	return if $self->players;
1971	return if $self->in_memory != cf::MAP_IN_MEMORY;	2102	return if $self->in_memory != cf::MAP_IN_MEMORY;
1972	return if $self->{deny_save};	2103	return if $self->{deny_save};
1973		2104
		2105	$self->in_memory (cf::MAP_SWAPPED);
		2106
		2107	$self->deactivate;
		2108	$_->clear_links_to ($self) for values %cf::MAP;
1974	$self->clear;	2109	$self->clear;
1975	$self->in_memory (cf::MAP_SWAPPED);
1976	}	2110	}
1977		2111
1978	sub reset_at {	2112	sub reset_at {
1979	my ($self) = @_;	2113	my ($self) = @_;
1980		2114
…		…
2012	if $uniq;	2146	if $uniq;
2013	}	2147	}
2014		2148
2015	delete $cf::MAP{$self->path};	2149	delete $cf::MAP{$self->path};
2016		2150
		2151	$self->deactivate;
		2152	$_->clear_links_to ($self) for values %cf::MAP;
2017	$self->clear;	2153	$self->clear;
2018
2019	$_->clear_links_to ($self) for values %cf::MAP;
2020		2154
2021	$self->unlink_save;	2155	$self->unlink_save;
2022	$self->destroy;	2156	$self->destroy;
2023	}	2157	}
2024		2158
2025	my $nuke_counter = "aaaa";	2159	my $nuke_counter = "aaaa";
2026		2160
2027	sub nuke {	2161	sub nuke {
2028	my ($self) = @_;	2162	my ($self) = @_;
2029		2163
		2164	{
		2165	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2166
2030	delete $cf::MAP{$self->path};	2167	delete $cf::MAP{$self->path};
2031		2168
2032	$self->unlink_save;	2169	$self->unlink_save;
2033		2170
2034	bless $self, "cf::map";	2171	bless $self, "cf::map";
2035	delete $self->{deny_reset};	2172	delete $self->{deny_reset};
2036	$self->{deny_save} = 1;	2173	$self->{deny_save} = 1;
2037	$self->reset_timeout (1);	2174	$self->reset_timeout (1);
2038	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2175	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2039		2176
2040	$cf::MAP{$self->path} = $self;	2177	$cf::MAP{$self->path} = $self;
		2178	}
2041		2179
2042	$self->reset; # polite request, might not happen	2180	$self->reset; # polite request, might not happen
2043	}	2181	}
2044		2182
2045	=item $maps = cf::map::tmp_maps	2183	=item $maps = cf::map::tmp_maps
…		…
2121		2259
2122	sub inv_recursive {	2260	sub inv_recursive {
2123	inv_recursive_ inv $_[0]	2261	inv_recursive_ inv $_[0]
2124	}	2262	}
2125		2263
		2264	=item $ref = $ob->ref
		2265
		2266	creates and returns a persistent reference to an objetc that can be stored as a string.
		2267
		2268	=item $ob = cf::object::deref ($refstring)
		2269
		2270	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2271	even if the object actually exists. May block.
		2272
		2273	=cut
		2274
		2275	sub deref {
		2276	my ($ref) = @_;
		2277
		2278	# temporary compatibility#TODO#remove
		2279	$ref =~ s{^<}{player/<};
		2280
		2281	if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
		2282	my ($uuid, $name) = ($1, $2);
		2283	my $pl = $cf::PLAYER_LOADING{$name} \|\| cf::player::find $name
		2284	or return;
		2285	$pl->ob->uuid eq $uuid
		2286	or return;
		2287
		2288	$pl->ob
		2289	} else {
		2290	warn "$ref: cannot resolve object reference\n";
		2291	undef
		2292	}
		2293	}
		2294
2126	package cf;	2295	package cf;
2127		2296
2128	=back	2297	=back
2129		2298
2130	=head3 cf::object::player	2299	=head3 cf::object::player
…		…
2152		2321
2153	} else {	2322	} else {
2154	my $pl = $self->contr;	2323	my $pl = $self->contr;
2155		2324
2156	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2325	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157	my $diag = $pl->{npc_dialog};	2326	my $dialog = $pl->{npc_dialog};
2158	$diag->{pl}->ext_reply (	2327	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2159	$diag->{id},
2160	msgtype => "reply",
2161	msg => $diag->{pl}->expand_cfpod ($msg),
2162	add_topics => []
2163	);
2164		2328
2165	} else {	2329	} else {
2166	$msg = $npc->name . " says: $msg" if $npc;	2330	$msg = $npc->name . " says: $msg" if $npc;
2167	$self->message ($msg, $flags);	2331	$self->message ($msg, $flags);
2168	}	2332	}
2169	}	2333	}
		2334	}
		2335
		2336	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2337
		2338	=cut
		2339
		2340	sub cf::object::send_msg {
		2341	my $pl = shift->contr
		2342	or return;
		2343	$pl->send_msg (@_);
2170	}	2344	}
2171		2345
2172	=item $player_object->may ("access")	2346	=item $player_object->may ("access")
2173		2347
2174	Returns wether the given player is authorized to access resource "access"	2348	Returns wether the given player is authorized to access resource "access"
…		…
2253	# use -1 or undef as default coordinates, not 0, 0	2427	# use -1 or undef as default coordinates, not 0, 0
2254	($x, $y) = ($map->enter_x, $map->enter_y)	2428	($x, $y) = ($map->enter_x, $map->enter_y)
2255	if $x <=0 && $y <= 0;	2429	if $x <=0 && $y <= 0;
2256		2430
2257	$map->load;	2431	$map->load;
2258	$map->load_diag;	2432	$map->load_neighbours;
2259		2433
2260	return unless $self->contr->active;	2434	return unless $self->contr->active;
2261	$self->activate_recursive;	2435	$self->activate_recursive;
2262		2436
2263	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2437	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
…		…
2283	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2457	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2284		2458
2285	$self->enter_link;	2459	$self->enter_link;
2286		2460
2287	(async {	2461	(async {
		2462	$Coro::current->{desc} = "player::goto $path $x $y";
		2463
		2464	# *tag paths override both path and x\|y
		2465	if ($path =~ /^\(.)$/) {
		2466	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2467	my $ob = $obs[rand @obs];
		2468
		2469	# see if we actually can go there
		2470	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2471	$ob = $obs[rand @obs];
		2472	} else {
		2473	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE \| cf::NDI_RED);
		2474	}
		2475	# else put us there anyways for now #d#
		2476
		2477	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2478	} else {
		2479	($path, $x, $y) = (undef, undef, undef);
		2480	}
		2481	}
		2482
2288	my $map = eval {	2483	my $map = eval {
2289	my $map = cf::map::find $path;	2484	my $map = defined $path ? cf::map::find $path : undef;
2290		2485
2291	if ($map) {	2486	if ($map) {
2292	$map = $map->customise_for ($self);	2487	$map = $map->customise_for ($self);
2293	$map = $check->($map) if $check && $map;	2488	$map = $check->($map) if $check && $map;
2294	} else {	2489	} else {
2295	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);	2490	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE \| cf::NDI_RED);
2296	}	2491	}
2297		2492
2298	$map	2493	$map
2299	};	2494	};
2300		2495
…		…
2390	# if exit is damned, update players death & WoR home-position	2585	# if exit is damned, update players death & WoR home-position
2391	$self->contr->savebed ($slaying, $hp, $sp)	2586	$self->contr->savebed ($slaying, $hp, $sp)
2392	if $exit->flag (FLAG_DAMNED);	2587	if $exit->flag (FLAG_DAMNED);
2393		2588
2394	(async {	2589	(async {
		2590	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2591
2395	$self->deactivate_recursive; # just to be sure	2592	$self->deactivate_recursive; # just to be sure
2396	unless (eval {	2593	unless (eval {
2397	$self->goto ($slaying, $hp, $sp);	2594	$self->goto ($slaying, $hp, $sp);
2398		2595
2399	1;	2596	1;
…		…
2425		2622
2426	utf8::encode $text;	2623	utf8::encode $text;
2427	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2624	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2428	}	2625	}
2429		2626
2430	=item $client->send_msg ($color, $type, $msg, [extra...])	2627	=item $client->send_msg ($channel, $msg, $color, [extra...])
2431		2628
2432	Send a drawinfo or msg packet to the client, formatting the msg for the	2629	Send a drawinfo or msg packet to the client, formatting the msg for the
2433	client if neccessary. C<$type> should be a string identifying the type of	2630	client if neccessary. C<$type> should be a string identifying the type of
2434	the message, with C<log> being the default. If C<$color> is negative, suppress	2631	the message, with C<log> being the default. If C<$color> is negative, suppress
2435	the message unless the client supports the msg packet.	2632	the message unless the client supports the msg packet.
2436		2633
2437	=cut	2634	=cut
2438		2635
		2636	our %CHANNEL = (
		2637	"c/identify" => {
		2638	id => "identify",
		2639	title => "Identify",
		2640	reply => undef,
		2641	tooltip => "Items recently identified",
		2642	},
		2643	"c/examine" => {
		2644	id => "examine",
		2645	title => "Examine",
		2646	reply => undef,
		2647	tooltip => "Signs and other items you examined",
		2648	},
		2649	);
		2650
2439	sub cf::client::send_msg {	2651	sub cf::client::send_msg {
2440	my ($self, $color, $type, $msg, @extra) = @_;	2652	my ($self, $channel, $msg, $color, @extra) = @_;
2441		2653
2442	$msg = $self->pl->expand_cfpod ($msg);	2654	$msg = $self->pl->expand_cfpod ($msg);
2443		2655
		2656	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2657
		2658	# check predefined channels, for the benefit of C
		2659	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};
		2660
		2661	if (ref $channel) {
		2662	# send meta info to client, if not yet sent
		2663	unless (exists $self->{channel}{$channel->{id}}) {
		2664	$self->{channel}{$channel->{id}} = $channel;
		2665	$self->ext_msg (channel_info => $channel)
		2666	if $self->can_msg;
		2667	}
		2668
		2669	$channel = $channel->{id};
		2670	}
		2671
2444	return unless @extra \|\| length $msg;	2672	return unless @extra \|\| length $msg;
2445		2673
2446	if ($self->can_msg) {	2674	if ($self->can_msg) {
		2675	# default colour, mask it out
		2676	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2677	if $color & cf::NDI_DEF;
		2678
2447	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));	2679	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2680	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2448	} else {	2681	} else {
2449	# replace some tags by gcfclient-compatible ones
2450	for ($msg) {
2451	1 while
2452	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2453	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2454	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2455	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2456	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2457	}
2458
2459	if ($color >= 0) {	2682	if ($color >= 0) {
		2683	# replace some tags by gcfclient-compatible ones
		2684	for ($msg) {
		2685	1 while
		2686	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2687	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2688	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2689	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2690	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2691	}
		2692
		2693	$color &= cf::NDI_COLOR_MASK;
		2694
		2695	utf8::encode $msg;
		2696
2460	if (0 && $msg =~ /\[/) {	2697	if (0 && $msg =~ /\[/) {
		2698	# COMMAND/INFO
2461	$self->send_packet ("drawextinfo $color 4 0 $msg")	2699	$self->send_packet ("drawextinfo $color 10 8 $msg")
2462	} else {	2700	} else {
2463	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2701	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2464	$self->send_packet ("drawinfo $color $msg")	2702	$self->send_packet ("drawinfo $color $msg")
2465	}	2703	}
2466	}	2704	}
2467	}	2705	}
2468	}	2706	}
2469		2707
2470	=item $client->ext_event ($type, %msg)	2708	=item $client->ext_msg ($type, @msg)
2471		2709
2472	Sends an ext event to the client.	2710	Sends an ext event to the client.
2473		2711
2474	=cut	2712	=cut
2475		2713
2476	sub cf::client::ext_event($$%) {	2714	sub cf::client::ext_msg($$@) {
2477	my ($self, $type, %msg) = @_;	2715	my ($self, $type, @msg) = @_;
2478		2716
2479	return unless $self->extcmd;	2717	if ($self->extcmd == 2) {
2480		2718	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2719	} elsif ($self->extcmd == 1) { # TODO: remove
2481	$msg{msgtype} = "event_$type";	2720	push @msg, msgtype => "event_$type";
2482	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2721	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2722	}
		2723	}
		2724
		2725	=item $client->ext_reply ($msgid, @msg)
		2726
		2727	Sends an ext reply to the client.
		2728
		2729	=cut
		2730
		2731	sub cf::client::ext_reply($$@) {
		2732	my ($self, $id, @msg) = @_;
		2733
		2734	if ($self->extcmd == 2) {
		2735	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2736	} elsif ($self->extcmd == 1) {
		2737	#TODO: version 1, remove
		2738	unshift @msg, msgtype => "reply", msgid => $id;
		2739	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2740	}
2483	}	2741	}
2484		2742
2485	=item $success = $client->query ($flags, "text", \&cb)	2743	=item $success = $client->query ($flags, "text", \&cb)
2486		2744
2487	Queues a query to the client, calling the given callback with	2745	Queues a query to the client, calling the given callback with
…		…
2542	my ($ns, $buf) = @_;	2800	my ($ns, $buf) = @_;
2543		2801
2544	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2802	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2545		2803
2546	if (ref $msg) {	2804	if (ref $msg) {
		2805	my ($type, $reply, @payload) =
		2806	"ARRAY" eq ref $msg
		2807	? @$msg
		2808	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2809
		2810	my @reply;
		2811
2547	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2812	if (my $cb = $EXTICMD{$type}) {
2548	if (my %reply = $cb->($ns, $msg)) {	2813	@reply = $cb->($ns, @payload);
2549	$reply{msgid} = $msg->{msgid};
2550	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2551	}
2552	}	2814	}
		2815
		2816	$ns->ext_reply ($reply, @reply)
		2817	if $reply;
		2818
2553	} else {	2819	} else {
2554	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2820	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2555	}	2821	}
2556		2822
2557	cf::override;	2823	cf::override;
…		…
2604	our $safe = new Safe "safe";	2870	our $safe = new Safe "safe";
2605	our $safe_hole = new Safe::Hole;	2871	our $safe_hole = new Safe::Hole;
2606		2872
2607	$SIG{FPE} = 'IGNORE';	2873	$SIG{FPE} = 'IGNORE';
2608		2874
2609	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2875	$safe->permit_only (Opcode::opset qw(
		2876	:base_core :base_mem :base_orig :base_math
		2877	grepstart grepwhile mapstart mapwhile
		2878	sort time
		2879	));
2610		2880
2611	# here we export the classes and methods available to script code	2881	# here we export the classes and methods available to script code
2612		2882
2613	=pod	2883	=pod
2614		2884
2615	The following functions and methods are available within a safe environment:	2885	The following functions and methods are available within a safe environment:
2616		2886
2617	cf::object	2887	cf::object
2618	contr pay_amount pay_player map x y force_find force_add	2888	contr pay_amount pay_player map x y force_find force_add
2619	insert remove	2889	insert remove name archname title slaying race decrease_ob_nr
2620		2890
2621	cf::object::player	2891	cf::object::player
2622	player	2892	player
2623		2893
2624	cf::player	2894	cf::player
…		…
2629		2899
2630	=cut	2900	=cut
2631		2901
2632	for (	2902	for (
2633	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	2903	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2904	insert remove inv name archname title slaying race
2634	insert remove)],	2905	decrease_ob_nr)],
2635	["cf::object::player" => qw(player)],	2906	["cf::object::player" => qw(player)],
2636	["cf::player" => qw(peaceful)],	2907	["cf::player" => qw(peaceful)],
2637	["cf::map" => qw(trigger)],	2908	["cf::map" => qw(trigger)],
2638	) {	2909	) {
2639	no strict 'refs';	2910	no strict 'refs';
…		…
2715	# the server's init and main functions	2986	# the server's init and main functions
2716		2987
2717	sub load_facedata($) {	2988	sub load_facedata($) {
2718	my ($path) = @_;	2989	my ($path) = @_;
2719		2990
		2991	# HACK to clear player env face cache, we need some signal framework
		2992	# for this (global event?)
		2993	%ext::player_env::MUSIC_FACE_CACHE = ();
		2994
		2995	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		2996
2720	warn "loading facedata from $path\n";	2997	warn "loading facedata from $path\n";
2721		2998
2722	my $facedata;	2999	my $facedata;
2723	0 < aio_load $path, $facedata	3000	0 < aio_load $path, $facedata
2724	or die "$path: $!";	3001	or die "$path: $!";
2725		3002
2726	$facedata = Coro::Storable::thaw $facedata;	3003	$facedata = Coro::Storable::thaw $facedata;
2727		3004
2728	$facedata->{version} == 2	3005	$facedata->{version} == 2
2729	or cf::cleanup "$path: version mismatch, cannot proceed.";	3006	or cf::cleanup "$path: version mismatch, cannot proceed.";
		3007
		3008	# patch in the exptable
		3009	$facedata->{resource}{"res/exp_table"} = {
		3010	type => FT_RSRC,
		3011	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3012	};
		3013	cf::cede_to_tick;
2730		3014
2731	{	3015	{
2732	my $faces = $facedata->{faceinfo};	3016	my $faces = $facedata->{faceinfo};
2733		3017
2734	while (my ($face, $info) = each %$faces) {	3018	while (my ($face, $info) = each %$faces) {
2735	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3019	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2736	cf::face::set_visibility $idx, $info->{visibility};	3020	cf::face::set_visibility $idx, $info->{visibility};
2737	cf::face::set_magicmap $idx, $info->{magicmap};	3021	cf::face::set_magicmap $idx, $info->{magicmap};
2738	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3022	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2739	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3023	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2740		3024
2741	cf::cede_to_tick;	3025	cf::cede_to_tick;
2742	}	3026	}
2743		3027
2744	while (my ($face, $info) = each %$faces) {	3028	while (my ($face, $info) = each %$faces) {
…		…
2769		3053
2770	{	3054	{
2771	# TODO: for gcfclient pleasure, we should give resources	3055	# TODO: for gcfclient pleasure, we should give resources
2772	# that gcfclient doesn't grok a >10000 face index.	3056	# that gcfclient doesn't grok a >10000 face index.
2773	my $res = $facedata->{resource};	3057	my $res = $facedata->{resource};
2774	my $enc = JSON::XS->new->utf8->canonical;	3058
		3059	my $soundconf = delete $res->{"res/sound.conf"};
2775		3060
2776	while (my ($name, $info) = each %$res) {	3061	while (my ($name, $info) = each %$res) {
2777	my $meta = $enc->encode ({
2778	name => $name,
2779	type => $info->{type},
2780	copyright => $info->{copyright}, #TODO#
2781	});
2782
2783	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3062	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3063	my $data;
2784		3064
2785	if ($name =~ /\.jpg$/) {	3065	if ($info->{type} & 1) {
2786	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack	3066	# prepend meta info
2787	cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack	3067
		3068	my $meta = $enc->encode ({
		3069	name => $name,
		3070	%{ $info->{meta} \|\| {} },
		3071	});
		3072
		3073	$data = pack "(w/a)", $meta, $info->{data};
2788	} else {	3074	} else {
2789	my $data = pack "(w/a)", $meta, $info->{data};	3075	$data = $info->{data};
2790	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2791
2792	cf::face::set_type $idx, 1;
2793	cf::face::set_data $idx, 0, $data, $chk;
2794	}	3076	}
2795		3077
		3078	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3079	cf::face::set_type $idx, $info->{type};
		3080
2796	cf::cede_to_tick;	3081	cf::cede_to_tick;
2797	}	3082	}
		3083
		3084	if ($soundconf) {
		3085	$soundconf = $enc->decode (delete $soundconf->{data});
		3086
		3087	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3088	my $sound = $soundconf->{compat}[$_]
		3089	or next;
		3090
		3091	my $face = cf::face::find "sound/$sound->[1]";
		3092	cf::sound::set $sound->[0] => $face;
		3093	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3094	}
		3095
		3096	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3097	my $face = cf::face::find "sound/$v";
		3098	cf::sound::set $k => $face;
		3099	}
		3100	}
2798	}	3101	}
2799		3102
2800	1	3103	1
2801	}	3104	}
2802		3105
		3106	register_exticmd fx_want => sub {
		3107	my ($ns, $want) = @_;
		3108
		3109	while (my ($k, $v) = each %$want) {
		3110	$ns->fx_want ($k, $v);
		3111	}
		3112	};
		3113
2803	sub reload_regions {	3114	sub reload_regions {
		3115	# HACK to clear player env face cache, we need some signal framework
		3116	# for this (global event?)
		3117	%ext::player_env::MUSIC_FACE_CACHE = ();
		3118
2804	load_resource_file "$MAPDIR/regions"	3119	load_resource_file "$MAPDIR/regions"
2805	or die "unable to load regions file\n";	3120	or die "unable to load regions file\n";
2806		3121
2807	for (cf::region::list) {	3122	for (cf::region::list) {
2808	$_->{match} = qr/$_->{match}/	3123	$_->{match} = qr/$_->{match}/
…		…
2844		3159
2845	sub init {	3160	sub init {
2846	reload_resources;	3161	reload_resources;
2847	}	3162	}
2848		3163
2849	sub cfg_load {	3164	sub reload_config {
2850	open my $fh, "<:utf8", "$CONFDIR/config"	3165	open my $fh, "<:utf8", "$CONFDIR/config"
2851	or return;	3166	or return;
2852		3167
2853	local $/;	3168	local $/;
2854	*CFG = YAML::Syck::Load <$fh>;	3169	*CFG = YAML::Syck::Load <$fh>;
…		…
2870	sub main {	3185	sub main {
2871	# we must not ever block the main coroutine	3186	# we must not ever block the main coroutine
2872	local $Coro::idle = sub {	3187	local $Coro::idle = sub {
2873	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3188	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2874	(async {	3189	(async {
		3190	$Coro::current->{desc} = "IDLE BUG HANDLER";
2875	Event::one_event;	3191	Event::one_event;
2876	})->prio (Coro::PRIO_MAX);	3192	})->prio (Coro::PRIO_MAX);
2877	};	3193	};
2878		3194
2879	cfg_load;	3195	reload_config;
2880	db_init;	3196	db_init;
2881	load_extensions;	3197	load_extensions;
2882		3198
2883	$TICK_WATCHER->start;	3199	$TICK_WATCHER->start;
2884	Event::loop;	3200	Event::loop;
…		…
3077	warn "reloading cf.pm";	3393	warn "reloading cf.pm";
3078	require cf;	3394	require cf;
3079	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3395	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3080		3396
3081	warn "loading config and database again";	3397	warn "loading config and database again";
3082	cf::cfg_load;	3398	cf::reload_config;
3083		3399
3084	warn "loading extensions";	3400	warn "loading extensions";
3085	cf::load_extensions;	3401	cf::load_extensions;
3086		3402
3087	warn "reattaching attachments to objects/players";	3403	warn "reattaching attachments to objects/players";
…		…
3123	register_command "reload" => sub {	3439	register_command "reload" => sub {
3124	my ($who, $arg) = @_;	3440	my ($who, $arg) = @_;
3125		3441
3126	if ($who->flag (FLAG_WIZ)) {	3442	if ($who->flag (FLAG_WIZ)) {
3127	$who->message ("reloading server.");	3443	$who->message ("reloading server.");
		3444	async {
		3445	$Coro::current->{desc} = "perl_reload";
3128	async { reload_perl };	3446	reload_perl;
		3447	};
3129	}	3448	}
3130	};	3449	};
3131		3450
3132	unshift @INC, $LIBDIR;	3451	unshift @INC, $LIBDIR;
3133		3452
…		…
3152	my $signal = new Coro::Signal;	3471	my $signal = new Coro::Signal;
3153	push @WAIT_FOR_TICK_BEGIN, $signal;	3472	push @WAIT_FOR_TICK_BEGIN, $signal;
3154	$signal->wait;	3473	$signal->wait;
3155	}	3474	}
3156		3475
3157	my $min = 1e6;#d#
3158	my $avg = 10;
3159	$TICK_WATCHER = Event->timer (	3476	$TICK_WATCHER = Event->timer (
3160	reentrant => 0,	3477	reentrant => 0,
3161	parked => 1,	3478	parked => 1,
3162	prio => 0,	3479	prio => 0,
3163	at => $NEXT_TICK \|\| $TICK,	3480	at => $NEXT_TICK \|\| $TICK,
…		…
3171		3488
3172	$NOW = $tick_start = Event::time;	3489	$NOW = $tick_start = Event::time;
3173		3490
3174	cf::server_tick; # one server iteration	3491	cf::server_tick; # one server iteration
3175		3492
3176	0 && sync_job {#d#
3177	for(1..10) {
3178	my $t = Event::time;
3179	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3180	or die;
3181
3182	$map->width (50);
3183	$map->height (50);
3184	$map->alloc;
3185	$map->_load_objects ("/tmp/x.map", 1);
3186	my $t = Event::time - $t;
3187
3188	#next unless $t < 0.0013;#d#
3189	if ($t < $min) {
3190	$min = $t;
3191	}
3192	$avg = $avg * 0.99 + $t * 0.01;
3193	}
3194	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3195	exit 0;
3196	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3197	};
3198
3199	$RUNTIME += $TICK;	3493	$RUNTIME += $TICK;
3200	$NEXT_TICK += $TICK;	3494	$NEXT_TICK += $TICK;
3201		3495
3202	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3496	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3203	$NEXT_RUNTIME_WRITE = $NOW + 10;	3497	$NEXT_RUNTIME_WRITE = $NOW + 10;
3204	Coro::async_pool {	3498	Coro::async_pool {
		3499	$Coro::current->{desc} = "runtime saver";
3205	write_runtime	3500	write_runtime
3206	or warn "ERROR: unable to write runtime file: $!";	3501	or warn "ERROR: unable to write runtime file: $!";
3207	};	3502	};
3208	}	3503	}
3209		3504
3210	# my $AFTER = Event::time;
3211	# warn $AFTER - $NOW;#d#
3212
3213	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3505	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3214	$sig->send;	3506	$sig->send;
3215	}	3507	}
3216	while (my $sig = shift @WAIT_FOR_TICK) {	3508	while (my $sig = shift @WAIT_FOR_TICK) {
3217	$sig->send;	3509	$sig->send;
…		…
3227		3519
3228	$LOAD = ($NOW - $tick_start) / $TICK;	3520	$LOAD = ($NOW - $tick_start) / $TICK;
3229	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3521	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3230		3522
3231	_post_tick;	3523	_post_tick;
3232
3233
3234	},	3524	},
3235	);	3525	);
3236		3526
3237	{	3527	{
		3528	BDB::min_parallel 8;
3238	BDB::max_poll_time $TICK * 0.1;	3529	BDB::max_poll_time $TICK * 0.1;
3239	$BDB_POLL_WATCHER = Event->io (	3530	$BDB_POLL_WATCHER = Event->io (
3240	reentrant => 0,	3531	reentrant => 0,
3241	fd => BDB::poll_fileno,	3532	fd => BDB::poll_fileno,
3242	poll => 'r',	3533	poll => 'r',
3243	prio => 0,	3534	prio => 0,
3244	data => WF_AUTOCANCEL,	3535	data => WF_AUTOCANCEL,
3245	cb => \&BDB::poll_cb,	3536	cb => \&BDB::poll_cb,
3246	);	3537	);
3247	BDB::min_parallel 8;
3248		3538
3249	BDB::set_sync_prepare {	3539	BDB::set_sync_prepare {
3250	my $status;	3540	my $status;
3251	my $current = $Coro::current;	3541	my $current = $Coro::current;
3252	(	3542	(
…		…
3261	)	3551	)
3262	};	3552	};
3263		3553
3264	unless ($DB_ENV) {	3554	unless ($DB_ENV) {
3265	$DB_ENV = BDB::db_env_create;	3555	$DB_ENV = BDB::db_env_create;
		3556	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC
		3557	\| BDB::LOG_AUTOREMOVE, 1);
		3558	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3559	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3266		3560
3267	cf::sync_job {	3561	cf::sync_job {
3268	eval {	3562	eval {
3269	BDB::db_env_open	3563	BDB::db_env_open
3270	$DB_ENV,	3564	$DB_ENV,
…		…
3272	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN	3566	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN
3273	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3567	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3274	0666;	3568	0666;
3275		3569
3276	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3570	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3277
3278	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
3279	$DB_ENV->set_lk_detect;
3280	};	3571	};
3281		3572
3282	cf::cleanup "db_env_open(db): $@" if $@;	3573	cf::cleanup "db_env_open(db): $@" if $@;
3283	};	3574	};
3284	}	3575	}
		3576
		3577	$BDB_DEADLOCK_WATCHER = Event->timer (
		3578	after => 3,
		3579	interval => 1,
		3580	hard => 1,
		3581	prio => 0,
		3582	data => WF_AUTOCANCEL,
		3583	cb => sub {
		3584	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3585	},
		3586	);
		3587	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3588	after => 11,
		3589	interval => 60,
		3590	hard => 1,
		3591	prio => 0,
		3592	data => WF_AUTOCANCEL,
		3593	cb => sub {
		3594	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3595	},
		3596	);
		3597	$BDB_TRICKLE_WATCHER = Event->timer (
		3598	after => 5,
		3599	interval => 10,
		3600	hard => 1,
		3601	prio => 0,
		3602	data => WF_AUTOCANCEL,
		3603	cb => sub {
		3604	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3605	},
		3606	);
3285	}	3607	}
3286		3608
3287	{	3609	{
3288	IO::AIO::min_parallel 8;	3610	IO::AIO::min_parallel 8;
3289		3611
…		…
3308		3630
3309	# limit the # of concurrent backtraces	3631	# limit the # of concurrent backtraces
3310	if ($_log_backtrace < 2) {	3632	if ($_log_backtrace < 2) {
3311	++$_log_backtrace;	3633	++$_log_backtrace;
3312	async {	3634	async {
		3635	$Coro::current->{desc} = "abt $msg";
		3636
3313	my @bt = fork_call {	3637	my @bt = fork_call {
3314	@addr = map { sprintf "%x", $_ } @addr;	3638	@addr = map { sprintf "%x", $_ } @addr;
3315	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3639	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3316	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"	3640	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"
3317	or die "addr2line: $!";	3641	or die "addr2line: $!";

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.310 by elmex, Mon Jul 16 15:43:49 2007 UTC vs. Revision 1.374 by root, Wed Sep 19 22:07:16 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.310 by elmex, Mon Jul 16 15:43:49 2007 UTC vs.
Revision 1.374 by root, Wed Sep 19 22:07:16 2007 UTC