ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.314 by root, Mon Jul 23 16:53:15 2007 UTC vs.
Revision 1.377 by root, Thu Oct 4 11:36:38 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
…		…
322	};	336	};
323	$TICK_WATCHER->stop;	337	$TICK_WATCHER->stop;
324	$guard	338	$guard
325	}	339	}
326		340
327	=item cf::get_slot $time[, $priority]	341	=item cf::get_slot $time[, $priority[, $name]]
328		342
329	Allocate $time seconds of blocking CPU time at priority C<$priority>:	343	Allocate $time seconds of blocking CPU time at priority C<$priority>:
330	This call blocks and returns only when you have at least C<$time> seconds	344	This call blocks and returns only when you have at least C<$time> seconds
331	of cpu time till the next tick. The slot is only valid till the next cede.	345	of cpu time till the next tick. The slot is only valid till the next cede.
332		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
333	Useful for short background jobs.	350	Useful for short background jobs.
334		351
335	=cut	352	=cut
336		353
337	our @SLOT_QUEUE;	354	our @SLOT_QUEUE;
338	our $SLOT_QUEUE;	355	our $SLOT_QUEUE;
339		356
340	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	357	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
341	$SLOT_QUEUE = Coro::async {	358	$SLOT_QUEUE = Coro::async {
		359	$Coro::current->desc ("timeslot manager");
		360
342	my $signal = new Coro::Signal;	361	my $signal = new Coro::Signal;
343		362
344	while () {	363	while () {
345	next_job:	364	next_job:
346	my $avail = cf::till_tick;	365	my $avail = cf::till_tick;
…		…
363	Coro::schedule;	382	Coro::schedule;
364	}	383	}
365	}	384	}
366	};	385	};
367		386
368	sub get_slot($;$) {	387	sub get_slot($;$$) {
369	my ($time, $pri) = @_;	388	my ($time, $pri, $name) = @_;
370		389
		390	$time = $TICK * .6 if $time > $TICK * .6;
		391	my $sig = new Coro::Signal;
		392
371	push @SLOT_QUEUE, [$time, $pri, my $sig = new Coro::Signal];	393	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
372	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	394	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
373	$SLOT_QUEUE->ready;	395	$SLOT_QUEUE->ready;
374	$sig->wait;	396	$sig->wait;
375	}	397	}
376		398
…		…
413		435
414	my $busy = 1;	436	my $busy = 1;
415	my @res;	437	my @res;
416		438
417	(async {	439	(async {
		440	$Coro::current->desc ("sync job coro");
418	@res = eval { $job->() };	441	@res = eval { $job->() };
419	warn $@ if $@;	442	warn $@ if $@;
420	undef $busy;	443	undef $busy;
421	})->prio (Coro::PRIO_MAX);	444	})->prio (Coro::PRIO_MAX);
422		445
…		…
466	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
467	never block itself or use any form of Event handling.	490	never block itself or use any form of Event handling.
468		491
469	=cut	492	=cut
470		493
471	sub _store_scalar {
472	open my $fh, ">", \my $buf
473	or die "fork_call: cannot open fh-to-buf in child : $!";
474	Storable::store_fd $_[0], $fh;
475	close $fh;
476
477	$buf
478	}
479
480	sub fork_call(&@) {	494	sub fork_call(&@) {
481	my ($cb, @args) = @_;	495	my ($cb, @args) = @_;
482		496
483	# 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,
484	# or die "socketpair: $!";	498	# otherwise perl prematurely frees the stuff :/
485	pipe my $fh1, my $fh2	499	# TODO: investigate and fix (likely this will be rather laborious)
486	or die "pipe: $!";
487		500
488	if (my $pid = fork) {	501	my @res = Coro::Util::fork_eval {
489	close $fh2;
490
491	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
492	warn "pst<$res>" unless $res =~ /^pst/;
493	$res = Coro::Storable::thaw $res;
494
495	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
496
497	Carp::confess $$res unless "ARRAY" eq ref $res;
498
499	return wantarray ? @$res : $res->[-1];
500	} else {
501	reset_signals;	502	reset_signals;
502	local $SIG{__WARN__};	503	&$cb
503	local $SIG{__DIE__};	504	}, @args;
504	# just in case, this hack effectively disables event
505	# in the child. cleaner and slower would be canceling all watchers,
506	# but this works for the time being.
507	local $Coro::idle;
508	$Coro::current->prio (Coro::PRIO_MAX);
509		505
510	eval {	506	wantarray ? @res : $res[-1]
511	close $fh1;
512
513	my @res = eval { $cb->(@args) };
514
515	syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
516	close $fh2;
517	};
518
519	warn $@ if $@;
520	_exit 0;
521	}
522	}	507	}
523		508
524	=item $value = cf::db_get $family => $key	509	=item $value = cf::db_get $family => $key
525		510
526	Returns a single value from the environment database.	511	Returns a single value from the environment database.
…		…
528	=item cf::db_put $family => $key => $value	513	=item cf::db_put $family => $key => $value
529		514
530	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
531	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).
532		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
533	=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	}
534		541
535	our $DB;	542	our $DB;
536		543
537	sub db_init {	544	sub db_init {
538	unless ($DB) {
539	$DB = BDB::db_create $DB_ENV;
540
541	cf::sync_job {	545	cf::sync_job {
542	eval {	546	$DB ||= db_table "db";
543	$DB->set_flags (BDB::CHKSUM);
544
545	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
546	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
547	cf::cleanup "db_open(db): $!" if $!;
548	};
549	cf::cleanup "db_open(db): $@" if $@;
550	};
551	}	547	};
552	}	548	}
553		549
554	sub db_get($$) {	550	sub db_get($$) {
555	my $key = "$_[0]/$_[1]";	551	my $key = "$_[0]/$_[1]";
556		552
…		…
606	if (1) {	602	if (1) {
607	$md5 =	603	$md5 =
608	join "\x00",	604	join "\x00",
609	$processversion,	605	$processversion,
610	map {	606	map {
611	Coro::cede;	607	cf::cede_to_tick;
612	($src->[$_], Digest::MD5::md5_hex $data[$_])	608	($src->[$_], Digest::MD5::md5_hex $data[$_])
613	} 0.. $#$src;	609	} 0.. $#$src;
614		610
615		611
616	my $dbmd5 = db_get cache => "$id/md5";	612	my $dbmd5 = db_get cache => "$id/md5";
…		…
1035	sub object_freezer_save {	1031	sub object_freezer_save {
1036	my ($filename, $rdata, $objs) = @_;	1032	my ($filename, $rdata, $objs) = @_;
1037		1033
1038	sync_job {	1034	sync_job {
1039	if (length $$rdata) {	1035	if (length $$rdata) {
		1036	utf8::decode (my $decname = $filename);
1040	warn sprintf "saving %s (%d,%d)\n",	1037	warn sprintf "saving %s (%d,%d)\n",
1041	$filename, length $$rdata, scalar @$objs;	1038	$decname, length $$rdata, scalar @$objs;
1042		1039
1043	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1040	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1044	chmod SAVE_MODE, $fh;	1041	chmod SAVE_MODE, $fh;
1045	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1042	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1046	aio_fsync $fh if $cf::USE_FSYNC;	1043	aio_fsync $fh if $cf::USE_FSYNC;
…		…
1065	}	1062	}
1066	} else {	1063	} else {
1067	aio_unlink $filename;	1064	aio_unlink $filename;
1068	aio_unlink "$filename.pst";	1065	aio_unlink "$filename.pst";
1069	}	1066	}
1070	}	1067	};
1071	}	1068	}
1072		1069
1073	sub object_freezer_as_string {	1070	sub object_freezer_as_string {
1074	my ($rdata, $objs) = @_;	1071	my ($rdata, $objs) = @_;
1075		1072
…		…
1087	or return;	1084	or return;
1088		1085
1089	unless (aio_stat "$filename.pst") {	1086	unless (aio_stat "$filename.pst") {
1090	(aio_load "$filename.pst", $av) >= 0	1087	(aio_load "$filename.pst", $av) >= 0
1091	or return;	1088	or return;
		1089
1092	$av = eval { (Storable::thaw $av)->{objs} };	1090	$av = eval { (Storable::thaw $av)->{objs} };
1093	}	1091	}
1094		1092
		1093	utf8::decode (my $decname = $filename);
1095	warn sprintf "loading %s (%d)\n",	1094	warn sprintf "loading %s (%d,%d)\n",
1096	$filename, length $data, scalar @{$av || []};	1095	$decname, length $data, scalar @{$av || []};
		1096
1097	return ($data, $av);	1097	($data, $av)
1098	}	1098	}
1099		1099
1100	=head2 COMMAND CALLBACKS	1100	=head2 COMMAND CALLBACKS
1101		1101
1102	=over 4	1102	=over 4
…		…
1175	my ($pl, $buf) = @_;	1175	my ($pl, $buf) = @_;
1176		1176
1177	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1177	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1178		1178
1179	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
1180	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1187	if (my $cb = $EXTCMD{$type}) {
1181	if (my %reply = $cb->($pl, $msg)) {	1188	@reply = $cb->($pl, @payload);
1182	$pl->ext_reply ($msg->{msgid}, %reply);
1183	}
1184	}	1189	}
		1190
		1191	$pl->ext_reply ($reply, @reply)
		1192	if $reply;
		1193
1185	} else {	1194	} else {
1186	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1195	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1187	}	1196	}
1188		1197
1189	cf::override;	1198	cf::override;
…		…
1279		1288
1280	=head3 cf::player	1289	=head3 cf::player
1281		1290
1282	=over 4	1291	=over 4
1283		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
1284	=item cf::player::find $login	1307	=item cf::player::find $login
1285		1308
1286	Returns the given player object, loading it if necessary (might block).	1309	Returns the given player object, loading it if necessary (might block).
1287		1310
1288	=cut	1311	=cut
…		…
1323	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1346	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1324	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1347	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1325	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1348	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1326	aio_unlink +(playerdir $login) . "/$login.pl";	1349	aio_unlink +(playerdir $login) . "/$login.pl";
1327		1350
1328	my $pl = load_pl path $login	1351	my $f = new_from_file cf::object::thawer path $login
1329	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;
1330	$cf::PLAYER{$login} = $pl	1358	$cf::PLAYER{$login} = $pl
1331	}	1359	}
1332	}	1360	}
1333	}	1361	}
1334		1362
…		…
1344		1372
1345	aio_mkdir playerdir $pl, 0770;	1373	aio_mkdir playerdir $pl, 0770;
1346	$pl->{last_save} = $cf::RUNTIME;	1374	$pl->{last_save} = $cf::RUNTIME;
1347		1375
1348	$pl->save_pl ($path);	1376	$pl->save_pl ($path);
1349	Coro::cede;	1377	cf::cede_to_tick;
1350	}	1378	}
1351		1379
1352	sub new($) {	1380	sub new($) {
1353	my ($login) = @_;	1381	my ($login) = @_;
1354		1382
…		…
1358	$self->{deny_save} = 1;	1386	$self->{deny_save} = 1;
1359		1387
1360	$cf::PLAYER{$login} = $self;	1388	$cf::PLAYER{$login} = $self;
1361		1389
1362	$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 (@_);
1363	}	1401	}
1364		1402
1365	=item $pl->quit_character	1403	=item $pl->quit_character
1366		1404
1367	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
…		…
1422	or return [];	1460	or return [];
1423		1461
1424	my @logins;	1462	my @logins;
1425		1463
1426	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") {
1427	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1469	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1428	aio_read $fh, 0, 512, my $buf, 0 or next;	1470	aio_read $fh, 0, 512, my $buf, 0 or next;
1429	$buf !~ /^password -------------$/m or next; # official not-valid tag	1471	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1472	}
1430		1473
1431	utf8::decode $login;	1474	utf8::decode $login;
1432	push @logins, $login;	1475	push @logins, $login;
1433	}	1476	}
1434		1477
…		…
1472	sub expand_cfpod {	1515	sub expand_cfpod {
1473	((my $self), (local $_)) = @_;	1516	((my $self), (local $_)) = @_;
1474		1517
1475	# escape & and <	1518	# escape & and <
1476	s/&/&amp;/g;	1519	s/&/&amp;/g;
1477	s/(?<![BIUGH])</&lt;/g;	1520	s/(?<![BIUGHT])</&lt;/g;
1478		1521
1479	# 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
1480		1523
1481	1 while	1524	1 while
1482	# replace B<>, I<>, U<> etc.	1525	# replace B<>, I<>, U<> etc.
1483	s/B<([^\>]*)>/<b>$1<\/b>/	1526	s/B<([^\>]*)>/<b>$1<\/b>/
1484	|| s/I<([^\>]*)>/<i>$1<\/i>/	1527	|| s/I<([^\>]*)>/<i>$1<\/i>/
1485	|| s/U<([^\>]*)>/<u>$1<\/u>/	1528	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1529	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1486	# replace G<male|female> tags	1530	# replace G<male|female> tags
1487	|| s{G<([^>|]*)\|([^>]*)>}{	1531	|| s{G<([^>|]*)\|([^>]*)>}{
1488	$self->gender ? $2 : $1	1532	$self->gender ? $2 : $1
1489	}ge	1533	}ge
1490	# replace H<hint text>	1534	# replace H<hint text>
…		…
1511	sub hintmode {	1555	sub hintmode {
1512	$_[0]{hintmode} = $_[1] if @_ > 1;	1556	$_[0]{hintmode} = $_[1] if @_ > 1;
1513	$_[0]{hintmode}	1557	$_[0]{hintmode}
1514	}	1558	}
1515		1559
1516	=item $player->ext_reply ($msgid, %msg)	1560	=item $player->ext_reply ($msgid, @msg)
1517		1561
1518	Sends an ext reply to the player.	1562	Sends an ext reply to the player.
1519		1563
1520	=cut	1564	=cut
1521		1565
1522	sub ext_reply($$%) {	1566	sub ext_reply($$@) {
1523	my ($self, $id, %msg) = @_;	1567	my ($self, $id, @msg) = @_;
1524		1568
1525	$msg{msgid} = $id;	1569	$self->ns->ext_reply ($id, @msg)
1526	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1527	}	1570	}
1528		1571
1529	=item $player->ext_event ($type, %msg)	1572	=item $player->ext_msg ($type, @msg)
1530		1573
1531	Sends an ext event to the client.	1574	Sends an ext event to the client.
1532		1575
1533	=cut	1576	=cut
1534		1577
1535	sub ext_event($$%) {	1578	sub ext_msg($$@) {
1536	my ($self, $type, %msg) = @_;	1579	my ($self, $type, @msg) = @_;
1537		1580
1538	$self->ns->ext_event ($type, %msg);	1581	$self->ns->ext_msg ($type, @msg);
1539	}	1582	}
1540		1583
1541	=head3 cf::region	1584	=head3 cf::region
1542		1585
1543	=over 4	1586	=over 4
…		…
1759		1802
1760	sub load_header_from($) {	1803	sub load_header_from($) {
1761	my ($self, $path) = @_;	1804	my ($self, $path) = @_;
1762		1805
1763	utf8::encode $path;	1806	utf8::encode $path;
1764	#aio_open $path, O_RDONLY, 0	1807	my $f = new_from_file cf::object::thawer $path
1765	# or return;
1766
1767	$self->_load_header ($path)
1768	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;
1769		1815
1770	$self->{load_path} = $path;	1816	$self->{load_path} = $path;
1771		1817
1772	1	1818	1
1773	}	1819	}
…		…
1827	sub find {	1873	sub find {
1828	my ($path, $origin) = @_;	1874	my ($path, $origin) = @_;
1829		1875
1830	$path = normalise $path, $origin && $origin->path;	1876	$path = normalise $path, $origin && $origin->path;
1831		1877
		1878	cf::lock_wait "map_data:$path";#d#remove
1832	cf::lock_wait "map_find:$path";	1879	cf::lock_wait "map_find:$path";
1833		1880
1834	$cf::MAP{$path} || do {	1881	$cf::MAP{$path} || do {
1835	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
1836	my $map = new_from_path cf::map $path	1885	my $map = new_from_path cf::map $path
1837	or return;	1886	or return;
1838		1887
1839	$map->{last_save} = $cf::RUNTIME;	1888	$map->{last_save} = $cf::RUNTIME;
1840		1889
…		…
1842	or return;	1891	or return;
1843		1892
1844	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1893	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1845	# doing this can freeze the server in a sync job, obviously	1894	# doing this can freeze the server in a sync job, obviously
1846	#$cf::WAIT_FOR_TICK->wait;	1895	#$cf::WAIT_FOR_TICK->wait;
		1896	undef $guard1;
		1897	undef $guard2;
1847	$map->reset;	1898	$map->reset;
1848	undef $guard;
1849	return find $path;	1899	return find $path;
1850	}	1900	}
1851		1901
1852	$cf::MAP{$path} = $map	1902	$cf::MAP{$path} = $map
1853	}	1903	}
…		…
1862	local $self->{deny_reset} = 1; # loading can take a long time	1912	local $self->{deny_reset} = 1; # loading can take a long time
1863		1913
1864	my $path = $self->{path};	1914	my $path = $self->{path};
1865		1915
1866	{	1916	{
1867	my $guard = cf::lock_acquire "map_load:$path";	1917	my $guard = cf::lock_acquire "map_data:$path";
1868		1918
		1919	return unless $self->valid;
1869	return if $self->in_memory != cf::MAP_SWAPPED;	1920	return unless $self->in_memory == cf::MAP_SWAPPED;
1870		1921
1871	$self->in_memory (cf::MAP_LOADING);	1922	$self->in_memory (cf::MAP_LOADING);
1872		1923
1873	$self->alloc;	1924	$self->alloc;
1874		1925
1875	$self->pre_load;	1926	$self->pre_load;
1876	Coro::cede;	1927	cf::cede_to_tick;
1877		1928
		1929	my $f = new_from_file cf::object::thawer $self->{load_path};
		1930	$f->skip_block;
1878	$self->_load_objects ($self->{load_path}, 1)	1931	$self->_load_objects ($f)
1879	or return;	1932	or return;
1880		1933
1881	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1934	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1882	if delete $self->{load_original};	1935	if delete $self->{load_original};
1883		1936
1884	if (my $uniq = $self->uniq_path) {	1937	if (my $uniq = $self->uniq_path) {
1885	utf8::encode $uniq;	1938	utf8::encode $uniq;
1886	if (aio_open $uniq, O_RDONLY, 0) {	1939	unless (aio_stat $uniq) {
		1940	if (my $f = new_from_file cf::object::thawer $uniq) {
1887	$self->clear_unique_items;	1941	$self->clear_unique_items;
1888	$self->_load_objects ($uniq, 0);	1942	$self->_load_objects ($f);
		1943	$f->resolve_delayed_derefs;
		1944	}
1889	}	1945	}
1890	}	1946	}
1891		1947
1892	Coro::cede;	1948	$f->resolve_delayed_derefs;
		1949
		1950	cf::cede_to_tick;
1893	# now do the right thing for maps	1951	# now do the right thing for maps
1894	$self->link_multipart_objects;	1952	$self->link_multipart_objects;
1895	$self->difficulty ($self->estimate_difficulty)	1953	$self->difficulty ($self->estimate_difficulty)
1896	unless $self->difficulty;	1954	unless $self->difficulty;
1897	Coro::cede;	1955	cf::cede_to_tick;
1898		1956
1899	unless ($self->{deny_activate}) {	1957	unless ($self->{deny_activate}) {
1900	$self->decay_objects;	1958	$self->decay_objects;
1901	$self->fix_auto_apply;	1959	$self->fix_auto_apply;
1902	$self->update_buttons;	1960	$self->update_buttons;
1903	Coro::cede;	1961	cf::cede_to_tick;
1904	$self->set_darkness_map;	1962	$self->set_darkness_map;
1905	Coro::cede;	1963	cf::cede_to_tick;
1906	$self->activate;	1964	$self->activate;
1907	}	1965	}
		1966
		1967	$self->{last_save} = $cf::RUNTIME;
		1968	$self->last_access ($cf::RUNTIME);
1908		1969
1909	$self->in_memory (cf::MAP_IN_MEMORY);	1970	$self->in_memory (cf::MAP_IN_MEMORY);
1910	}	1971	}
1911		1972
1912	$self->post_load;	1973	$self->post_load;
…		…
1923		1984
1924	$self	1985	$self
1925	}	1986	}
1926		1987
1927	# 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
1928	sub load_diag {	1989	sub load_neighbours {
1929	my ($map) = @_;	1990	my ($map) = @_;
1930		1991
1931	my @diag; # diagonal neighbours	1992	my @neigh; # diagonal neighbours
1932		1993
1933	for (0 .. 3) {	1994	for (0 .. 3) {
1934	my $neigh = $map->tile_path ($_)	1995	my $neigh = $map->tile_path ($_)
1935	or next;	1996	or next;
1936	$neigh = find $neigh, $map	1997	$neigh = find $neigh, $map
1937	or next;	1998	or next;
1938	$neigh->load;	1999	$neigh->load;
1939		2000
		2001	push @neigh,
1940	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2002	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1941	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2003	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1942	}	2004	}
1943		2005
1944	for (@diag) {	2006	for (grep defined $_->[0], @neigh) {
		2007	my ($path, $origin) = @$_;
1945	my $neigh = find @$_	2008	my $neigh = find $path, $origin
1946	or next;	2009	or next;
1947	$neigh->load;	2010	$neigh->load;
1948	}	2011	}
1949	}	2012	}
1950		2013
…		…
1955	}	2018	}
1956		2019
1957	sub do_load_sync {	2020	sub do_load_sync {
1958	my ($map) = @_;	2021	my ($map) = @_;
1959		2022
		2023	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2024	if $Coro::current == $Coro::main;
		2025
1960	cf::sync_job { $map->load };	2026	cf::sync_job { $map->load };
1961	}	2027	}
1962		2028
1963	our %MAP_PREFETCH;	2029	our %MAP_PREFETCH;
1964	our $MAP_PREFETCHER = undef;	2030	our $MAP_PREFETCHER = undef;
1965		2031
1966	sub find_async {	2032	sub find_async {
1967	my ($path, $origin) = @_;	2033	my ($path, $origin, $load) = @_;
1968		2034
1969	$path = normalise $path, $origin && $origin->{path};	2035	$path = normalise $path, $origin && $origin->{path};
1970		2036
1971	if (my $map = $cf::MAP{$path}) {	2037	if (my $map = $cf::MAP{$path}) {
1972	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2038	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1973	}	2039	}
1974		2040
1975	undef $MAP_PREFETCH{$path};	2041	$MAP_PREFETCH{$path} |= $load;
		2042
1976	$MAP_PREFETCHER ||= cf::async {	2043	$MAP_PREFETCHER ||= cf::async {
		2044	$Coro::current->{desc} = "map prefetcher";
		2045
1977	while (%MAP_PREFETCH) {	2046	while (%MAP_PREFETCH) {
1978	for my $path (keys %MAP_PREFETCH) {	2047	while (my ($k, $v) = each %MAP_PREFETCH) {
1979	if (my $map = find $path) {	2048	if (my $map = find $k) {
1980	$map->load;	2049	$map->load if $v;
1981	}	2050	}
1982		2051
1983	delete $MAP_PREFETCH{$path};	2052	delete $MAP_PREFETCH{$k};
1984	}	2053	}
1985	}	2054	}
1986	undef $MAP_PREFETCHER;	2055	undef $MAP_PREFETCHER;
1987	};	2056	};
1988	$MAP_PREFETCHER->prio (6);	2057	$MAP_PREFETCHER->prio (6);
…		…
1991	}	2060	}
1992		2061
1993	sub save {	2062	sub save {
1994	my ($self) = @_;	2063	my ($self) = @_;
1995		2064
1996	my $lock = cf::lock_acquire "map_data:" . $self->path;	2065	my $lock = cf::lock_acquire "map_data:$self->{path}";
1997		2066
1998	$self->{last_save} = $cf::RUNTIME;	2067	$self->{last_save} = $cf::RUNTIME;
1999		2068
2000	return unless $self->dirty;	2069	return unless $self->dirty;
2001		2070
…		…
2007	return if $self->{deny_save};	2076	return if $self->{deny_save};
2008		2077
2009	local $self->{last_access} = $self->last_access;#d#	2078	local $self->{last_access} = $self->last_access;#d#
2010		2079
2011	cf::async {	2080	cf::async {
		2081	$Coro::current->{desc} = "map player save";
2012	$_->contr->save for $self->players;	2082	$_->contr->save for $self->players;
2013	};	2083	};
2014		2084
2015	if ($uniq) {	2085	if ($uniq) {
2016	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2086	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
2024	my ($self) = @_;	2094	my ($self) = @_;
2025		2095
2026	# save first because save cedes	2096	# save first because save cedes
2027	$self->save;	2097	$self->save;
2028		2098
2029	my $lock = cf::lock_acquire "map_data:" . $self->path;	2099	my $lock = cf::lock_acquire "map_data:$self->{path}";
2030		2100
2031	return if $self->players;	2101	return if $self->players;
2032	return if $self->in_memory != cf::MAP_IN_MEMORY;	2102	return if $self->in_memory != cf::MAP_IN_MEMORY;
2033	return if $self->{deny_save};	2103	return if $self->{deny_save};
2034		2104
		2105	$self->in_memory (cf::MAP_SWAPPED);
		2106
		2107	$self->deactivate;
		2108	$_->clear_links_to ($self) for values %cf::MAP;
2035	$self->clear;	2109	$self->clear;
2036	$self->in_memory (cf::MAP_SWAPPED);
2037	}	2110	}
2038		2111
2039	sub reset_at {	2112	sub reset_at {
2040	my ($self) = @_;	2113	my ($self) = @_;
2041		2114
…		…
2073	if $uniq;	2146	if $uniq;
2074	}	2147	}
2075		2148
2076	delete $cf::MAP{$self->path};	2149	delete $cf::MAP{$self->path};
2077		2150
		2151	$self->deactivate;
		2152	$_->clear_links_to ($self) for values %cf::MAP;
2078	$self->clear;	2153	$self->clear;
2079
2080	$_->clear_links_to ($self) for values %cf::MAP;
2081		2154
2082	$self->unlink_save;	2155	$self->unlink_save;
2083	$self->destroy;	2156	$self->destroy;
2084	}	2157	}
2085		2158
2086	my $nuke_counter = "aaaa";	2159	my $nuke_counter = "aaaa";
2087		2160
2088	sub nuke {	2161	sub nuke {
2089	my ($self) = @_;	2162	my ($self) = @_;
2090		2163
		2164	{
		2165	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2166
2091	delete $cf::MAP{$self->path};	2167	delete $cf::MAP{$self->path};
2092		2168
2093	$self->unlink_save;	2169	$self->unlink_save;
2094		2170
2095	bless $self, "cf::map";	2171	bless $self, "cf::map";
2096	delete $self->{deny_reset};	2172	delete $self->{deny_reset};
2097	$self->{deny_save} = 1;	2173	$self->{deny_save} = 1;
2098	$self->reset_timeout (1);	2174	$self->reset_timeout (1);
2099	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2175	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100		2176
2101	$cf::MAP{$self->path} = $self;	2177	$cf::MAP{$self->path} = $self;
		2178	}
2102		2179
2103	$self->reset; # polite request, might not happen	2180	$self->reset; # polite request, might not happen
2104	}	2181	}
2105		2182
2106	=item $maps = cf::map::tmp_maps	2183	=item $maps = cf::map::tmp_maps
…		…
2182		2259
2183	sub inv_recursive {	2260	sub inv_recursive {
2184	inv_recursive_ inv $_[0]	2261	inv_recursive_ inv $_[0]
2185	}	2262	}
2186		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\.[0-9a-f]+>)/(.*)$}) {
		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
2187	package cf;	2295	package cf;
2188		2296
2189	=back	2297	=back
2190		2298
2191	=head3 cf::object::player	2299	=head3 cf::object::player
…		…
2213		2321
2214	} else {	2322	} else {
2215	my $pl = $self->contr;	2323	my $pl = $self->contr;
2216		2324
2217	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2325	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218	my $diag = $pl->{npc_dialog};	2326	my $dialog = $pl->{npc_dialog};
2219	$diag->{pl}->ext_reply (	2327	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220	$diag->{id},
2221	msgtype => "reply",
2222	msg => $diag->{pl}->expand_cfpod ($msg),
2223	add_topics => []
2224	);
2225		2328
2226	} else {	2329	} else {
2227	$msg = $npc->name . " says: $msg" if $npc;	2330	$msg = $npc->name . " says: $msg" if $npc;
2228	$self->message ($msg, $flags);	2331	$self->message ($msg, $flags);
2229	}	2332	}
2230	}	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 (@_);
2231	}	2344	}
2232		2345
2233	=item $player_object->may ("access")	2346	=item $player_object->may ("access")
2234		2347
2235	Returns wether the given player is authorized to access resource "access"	2348	Returns wether the given player is authorized to access resource "access"
…		…
2314	# use -1 or undef as default coordinates, not 0, 0	2427	# use -1 or undef as default coordinates, not 0, 0
2315	($x, $y) = ($map->enter_x, $map->enter_y)	2428	($x, $y) = ($map->enter_x, $map->enter_y)
2316	if $x <=0 && $y <= 0;	2429	if $x <=0 && $y <= 0;
2317		2430
2318	$map->load;	2431	$map->load;
2319	$map->load_diag;	2432	$map->load_neighbours;
2320		2433
2321	return unless $self->contr->active;	2434	return unless $self->contr->active;
2322	$self->activate_recursive;	2435	$self->activate_recursive;
2323		2436
2324	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2437	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
…		…
2344	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2457	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2345		2458
2346	$self->enter_link;	2459	$self->enter_link;
2347		2460
2348	(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
2349	my $map = eval {	2483	my $map = eval {
2350	my $map = cf::map::find $path;	2484	my $map = defined $path ? cf::map::find $path : undef;
2351		2485
2352	if ($map) {	2486	if ($map) {
2353	$map = $map->customise_for ($self);	2487	$map = $map->customise_for ($self);
2354	$map = $check->($map) if $check && $map;	2488	$map = $check->($map) if $check && $map;
2355	} else {	2489	} else {
2356	$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);
2357	}	2491	}
2358		2492
2359	$map	2493	$map
2360	};	2494	};
2361		2495
…		…
2451	# if exit is damned, update players death & WoR home-position	2585	# if exit is damned, update players death & WoR home-position
2452	$self->contr->savebed ($slaying, $hp, $sp)	2586	$self->contr->savebed ($slaying, $hp, $sp)
2453	if $exit->flag (FLAG_DAMNED);	2587	if $exit->flag (FLAG_DAMNED);
2454		2588
2455	(async {	2589	(async {
		2590	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2591
2456	$self->deactivate_recursive; # just to be sure	2592	$self->deactivate_recursive; # just to be sure
2457	unless (eval {	2593	unless (eval {
2458	$self->goto ($slaying, $hp, $sp);	2594	$self->goto ($slaying, $hp, $sp);
2459		2595
2460	1;	2596	1;
…		…
2495	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
2496	the message unless the client supports the msg packet.	2632	the message unless the client supports the msg packet.
2497		2633
2498	=cut	2634	=cut
2499		2635
		2636	our %CHANNEL = (
		2637	"c/identify" => {
		2638	id => "infobox",
		2639	title => "Identify",
		2640	reply => undef,
		2641	tooltip => "Items recently identified",
		2642	},
		2643	"c/examine" => {
		2644	id => "infobox",
		2645	title => "Examine",
		2646	reply => undef,
		2647	tooltip => "Signs and other items you examined",
		2648	},
		2649	"c/lookat" => {
		2650	id => "infobox",
		2651	title => "Look",
		2652	reply => undef,
		2653	tooltip => "What you saw there",
		2654	},
		2655	);
		2656
2500	sub cf::client::send_msg {	2657	sub cf::client::send_msg {
2501	my ($self, $channel, $msg, $color, @extra) = @_;	2658	my ($self, $channel, $msg, $color, @extra) = @_;
2502		2659
2503	$msg = $self->pl->expand_cfpod ($msg);	2660	$msg = $self->pl->expand_cfpod ($msg);
2504		2661
2505	$color &= ~cf::NDI_UNIQUE; # just in case...	2662	$color &= cf::NDI_CLIENT_MASK; # just in case...
2506		2663
		2664	# check predefined channels, for the benefit of C
		2665	if ($CHANNEL{$channel}) {
		2666	$channel = $CHANNEL{$channel};
		2667
		2668	$self->ext_msg (channel_info => $channel)
		2669	if $self->can_msg;
		2670
		2671	$channel = $channel->{id};
		2672
2507	if (ref $channel) {	2673	} elsif (ref $channel) {
2508	# send meta info to client, if not yet sent	2674	# send meta info to client, if not yet sent
2509	unless (exists $self->{channel}{$channel->{id}}) {	2675	unless (exists $self->{channel}{$channel->{id}}) {
2510	$self->{channel}{$channel->{id}} = $channel;	2676	$self->{channel}{$channel->{id}} = $channel;
2511	$self->ext_event (channel_info => %$channel);	2677	$self->ext_msg (channel_info => $channel)
		2678	if $self->can_msg;
2512	}	2679	}
2513		2680
2514	$channel = $channel->{id};	2681	$channel = $channel->{id};
2515	}	2682	}
2516		2683
2517	return unless @extra || length $msg;	2684	return unless @extra || length $msg;
2518		2685
2519	if ($self->can_msg) {	2686	if ($self->can_msg) {
		2687	# default colour, mask it out
		2688	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2689	if $color & cf::NDI_DEF;
		2690
2520	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));	2691	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2692	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2521	} else {	2693	} else {
2522	# replace some tags by gcfclient-compatible ones
2523	for ($msg) {
2524	1 while
2525	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530	}
2531
2532	if ($color >= 0) {	2694	if ($color >= 0) {
		2695	# replace some tags by gcfclient-compatible ones
		2696	for ($msg) {
		2697	1 while
		2698	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2699	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2700	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2701	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2702	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2703	}
		2704
		2705	$color &= cf::NDI_COLOR_MASK;
		2706
		2707	utf8::encode $msg;
		2708
2533	if (0 && $msg =~ /\[/) {	2709	if (0 && $msg =~ /\[/) {
		2710	# COMMAND/INFO
2534	$self->send_packet ("drawextinfo $color 4 0 $msg")	2711	$self->send_packet ("drawextinfo $color 10 8 $msg")
2535	} else {	2712	} else {
2536	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	2713	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2537	$self->send_packet ("drawinfo $color $msg")	2714	$self->send_packet ("drawinfo $color $msg")
2538	}	2715	}
2539	}	2716	}
2540	}	2717	}
2541	}	2718	}
2542		2719
2543	=item $client->ext_event ($type, %msg)	2720	=item $client->ext_msg ($type, @msg)
2544		2721
2545	Sends an ext event to the client.	2722	Sends an ext event to the client.
2546		2723
2547	=cut	2724	=cut
2548		2725
2549	sub cf::client::ext_event($$%) {	2726	sub cf::client::ext_msg($$@) {
2550	my ($self, $type, %msg) = @_;	2727	my ($self, $type, @msg) = @_;
2551		2728
2552	return unless $self->extcmd;	2729	if ($self->extcmd == 2) {
2553		2730	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2731	} elsif ($self->extcmd == 1) { # TODO: remove
2554	$msg{msgtype} = "event_$type";	2732	push @msg, msgtype => "event_$type";
2555	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2733	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2734	}
		2735	}
		2736
		2737	=item $client->ext_reply ($msgid, @msg)
		2738
		2739	Sends an ext reply to the client.
		2740
		2741	=cut
		2742
		2743	sub cf::client::ext_reply($$@) {
		2744	my ($self, $id, @msg) = @_;
		2745
		2746	if ($self->extcmd == 2) {
		2747	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2748	} elsif ($self->extcmd == 1) {
		2749	#TODO: version 1, remove
		2750	unshift @msg, msgtype => "reply", msgid => $id;
		2751	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2752	}
2556	}	2753	}
2557		2754
2558	=item $success = $client->query ($flags, "text", \&cb)	2755	=item $success = $client->query ($flags, "text", \&cb)
2559		2756
2560	Queues a query to the client, calling the given callback with	2757	Queues a query to the client, calling the given callback with
…		…
2615	my ($ns, $buf) = @_;	2812	my ($ns, $buf) = @_;
2616		2813
2617	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2814	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618		2815
2619	if (ref $msg) {	2816	if (ref $msg) {
		2817	my ($type, $reply, @payload) =
		2818	"ARRAY" eq ref $msg
		2819	? @$msg
		2820	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2821
		2822	my @reply;
		2823
2620	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2824	if (my $cb = $EXTICMD{$type}) {
2621	if (my %reply = $cb->($ns, $msg)) {	2825	@reply = $cb->($ns, @payload);
2622	$reply{msgid} = $msg->{msgid};
2623	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624	}
2625	}	2826	}
		2827
		2828	$ns->ext_reply ($reply, @reply)
		2829	if $reply;
		2830
2626	} else {	2831	} else {
2627	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2832	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2628	}	2833	}
2629		2834
2630	cf::override;	2835	cf::override;
…		…
2677	our $safe = new Safe "safe";	2882	our $safe = new Safe "safe";
2678	our $safe_hole = new Safe::Hole;	2883	our $safe_hole = new Safe::Hole;
2679		2884
2680	$SIG{FPE} = 'IGNORE';	2885	$SIG{FPE} = 'IGNORE';
2681		2886
2682	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2887	$safe->permit_only (Opcode::opset qw(
		2888	:base_core :base_mem :base_orig :base_math
		2889	grepstart grepwhile mapstart mapwhile
		2890	sort time
		2891	));
2683		2892
2684	# here we export the classes and methods available to script code	2893	# here we export the classes and methods available to script code
2685		2894
2686	=pod	2895	=pod
2687		2896
2688	The following functions and methods are available within a safe environment:	2897	The following functions and methods are available within a safe environment:
2689		2898
2690	cf::object	2899	cf::object
2691	contr pay_amount pay_player map x y force_find force_add	2900	contr pay_amount pay_player map x y force_find force_add
2692	insert remove	2901	insert remove name archname title slaying race decrease_ob_nr
2693		2902
2694	cf::object::player	2903	cf::object::player
2695	player	2904	player
2696		2905
2697	cf::player	2906	cf::player
…		…
2702		2911
2703	=cut	2912	=cut
2704		2913
2705	for (	2914	for (
2706	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	2915	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2916	insert remove inv name archname title slaying race
2707	insert remove)],	2917	decrease_ob_nr)],
2708	["cf::object::player" => qw(player)],	2918	["cf::object::player" => qw(player)],
2709	["cf::player" => qw(peaceful)],	2919	["cf::player" => qw(peaceful)],
2710	["cf::map" => qw(trigger)],	2920	["cf::map" => qw(trigger)],
2711	) {	2921	) {
2712	no strict 'refs';	2922	no strict 'refs';
…		…
2788	# the server's init and main functions	2998	# the server's init and main functions
2789		2999
2790	sub load_facedata($) {	3000	sub load_facedata($) {
2791	my ($path) = @_;	3001	my ($path) = @_;
2792		3002
		3003	# HACK to clear player env face cache, we need some signal framework
		3004	# for this (global event?)
		3005	%ext::player_env::MUSIC_FACE_CACHE = ();
		3006
		3007	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3008
2793	warn "loading facedata from $path\n";	3009	warn "loading facedata from $path\n";
2794		3010
2795	my $facedata;	3011	my $facedata;
2796	0 < aio_load $path, $facedata	3012	0 < aio_load $path, $facedata
2797	or die "$path: $!";	3013	or die "$path: $!";
2798		3014
2799	$facedata = Coro::Storable::thaw $facedata;	3015	$facedata = Coro::Storable::thaw $facedata;
2800		3016
2801	$facedata->{version} == 2	3017	$facedata->{version} == 2
2802	or cf::cleanup "$path: version mismatch, cannot proceed.";	3018	or cf::cleanup "$path: version mismatch, cannot proceed.";
		3019
		3020	# patch in the exptable
		3021	$facedata->{resource}{"res/exp_table"} = {
		3022	type => FT_RSRC,
		3023	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3024	};
		3025	cf::cede_to_tick;
2803		3026
2804	{	3027	{
2805	my $faces = $facedata->{faceinfo};	3028	my $faces = $facedata->{faceinfo};
2806		3029
2807	while (my ($face, $info) = each %$faces) {	3030	while (my ($face, $info) = each %$faces) {
2808	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3031	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2809	cf::face::set_visibility $idx, $info->{visibility};	3032	cf::face::set_visibility $idx, $info->{visibility};
2810	cf::face::set_magicmap $idx, $info->{magicmap};	3033	cf::face::set_magicmap $idx, $info->{magicmap};
2811	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3034	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2812	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3035	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2813		3036
2814	cf::cede_to_tick;	3037	cf::cede_to_tick;
2815	}	3038	}
2816		3039
2817	while (my ($face, $info) = each %$faces) {	3040	while (my ($face, $info) = each %$faces) {
…		…
2842		3065
2843	{	3066	{
2844	# TODO: for gcfclient pleasure, we should give resources	3067	# TODO: for gcfclient pleasure, we should give resources
2845	# that gcfclient doesn't grok a >10000 face index.	3068	# that gcfclient doesn't grok a >10000 face index.
2846	my $res = $facedata->{resource};	3069	my $res = $facedata->{resource};
2847	my $enc = JSON::XS->new->utf8->canonical;	3070
		3071	my $soundconf = delete $res->{"res/sound.conf"};
2848		3072
2849	while (my ($name, $info) = each %$res) {	3073	while (my ($name, $info) = each %$res) {
2850	my $meta = $enc->encode ({
2851	name => $name,
2852	type => $info->{type},
2853	copyright => $info->{copyright}, #TODO#
2854	});
2855
2856	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3074	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3075	my $data;
2857		3076
2858	if ($name =~ /\.jpg$/) {	3077	if ($info->{type} & 1) {
2859	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack	3078	# prepend meta info
2860	cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack	3079
		3080	my $meta = $enc->encode ({
		3081	name => $name,
		3082	%{ $info->{meta} || {} },
		3083	});
		3084
		3085	$data = pack "(w/a*)*", $meta, $info->{data};
2861	} else {	3086	} else {
2862	my $data = pack "(w/a*)*", $meta, $info->{data};	3087	$data = $info->{data};
2863	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2864
2865	cf::face::set_type $idx, 1;
2866	cf::face::set_data $idx, 0, $data, $chk;
2867	}	3088	}
2868		3089
		3090	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3091	cf::face::set_type $idx, $info->{type};
		3092
2869	cf::cede_to_tick;	3093	cf::cede_to_tick;
2870	}	3094	}
		3095
		3096	if ($soundconf) {
		3097	$soundconf = $enc->decode (delete $soundconf->{data});
		3098
		3099	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3100	my $sound = $soundconf->{compat}[$_]
		3101	or next;
		3102
		3103	my $face = cf::face::find "sound/$sound->[1]";
		3104	cf::sound::set $sound->[0] => $face;
		3105	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3106	}
		3107
		3108	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3109	my $face = cf::face::find "sound/$v";
		3110	cf::sound::set $k => $face;
		3111	}
		3112	}
2871	}	3113	}
2872		3114
2873	1	3115	1
2874	}	3116	}
2875		3117
		3118	register_exticmd fx_want => sub {
		3119	my ($ns, $want) = @_;
		3120
		3121	while (my ($k, $v) = each %$want) {
		3122	$ns->fx_want ($k, $v);
		3123	}
		3124	};
		3125
2876	sub reload_regions {	3126	sub reload_regions {
		3127	# HACK to clear player env face cache, we need some signal framework
		3128	# for this (global event?)
		3129	%ext::player_env::MUSIC_FACE_CACHE = ();
		3130
2877	load_resource_file "$MAPDIR/regions"	3131	load_resource_file "$MAPDIR/regions"
2878	or die "unable to load regions file\n";	3132	or die "unable to load regions file\n";
2879		3133
2880	for (cf::region::list) {	3134	for (cf::region::list) {
2881	$_->{match} = qr/$_->{match}/	3135	$_->{match} = qr/$_->{match}/
…		…
2917		3171
2918	sub init {	3172	sub init {
2919	reload_resources;	3173	reload_resources;
2920	}	3174	}
2921		3175
2922	sub cfg_load {	3176	sub reload_config {
2923	open my $fh, "<:utf8", "$CONFDIR/config"	3177	open my $fh, "<:utf8", "$CONFDIR/config"
2924	or return;	3178	or return;
2925		3179
2926	local $/;	3180	local $/;
2927	*CFG = YAML::Syck::Load <$fh>;	3181	*CFG = YAML::Syck::Load <$fh>;
…		…
2943	sub main {	3197	sub main {
2944	# we must not ever block the main coroutine	3198	# we must not ever block the main coroutine
2945	local $Coro::idle = sub {	3199	local $Coro::idle = sub {
2946	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3200	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2947	(async {	3201	(async {
		3202	$Coro::current->{desc} = "IDLE BUG HANDLER";
2948	Event::one_event;	3203	Event::one_event;
2949	})->prio (Coro::PRIO_MAX);	3204	})->prio (Coro::PRIO_MAX);
2950	};	3205	};
2951		3206
2952	cfg_load;	3207	reload_config;
2953	db_init;	3208	db_init;
2954	load_extensions;	3209	load_extensions;
2955		3210
2956	$TICK_WATCHER->start;	3211	$TICK_WATCHER->start;
2957	Event::loop;	3212	Event::loop;
…		…
3150	warn "reloading cf.pm";	3405	warn "reloading cf.pm";
3151	require cf;	3406	require cf;
3152	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3407	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3153		3408
3154	warn "loading config and database again";	3409	warn "loading config and database again";
3155	cf::cfg_load;	3410	cf::reload_config;
3156		3411
3157	warn "loading extensions";	3412	warn "loading extensions";
3158	cf::load_extensions;	3413	cf::load_extensions;
3159		3414
3160	warn "reattaching attachments to objects/players";	3415	warn "reattaching attachments to objects/players";
…		…
3196	register_command "reload" => sub {	3451	register_command "reload" => sub {
3197	my ($who, $arg) = @_;	3452	my ($who, $arg) = @_;
3198		3453
3199	if ($who->flag (FLAG_WIZ)) {	3454	if ($who->flag (FLAG_WIZ)) {
3200	$who->message ("reloading server.");	3455	$who->message ("reloading server.");
		3456	async {
		3457	$Coro::current->{desc} = "perl_reload";
3201	async { reload_perl };	3458	reload_perl;
		3459	};
3202	}	3460	}
3203	};	3461	};
3204		3462
3205	unshift @INC, $LIBDIR;	3463	unshift @INC, $LIBDIR;
3206		3464
…		…
3225	my $signal = new Coro::Signal;	3483	my $signal = new Coro::Signal;
3226	push @WAIT_FOR_TICK_BEGIN, $signal;	3484	push @WAIT_FOR_TICK_BEGIN, $signal;
3227	$signal->wait;	3485	$signal->wait;
3228	}	3486	}
3229		3487
3230	my $min = 1e6;#d#
3231	my $avg = 10;
3232	$TICK_WATCHER = Event->timer (	3488	$TICK_WATCHER = Event->timer (
3233	reentrant => 0,	3489	reentrant => 0,
3234	parked => 1,	3490	parked => 1,
3235	prio => 0,	3491	prio => 0,
3236	at => $NEXT_TICK || $TICK,	3492	at => $NEXT_TICK || $TICK,
…		…
3244		3500
3245	$NOW = $tick_start = Event::time;	3501	$NOW = $tick_start = Event::time;
3246		3502
3247	cf::server_tick; # one server iteration	3503	cf::server_tick; # one server iteration
3248		3504
3249	0 && sync_job {#d#
3250	for(1..10) {
3251	my $t = Event::time;
3252	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3253	or die;
3254
3255	$map->width (50);
3256	$map->height (50);
3257	$map->alloc;
3258	$map->_load_objects ("/tmp/x.map", 1);
3259	my $t = Event::time - $t;
3260
3261	#next unless $t < 0.0013;#d#
3262	if ($t < $min) {
3263	$min = $t;
3264	}
3265	$avg = $avg * 0.99 + $t * 0.01;
3266	}
3267	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3268	exit 0;
3269	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3270	};
3271
3272	$RUNTIME += $TICK;	3505	$RUNTIME += $TICK;
3273	$NEXT_TICK += $TICK;	3506	$NEXT_TICK += $TICK;
3274		3507
3275	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3508	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3276	$NEXT_RUNTIME_WRITE = $NOW + 10;	3509	$NEXT_RUNTIME_WRITE = $NOW + 10;
3277	Coro::async_pool {	3510	Coro::async_pool {
		3511	$Coro::current->{desc} = "runtime saver";
3278	write_runtime	3512	write_runtime
3279	or warn "ERROR: unable to write runtime file: $!";	3513	or warn "ERROR: unable to write runtime file: $!";
3280	};	3514	};
3281	}	3515	}
3282		3516
3283	# my $AFTER = Event::time;
3284	# warn $AFTER - $NOW;#d#
3285
3286	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3517	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3287	$sig->send;	3518	$sig->send;
3288	}	3519	}
3289	while (my $sig = shift @WAIT_FOR_TICK) {	3520	while (my $sig = shift @WAIT_FOR_TICK) {
3290	$sig->send;	3521	$sig->send;
…		…
3300		3531
3301	$LOAD = ($NOW - $tick_start) / $TICK;	3532	$LOAD = ($NOW - $tick_start) / $TICK;
3302	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3533	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3303		3534
3304	_post_tick;	3535	_post_tick;
3305
3306
3307	},	3536	},
3308	);	3537	);
3309		3538
3310	{	3539	{
		3540	BDB::min_parallel 8;
3311	BDB::max_poll_time $TICK * 0.1;	3541	BDB::max_poll_time $TICK * 0.1;
3312	$BDB_POLL_WATCHER = Event->io (	3542	$BDB_POLL_WATCHER = Event->io (
3313	reentrant => 0,	3543	reentrant => 0,
3314	fd => BDB::poll_fileno,	3544	fd => BDB::poll_fileno,
3315	poll => 'r',	3545	poll => 'r',
3316	prio => 0,	3546	prio => 0,
3317	data => WF_AUTOCANCEL,	3547	data => WF_AUTOCANCEL,
3318	cb => \&BDB::poll_cb,	3548	cb => \&BDB::poll_cb,
3319	);	3549	);
3320	BDB::min_parallel 8;
3321		3550
3322	BDB::set_sync_prepare {	3551	BDB::set_sync_prepare {
3323	my $status;	3552	my $status;
3324	my $current = $Coro::current;	3553	my $current = $Coro::current;
3325	(	3554	(
…		…
3334	)	3563	)
3335	};	3564	};
3336		3565
3337	unless ($DB_ENV) {	3566	unless ($DB_ENV) {
3338	$DB_ENV = BDB::db_env_create;	3567	$DB_ENV = BDB::db_env_create;
		3568	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3569	| BDB::LOG_AUTOREMOVE, 1);
		3570	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3571	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3339		3572
3340	cf::sync_job {	3573	cf::sync_job {
3341	eval {	3574	eval {
3342	BDB::db_env_open	3575	BDB::db_env_open
3343	$DB_ENV,	3576	$DB_ENV,
…		…
3345	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3578	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3346	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3579	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3347	0666;	3580	0666;
3348		3581
3349	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3582	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3350
3351	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3352	$DB_ENV->set_lk_detect;
3353	};	3583	};
3354		3584
3355	cf::cleanup "db_env_open(db): $@" if $@;	3585	cf::cleanup "db_env_open(db): $@" if $@;
3356	};	3586	};
3357	}	3587	}
		3588
		3589	$BDB_DEADLOCK_WATCHER = Event->timer (
		3590	after => 3,
		3591	interval => 1,
		3592	hard => 1,
		3593	prio => 0,
		3594	data => WF_AUTOCANCEL,
		3595	cb => sub {
		3596	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3597	},
		3598	);
		3599	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3600	after => 11,
		3601	interval => 60,
		3602	hard => 1,
		3603	prio => 0,
		3604	data => WF_AUTOCANCEL,
		3605	cb => sub {
		3606	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3607	},
		3608	);
		3609	$BDB_TRICKLE_WATCHER = Event->timer (
		3610	after => 5,
		3611	interval => 10,
		3612	hard => 1,
		3613	prio => 0,
		3614	data => WF_AUTOCANCEL,
		3615	cb => sub {
		3616	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3617	},
		3618	);
3358	}	3619	}
3359		3620
3360	{	3621	{
3361	IO::AIO::min_parallel 8;	3622	IO::AIO::min_parallel 8;
3362		3623
…		…
3365	$AIO_POLL_WATCHER = Event->io (	3626	$AIO_POLL_WATCHER = Event->io (
3366	reentrant => 0,	3627	reentrant => 0,
3367	data => WF_AUTOCANCEL,	3628	data => WF_AUTOCANCEL,
3368	fd => IO::AIO::poll_fileno,	3629	fd => IO::AIO::poll_fileno,
3369	poll => 'r',	3630	poll => 'r',
3370	prio => 6,	3631	prio => 0,
3371	cb => \&IO::AIO::poll_cb,	3632	cb => \&IO::AIO::poll_cb,
3372	);	3633	);
3373	}	3634	}
3374		3635
3375	my $_log_backtrace;	3636	my $_log_backtrace;
…		…
3381		3642
3382	# limit the # of concurrent backtraces	3643	# limit the # of concurrent backtraces
3383	if ($_log_backtrace < 2) {	3644	if ($_log_backtrace < 2) {
3384	++$_log_backtrace;	3645	++$_log_backtrace;
3385	async {	3646	async {
		3647	$Coro::current->{desc} = "abt $msg";
		3648
3386	my @bt = fork_call {	3649	my @bt = fork_call {
3387	@addr = map { sprintf "%x", $_ } @addr;	3650	@addr = map { sprintf "%x", $_ } @addr;
3388	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3651	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3389	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	3652	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3390	or die "addr2line: $!";	3653	or die "addr2line: $!";

Diff Legend

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