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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.306 by root, Sat Jul 14 14:33:30 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
…		…
167		171
168	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	172	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
169	returns directly I<after> the tick processing (and consequently, can only wake one process	173	returns directly I<after> the tick processing (and consequently, can only wake one process
170	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	174	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171		175
		176	=item @cf::INVOKE_RESULTS
		177
		178	This array contains the results of the last C<invoke ()> call. When
		179	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		180	that call.
		181
172	=back	182	=back
173		183
174	=cut	184	=cut
175		185
176	BEGIN {	186	BEGIN {
…		…
180	$msg .= "\n"	190	$msg .= "\n"
181	unless $msg =~ /\n$/;	191	unless $msg =~ /\n$/;
182		192
183	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	193	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
184		194
185	utf8::encode $msg;
186	LOG llevError, $msg;	195	LOG llevError, $msg;
187	};	196	};
188	}	197	}
189		198
190	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	199	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
265	Wait until the given lock is available and then acquires it and returns	274	Wait until the given lock is available and then acquires it and returns
266	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	275	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
267	for example when the coroutine gets canceled), the lock is automatically	276	for example when the coroutine gets canceled), the lock is automatically
268	returned.	277	returned.
269		278
		279	Locks are not recursive, locking from the same coro twice results in a
		280	deadlocked coro.
		281
270	Lock names should begin with a unique identifier (for example, cf::map::find	282	Lock names should begin with a unique identifier (for example, cf::map::find
271	uses map_find and cf::map::load uses map_load).	283	uses map_find and cf::map::load uses map_load).
272		284
273	=item $locked = cf::lock_active $string	285	=item $locked = cf::lock_active $string
274		286
275	Return true if the lock is currently active, i.e. somebody has locked it.	287	Return true if the lock is currently active, i.e. somebody has locked it.
276		288
277	=cut	289	=cut
278		290
279	our %LOCK;	291	our %LOCK;
		292	our %LOCKER;#d#
280		293
281	sub lock_wait($) {	294	sub lock_wait($) {
282	my ($key) = @_;	295	my ($key) = @_;
		296
		297	if ($LOCKER{$key} == $Coro::current) {#d#
		298	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		299	return;#d#
		300	}#d#
283		301
284	# wait for lock, if any	302	# wait for lock, if any
285	while ($LOCK{$key}) {	303	while ($LOCK{$key}) {
286	push @{ $LOCK{$key} }, $Coro::current;	304	push @{ $LOCK{$key} }, $Coro::current;
287	Coro::schedule;	305	Coro::schedule;
…		…
293		311
294	# wait, to be sure we are not locked	312	# wait, to be sure we are not locked
295	lock_wait $key;	313	lock_wait $key;
296		314
297	$LOCK{$key} = [];	315	$LOCK{$key} = [];
		316	$LOCKER{$key} = $Coro::current;#d#
298		317
299	Coro::guard {	318	Coro::guard {
		319	delete $LOCKER{$key};#d#
300	# wake up all waiters, to be on the safe side	320	# wake up all waiters, to be on the safe side
301	$_->ready for @{ delete $LOCK{$key} };	321	$_->ready for @{ delete $LOCK{$key} };
302	}	322	}
303	}	323	}
304		324
…		…
314	my $guard = Coro::guard {	334	my $guard = Coro::guard {
315	$TICK_WATCHER->start;	335	$TICK_WATCHER->start;
316	};	336	};
317	$TICK_WATCHER->stop;	337	$TICK_WATCHER->stop;
318	$guard	338	$guard
		339	}
		340
		341	=item cf::get_slot $time[, $priority[, $name]]
		342
		343	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		344	This call blocks and returns only when you have at least C<$time> seconds
		345	of cpu time till the next tick. The slot is only valid till the next cede.
		346
		347	The optional C<$name> can be used to identify the job to run. It might be
		348	used for statistical purposes and should identify the same time-class.
		349
		350	Useful for short background jobs.
		351
		352	=cut
		353
		354	our @SLOT_QUEUE;
		355	our $SLOT_QUEUE;
		356
		357	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		358	$SLOT_QUEUE = Coro::async {
		359	$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;
319	}	397	}
320		398
321	=item cf::async { BLOCK }	399	=item cf::async { BLOCK }
322		400
323	Currently the same as Coro::async_pool, meaning you cannot use	401	Currently the same as Coro::async_pool, meaning you cannot use
…		…
357		435
358	my $busy = 1;	436	my $busy = 1;
359	my @res;	437	my @res;
360		438
361	(async {	439	(async {
		440	$Coro::current->desc ("sync job coro");
362	@res = eval { $job->() };	441	@res = eval { $job->() };
363	warn $@ if $@;	442	warn $@ if $@;
364	undef $busy;	443	undef $busy;
365	})->prio (Coro::PRIO_MAX);	444	})->prio (Coro::PRIO_MAX);
366		445
…		…
410	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
411	never block itself or use any form of Event handling.	490	never block itself or use any form of Event handling.
412		491
413	=cut	492	=cut
414		493
415	sub _store_scalar {
416	open my $fh, ">", \my $buf
417	or die "fork_call: cannot open fh-to-buf in child : $!";
418	Storable::store_fd $_[0], $fh;
419	close $fh;
420
421	$buf
422	}
423
424	sub fork_call(&@) {	494	sub fork_call(&@) {
425	my ($cb, @args) = @_;	495	my ($cb, @args) = @_;
426		496
427	# 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,
428	# or die "socketpair: $!";	498	# otherwise perl prematurely frees the stuff :/
429	pipe my $fh1, my $fh2	499	# TODO: investigate and fix (likely this will be rather laborious)
430	or die "pipe: $!";
431		500
432	if (my $pid = fork) {	501	my @res = Coro::Util::fork_eval {
433	close $fh2;
434
435	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436	warn "pst<$res>" unless $res =~ /^pst/;
437	$res = Coro::Storable::thaw $res;
438
439	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
440
441	Carp::confess $$res unless "ARRAY" eq ref $res;
442
443	return wantarray ? @$res : $res->[-1];
444	} else {
445	reset_signals;	502	reset_signals;
446	local $SIG{__WARN__};	503	&$cb
447	local $SIG{__DIE__};	504	}, @args;
448	# just in case, this hack effectively disables event
449	# in the child. cleaner and slower would be canceling all watchers,
450	# but this works for the time being.
451	local $Coro::idle;
452	$Coro::current->prio (Coro::PRIO_MAX);
453		505
454	eval {	506	wantarray ? @res : $res[-1]
455	close $fh1;
456
457	my @res = eval { $cb->(@args) };
458
459	syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
460	close $fh2;
461	};
462
463	warn $@ if $@;
464	_exit 0;
465	}
466	}	507	}
467		508
468	=item $value = cf::db_get $family => $key	509	=item $value = cf::db_get $family => $key
469		510
470	Returns a single value from the environment database.	511	Returns a single value from the environment database.
…		…
472	=item cf::db_put $family => $key => $value	513	=item cf::db_put $family => $key => $value
473		514
474	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
475	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).
476		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
477	=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	}
478		541
479	our $DB;	542	our $DB;
480		543
481	sub db_init {	544	sub db_init {
482	unless ($DB) {
483	$DB = BDB::db_create $DB_ENV;
484
485	cf::sync_job {	545	cf::sync_job {
486	eval {	546	$DB \|\|= db_table "db";
487	$DB->set_flags (BDB::CHKSUM);
488
489	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
490	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
491	cf::cleanup "db_open(db): $!" if $!;
492	};
493	cf::cleanup "db_open(db): $@" if $@;
494	};
495	}	547	};
496	}	548	}
497		549
498	sub db_get($$) {	550	sub db_get($$) {
499	my $key = "$_[0]/$_[1]";	551	my $key = "$_[0]/$_[1]";
500		552
…		…
550	if (1) {	602	if (1) {
551	$md5 =	603	$md5 =
552	join "\x00",	604	join "\x00",
553	$processversion,	605	$processversion,
554	map {	606	map {
555	Coro::cede;	607	cf::cede_to_tick;
556	($src->[$_], Digest::MD5::md5_hex $data[$_])	608	($src->[$_], Digest::MD5::md5_hex $data[$_])
557	} 0.. $#$src;	609	} 0.. $#$src;
558		610
559		611
560	my $dbmd5 = db_get cache => "$id/md5";	612	my $dbmd5 = db_get cache => "$id/md5";
…		…
866	";	918	";
867	die if $@;	919	die if $@;
868	}	920	}
869		921
870	our $override;	922	our $override;
871	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	923	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
872		924
873	sub override {	925	sub override {
874	$override = 1;	926	$override = 1;
875	@invoke_results = ();	927	@INVOKE_RESULTS = (@_);
876	}	928	}
877		929
878	sub do_invoke {	930	sub do_invoke {
879	my $event = shift;	931	my $event = shift;
880	my $callbacks = shift;	932	my $callbacks = shift;
881		933
882	@invoke_results = ();	934	@INVOKE_RESULTS = ();
883		935
884	local $override;	936	local $override;
885		937
886	for (@$callbacks) {	938	for (@$callbacks) {
887	eval { &{$_->[1]} };	939	eval { &{$_->[1]} };
…		…
904		956
905	Generate an object-specific event with the given arguments.	957	Generate an object-specific event with the given arguments.
906		958
907	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	959	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
908	removed in future versions), and there is no public API to access override	960	removed in future versions), and there is no public API to access override
909	results (if you must, access C<@cf::invoke_results> directly).	961	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910		962
911	=back	963	=back
912		964
913	=cut	965	=cut
914		966
915	#############################################################################	967	#############################################################################
916	# 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	}
917		980
918	sub reattach {	981	sub reattach {
919	# basically do the same as instantiate, without calling instantiate	982	# basically do the same as instantiate, without calling instantiate
920	my ($obj) = @_;	983	my ($obj) = @_;
921		984
…		…
968	sub object_freezer_save {	1031	sub object_freezer_save {
969	my ($filename, $rdata, $objs) = @_;	1032	my ($filename, $rdata, $objs) = @_;
970		1033
971	sync_job {	1034	sync_job {
972	if (length $$rdata) {	1035	if (length $$rdata) {
		1036	utf8::decode (my $decname = $filename);
973	warn sprintf "saving %s (%d,%d)\n",	1037	warn sprintf "saving %s (%d,%d)\n",
974	$filename, length $$rdata, scalar @$objs;	1038	$decname, length $$rdata, scalar @$objs;
975		1039
976	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1040	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
977	chmod SAVE_MODE, $fh;	1041	chmod SAVE_MODE, $fh;
978	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1042	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
979	aio_fsync $fh if $cf::USE_FSYNC;	1043	aio_fsync $fh if $cf::USE_FSYNC;
…		…
998	}	1062	}
999	} else {	1063	} else {
1000	aio_unlink $filename;	1064	aio_unlink $filename;
1001	aio_unlink "$filename.pst";	1065	aio_unlink "$filename.pst";
1002	}	1066	}
1003	}	1067	};
1004	}	1068	}
1005		1069
1006	sub object_freezer_as_string {	1070	sub object_freezer_as_string {
1007	my ($rdata, $objs) = @_;	1071	my ($rdata, $objs) = @_;
1008		1072
…		…
1020	or return;	1084	or return;
1021		1085
1022	unless (aio_stat "$filename.pst") {	1086	unless (aio_stat "$filename.pst") {
1023	(aio_load "$filename.pst", $av) >= 0	1087	(aio_load "$filename.pst", $av) >= 0
1024	or return;	1088	or return;
		1089
1025	$av = eval { (Storable::thaw $av)->{objs} };	1090	$av = eval { (Storable::thaw $av)->{objs} };
1026	}	1091	}
1027		1092
		1093	utf8::decode (my $decname = $filename);
1028	warn sprintf "loading %s (%d)\n",	1094	warn sprintf "loading %s (%d,%d)\n",
1029	$filename, length $data, scalar @{$av \|\| []};	1095	$decname, length $data, scalar @{$av \|\| []};
		1096
1030	return ($data, $av);	1097	($data, $av)
1031	}	1098	}
1032		1099
1033	=head2 COMMAND CALLBACKS	1100	=head2 COMMAND CALLBACKS
1034		1101
1035	=over 4	1102	=over 4
…		…
1108	my ($pl, $buf) = @_;	1175	my ($pl, $buf) = @_;
1109		1176
1110	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1177	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111		1178
1112	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
1113	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1187	if (my $cb = $EXTCMD{$type}) {
1114	if (my %reply = $cb->($pl, $msg)) {	1188	@reply = $cb->($pl, @payload);
1115	$pl->ext_reply ($msg->{msgid}, %reply);
1116	}
1117	}	1189	}
		1190
		1191	$pl->ext_reply ($reply, @reply)
		1192	if $reply;
		1193
1118	} else {	1194	} else {
1119	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1195	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120	}	1196	}
1121		1197
1122	cf::override;	1198	cf::override;
…		…
1212		1288
1213	=head3 cf::player	1289	=head3 cf::player
1214		1290
1215	=over 4	1291	=over 4
1216		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
1217	=item cf::player::find $login	1307	=item cf::player::find $login
1218		1308
1219	Returns the given player object, loading it if necessary (might block).	1309	Returns the given player object, loading it if necessary (might block).
1220		1310
1221	=cut	1311	=cut
…		…
1256	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1346	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1347	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1348	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259	aio_unlink +(playerdir $login) . "/$login.pl";	1349	aio_unlink +(playerdir $login) . "/$login.pl";
1260		1350
1261	my $pl = load_pl path $login	1351	my $f = new_from_file cf::object::thawer path $login
1262	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;
1263	$cf::PLAYER{$login} = $pl	1358	$cf::PLAYER{$login} = $pl
1264	}	1359	}
1265	}	1360	}
1266	}	1361	}
1267		1362
…		…
1277		1372
1278	aio_mkdir playerdir $pl, 0770;	1373	aio_mkdir playerdir $pl, 0770;
1279	$pl->{last_save} = $cf::RUNTIME;	1374	$pl->{last_save} = $cf::RUNTIME;
1280		1375
1281	$pl->save_pl ($path);	1376	$pl->save_pl ($path);
1282	Coro::cede;	1377	cf::cede_to_tick;
1283	}	1378	}
1284		1379
1285	sub new($) {	1380	sub new($) {
1286	my ($login) = @_;	1381	my ($login) = @_;
1287		1382
…		…
1291	$self->{deny_save} = 1;	1386	$self->{deny_save} = 1;
1292		1387
1293	$cf::PLAYER{$login} = $self;	1388	$cf::PLAYER{$login} = $self;
1294		1389
1295	$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 (@_);
1296	}	1401	}
1297		1402
1298	=item $pl->quit_character	1403	=item $pl->quit_character
1299		1404
1300	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
…		…
1355	or return [];	1460	or return [];
1356		1461
1357	my @logins;	1462	my @logins;
1358		1463
1359	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") {
1360	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1469	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361	aio_read $fh, 0, 512, my $buf, 0 or next;	1470	aio_read $fh, 0, 512, my $buf, 0 or next;
1362	$buf !~ /^password -------------$/m or next; # official not-valid tag	1471	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1472	}
1363		1473
1364	utf8::decode $login;	1474	utf8::decode $login;
1365	push @logins, $login;	1475	push @logins, $login;
1366	}	1476	}
1367		1477
…		…
1405	sub expand_cfpod {	1515	sub expand_cfpod {
1406	((my $self), (local $_)) = @_;	1516	((my $self), (local $_)) = @_;
1407		1517
1408	# escape & and <	1518	# escape & and <
1409	s/&/&/g;	1519	s/&/&/g;
1410	s/(?<![BIUGH])</</g;	1520	s/(?<![BIUGHT])</</g;
1411		1521
1412	# 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
1413		1523
1414	1 while	1524	1 while
1415	# replace B<>, I<>, U<> etc.	1525	# replace B<>, I<>, U<> etc.
1416	s/B<([^\>]*)>/<b>$1<\/b>/	1526	s/B<([^\>]*)>/<b>$1<\/b>/
1417	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1527	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1418	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1528	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1529	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1419	# replace G<male\|female> tags	1530	# replace G<male\|female> tags
1420	\|\| s{G<([^>\|])\\|([^>])>}{	1531	\|\| s{G<([^>\|])\\|([^>])>}{
1421	$self->gender ? $2 : $1	1532	$self->gender ? $2 : $1
1422	}ge	1533	}ge
1423	# replace H<hint text>	1534	# replace H<hint text>
…		…
1444	sub hintmode {	1555	sub hintmode {
1445	$_[0]{hintmode} = $_[1] if @_ > 1;	1556	$_[0]{hintmode} = $_[1] if @_ > 1;
1446	$_[0]{hintmode}	1557	$_[0]{hintmode}
1447	}	1558	}
1448		1559
1449	=item $player->ext_reply ($msgid, %msg)	1560	=item $player->ext_reply ($msgid, @msg)
1450		1561
1451	Sends an ext reply to the player.	1562	Sends an ext reply to the player.
1452		1563
1453	=cut	1564	=cut
1454		1565
1455	sub ext_reply($$%) {	1566	sub ext_reply($$@) {
1456	my ($self, $id, %msg) = @_;	1567	my ($self, $id, @msg) = @_;
1457		1568
1458	$msg{msgid} = $id;	1569	$self->ns->ext_reply ($id, @msg)
1459	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460	}	1570	}
1461		1571
1462	=item $player->ext_event ($type, %msg)	1572	=item $player->ext_msg ($type, @msg)
1463		1573
1464	Sends an ext event to the client.	1574	Sends an ext event to the client.
1465		1575
1466	=cut	1576	=cut
1467		1577
1468	sub ext_event($$%) {	1578	sub ext_msg($$@) {
1469	my ($self, $type, %msg) = @_;	1579	my ($self, $type, @msg) = @_;
1470		1580
1471	$self->ns->ext_event ($type, %msg);	1581	$self->ns->ext_msg ($type, @msg);
1472	}	1582	}
1473		1583
1474	=head3 cf::region	1584	=head3 cf::region
1475		1585
1476	=over 4	1586	=over 4
…		…
1619	$self->init; # pass $1 etc.	1729	$self->init; # pass $1 etc.
1620	return $self;	1730	return $self;
1621	}	1731	}
1622	}	1732	}
1623		1733
1624	Carp::carp "unable to resolve path '$path' (base '$base').";	1734	Carp::cluck "unable to resolve path '$path' (base '$base').";
1625	()	1735	()
1626	}	1736	}
1627		1737
1628	sub init {	1738	sub init {
1629	my ($self) = @_;	1739	my ($self) = @_;
…		…
1692		1802
1693	sub load_header_from($) {	1803	sub load_header_from($) {
1694	my ($self, $path) = @_;	1804	my ($self, $path) = @_;
1695		1805
1696	utf8::encode $path;	1806	utf8::encode $path;
1697	#aio_open $path, O_RDONLY, 0	1807	my $f = new_from_file cf::object::thawer $path
1698	# or return;
1699
1700	$self->_load_header ($path)
1701	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;
1702		1815
1703	$self->{load_path} = $path;	1816	$self->{load_path} = $path;
1704		1817
1705	1	1818	1
1706	}	1819	}
…		…
1760	sub find {	1873	sub find {
1761	my ($path, $origin) = @_;	1874	my ($path, $origin) = @_;
1762		1875
1763	$path = normalise $path, $origin && $origin->path;	1876	$path = normalise $path, $origin && $origin->path;
1764		1877
		1878	cf::lock_wait "map_data:$path";#d#remove
1765	cf::lock_wait "map_find:$path";	1879	cf::lock_wait "map_find:$path";
1766		1880
1767	$cf::MAP{$path} \|\| do {	1881	$cf::MAP{$path} \|\| do {
1768	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
1769	my $map = new_from_path cf::map $path	1885	my $map = new_from_path cf::map $path
1770	or return;	1886	or return;
1771		1887
1772	$map->{last_save} = $cf::RUNTIME;	1888	$map->{last_save} = $cf::RUNTIME;
1773		1889
…		…
1775	or return;	1891	or return;
1776		1892
1777	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1893	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778	# doing this can freeze the server in a sync job, obviously	1894	# doing this can freeze the server in a sync job, obviously
1779	#$cf::WAIT_FOR_TICK->wait;	1895	#$cf::WAIT_FOR_TICK->wait;
		1896	undef $guard1;
		1897	undef $guard2;
1780	$map->reset;	1898	$map->reset;
1781	undef $guard;
1782	return find $path;	1899	return find $path;
1783	}	1900	}
1784		1901
1785	$cf::MAP{$path} = $map	1902	$cf::MAP{$path} = $map
1786	}	1903	}
…		…
1795	local $self->{deny_reset} = 1; # loading can take a long time	1912	local $self->{deny_reset} = 1; # loading can take a long time
1796		1913
1797	my $path = $self->{path};	1914	my $path = $self->{path};
1798		1915
1799	{	1916	{
1800	my $guard = cf::lock_acquire "map_load:$path";	1917	my $guard = cf::lock_acquire "map_data:$path";
1801		1918
		1919	return unless $self->valid;
1802	return if $self->in_memory != cf::MAP_SWAPPED;	1920	return unless $self->in_memory == cf::MAP_SWAPPED;
1803		1921
1804	$self->in_memory (cf::MAP_LOADING);	1922	$self->in_memory (cf::MAP_LOADING);
1805		1923
1806	$self->alloc;	1924	$self->alloc;
1807		1925
1808	$self->pre_load;	1926	$self->pre_load;
1809	Coro::cede;	1927	cf::cede_to_tick;
1810		1928
		1929	my $f = new_from_file cf::object::thawer $self->{load_path};
		1930	$f->skip_block;
1811	$self->_load_objects ($self->{load_path}, 1)	1931	$self->_load_objects ($f)
1812	or return;	1932	or return;
1813		1933
1814	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1934	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1815	if delete $self->{load_original};	1935	if delete $self->{load_original};
1816		1936
1817	if (my $uniq = $self->uniq_path) {	1937	if (my $uniq = $self->uniq_path) {
1818	utf8::encode $uniq;	1938	utf8::encode $uniq;
1819	if (aio_open $uniq, O_RDONLY, 0) {	1939	unless (aio_stat $uniq) {
		1940	if (my $f = new_from_file cf::object::thawer $uniq) {
1820	$self->clear_unique_items;	1941	$self->clear_unique_items;
1821	$self->_load_objects ($uniq, 0);	1942	$self->_load_objects ($f);
		1943	$f->resolve_delayed_derefs;
		1944	}
1822	}	1945	}
1823	}	1946	}
1824		1947
1825	Coro::cede;	1948	$f->resolve_delayed_derefs;
		1949
		1950	cf::cede_to_tick;
1826	# now do the right thing for maps	1951	# now do the right thing for maps
1827	$self->link_multipart_objects;	1952	$self->link_multipart_objects;
1828	$self->difficulty ($self->estimate_difficulty)	1953	$self->difficulty ($self->estimate_difficulty)
1829	unless $self->difficulty;	1954	unless $self->difficulty;
1830	Coro::cede;	1955	cf::cede_to_tick;
1831		1956
1832	unless ($self->{deny_activate}) {	1957	unless ($self->{deny_activate}) {
1833	$self->decay_objects;	1958	$self->decay_objects;
1834	$self->fix_auto_apply;	1959	$self->fix_auto_apply;
1835	$self->update_buttons;	1960	$self->update_buttons;
1836	Coro::cede;	1961	cf::cede_to_tick;
1837	$self->set_darkness_map;	1962	$self->set_darkness_map;
1838	Coro::cede;	1963	cf::cede_to_tick;
1839	$self->activate;	1964	$self->activate;
1840	}	1965	}
		1966
		1967	$self->{last_save} = $cf::RUNTIME;
		1968	$self->last_access ($cf::RUNTIME);
1841		1969
1842	$self->in_memory (cf::MAP_IN_MEMORY);	1970	$self->in_memory (cf::MAP_IN_MEMORY);
1843	}	1971	}
1844		1972
1845	$self->post_load;	1973	$self->post_load;
…		…
1856		1984
1857	$self	1985	$self
1858	}	1986	}
1859		1987
1860	# 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
1861	sub load_diag {	1989	sub load_neighbours {
1862	my ($map) = @_;	1990	my ($map) = @_;
1863		1991
1864	my @diag; # diagonal neighbours	1992	my @neigh; # diagonal neighbours
1865		1993
1866	for (0 .. 3) {	1994	for (0 .. 3) {
1867	my $neigh = $map->tile_path ($_)	1995	my $neigh = $map->tile_path ($_)
1868	or next;	1996	or next;
1869	$neigh = find $neigh, $map	1997	$neigh = find $neigh, $map
1870	or next;	1998	or next;
1871	$neigh->load;	1999	$neigh->load;
1872		2000
		2001	push @neigh,
1873	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2002	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1874	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2003	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1875	}	2004	}
1876		2005
1877	for (@diag) {	2006	for (grep defined $_->[0], @neigh) {
		2007	my ($path, $origin) = @$_;
1878	my $neigh = find @$_	2008	my $neigh = find $path, $origin
1879	or next;	2009	or next;
1880	$neigh->load;	2010	$neigh->load;
1881	}	2011	}
1882	}	2012	}
1883		2013
…		…
1888	}	2018	}
1889		2019
1890	sub do_load_sync {	2020	sub do_load_sync {
1891	my ($map) = @_;	2021	my ($map) = @_;
1892		2022
		2023	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2024	if $Coro::current == $Coro::main;
		2025
1893	cf::sync_job { $map->load };	2026	cf::sync_job { $map->load };
1894	}	2027	}
1895		2028
1896	our %MAP_PREFETCH;	2029	our %MAP_PREFETCH;
1897	our $MAP_PREFETCHER = undef;	2030	our $MAP_PREFETCHER = undef;
1898		2031
1899	sub find_async {	2032	sub find_async {
1900	my ($path, $origin) = @_;	2033	my ($path, $origin, $load) = @_;
1901		2034
1902	$path = normalise $path, $origin && $origin->{path};	2035	$path = normalise $path, $origin && $origin->{path};
1903		2036
1904	if (my $map = $cf::MAP{$path}) {	2037	if (my $map = $cf::MAP{$path}) {
1905	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2038	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1906	}	2039	}
1907		2040
1908	undef $MAP_PREFETCH{$path};	2041	$MAP_PREFETCH{$path} \|= $load;
		2042
1909	$MAP_PREFETCHER \|\|= cf::async {	2043	$MAP_PREFETCHER \|\|= cf::async {
		2044	$Coro::current->{desc} = "map prefetcher";
		2045
1910	while (%MAP_PREFETCH) {	2046	while (%MAP_PREFETCH) {
1911	for my $path (keys %MAP_PREFETCH) {	2047	while (my ($k, $v) = each %MAP_PREFETCH) {
1912	my $map = find $path	2048	if (my $map = find $k) {
1913	or next;
1914	$map->load;	2049	$map->load if $v;
		2050	}
1915		2051
1916	delete $MAP_PREFETCH{$path};	2052	delete $MAP_PREFETCH{$k};
1917	}	2053	}
1918	}	2054	}
1919	undef $MAP_PREFETCHER;	2055	undef $MAP_PREFETCHER;
1920	};	2056	};
1921	$MAP_PREFETCHER->prio (6);	2057	$MAP_PREFETCHER->prio (6);
…		…
1924	}	2060	}
1925		2061
1926	sub save {	2062	sub save {
1927	my ($self) = @_;	2063	my ($self) = @_;
1928		2064
1929	my $lock = cf::lock_acquire "map_data:" . $self->path;	2065	my $lock = cf::lock_acquire "map_data:$self->{path}";
1930		2066
1931	$self->{last_save} = $cf::RUNTIME;	2067	$self->{last_save} = $cf::RUNTIME;
1932		2068
1933	return unless $self->dirty;	2069	return unless $self->dirty;
1934		2070
…		…
1940	return if $self->{deny_save};	2076	return if $self->{deny_save};
1941		2077
1942	local $self->{last_access} = $self->last_access;#d#	2078	local $self->{last_access} = $self->last_access;#d#
1943		2079
1944	cf::async {	2080	cf::async {
		2081	$Coro::current->{desc} = "map player save";
1945	$_->contr->save for $self->players;	2082	$_->contr->save for $self->players;
1946	};	2083	};
1947		2084
1948	if ($uniq) {	2085	if ($uniq) {
1949	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	2086	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
…		…
1957	my ($self) = @_;	2094	my ($self) = @_;
1958		2095
1959	# save first because save cedes	2096	# save first because save cedes
1960	$self->save;	2097	$self->save;
1961		2098
1962	my $lock = cf::lock_acquire "map_data:" . $self->path;	2099	my $lock = cf::lock_acquire "map_data:$self->{path}";
1963		2100
1964	return if $self->players;	2101	return if $self->players;
1965	return if $self->in_memory != cf::MAP_IN_MEMORY;	2102	return if $self->in_memory != cf::MAP_IN_MEMORY;
1966	return if $self->{deny_save};	2103	return if $self->{deny_save};
1967		2104
		2105	$self->in_memory (cf::MAP_SWAPPED);
		2106
		2107	$self->deactivate;
		2108	$_->clear_links_to ($self) for values %cf::MAP;
1968	$self->clear;	2109	$self->clear;
1969	$self->in_memory (cf::MAP_SWAPPED);
1970	}	2110	}
1971		2111
1972	sub reset_at {	2112	sub reset_at {
1973	my ($self) = @_;	2113	my ($self) = @_;
1974		2114
…		…
2006	if $uniq;	2146	if $uniq;
2007	}	2147	}
2008		2148
2009	delete $cf::MAP{$self->path};	2149	delete $cf::MAP{$self->path};
2010		2150
		2151	$self->deactivate;
		2152	$_->clear_links_to ($self) for values %cf::MAP;
2011	$self->clear;	2153	$self->clear;
2012
2013	$_->clear_links_to ($self) for values %cf::MAP;
2014		2154
2015	$self->unlink_save;	2155	$self->unlink_save;
2016	$self->destroy;	2156	$self->destroy;
2017	}	2157	}
2018		2158
2019	my $nuke_counter = "aaaa";	2159	my $nuke_counter = "aaaa";
2020		2160
2021	sub nuke {	2161	sub nuke {
2022	my ($self) = @_;	2162	my ($self) = @_;
2023		2163
		2164	{
		2165	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2166
2024	delete $cf::MAP{$self->path};	2167	delete $cf::MAP{$self->path};
2025		2168
2026	$self->unlink_save;	2169	$self->unlink_save;
2027		2170
2028	bless $self, "cf::map";	2171	bless $self, "cf::map";
2029	delete $self->{deny_reset};	2172	delete $self->{deny_reset};
2030	$self->{deny_save} = 1;	2173	$self->{deny_save} = 1;
2031	$self->reset_timeout (1);	2174	$self->reset_timeout (1);
2032	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2175	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033		2176
2034	$cf::MAP{$self->path} = $self;	2177	$cf::MAP{$self->path} = $self;
		2178	}
2035		2179
2036	$self->reset; # polite request, might not happen	2180	$self->reset; # polite request, might not happen
2037	}	2181	}
2038		2182
2039	=item $maps = cf::map::tmp_maps	2183	=item $maps = cf::map::tmp_maps
…		…
2115		2259
2116	sub inv_recursive {	2260	sub inv_recursive {
2117	inv_recursive_ inv $_[0]	2261	inv_recursive_ inv $_[0]
2118	}	2262	}
2119		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
2120	package cf;	2295	package cf;
2121		2296
2122	=back	2297	=back
2123		2298
2124	=head3 cf::object::player	2299	=head3 cf::object::player
…		…
2146		2321
2147	} else {	2322	} else {
2148	my $pl = $self->contr;	2323	my $pl = $self->contr;
2149		2324
2150	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2325	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151	my $diag = $pl->{npc_dialog};	2326	my $dialog = $pl->{npc_dialog};
2152	$diag->{pl}->ext_reply (	2327	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153	$diag->{id},
2154	msgtype => "reply",
2155	msg => $diag->{pl}->expand_cfpod ($msg),
2156	add_topics => []
2157	);
2158		2328
2159	} else {	2329	} else {
2160	$msg = $npc->name . " says: $msg" if $npc;	2330	$msg = $npc->name . " says: $msg" if $npc;
2161	$self->message ($msg, $flags);	2331	$self->message ($msg, $flags);
2162	}	2332	}
2163	}	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 (@_);
2164	}	2344	}
2165		2345
2166	=item $player_object->may ("access")	2346	=item $player_object->may ("access")
2167		2347
2168	Returns wether the given player is authorized to access resource "access"	2348	Returns wether the given player is authorized to access resource "access"
…		…
2247	# use -1 or undef as default coordinates, not 0, 0	2427	# use -1 or undef as default coordinates, not 0, 0
2248	($x, $y) = ($map->enter_x, $map->enter_y)	2428	($x, $y) = ($map->enter_x, $map->enter_y)
2249	if $x <=0 && $y <= 0;	2429	if $x <=0 && $y <= 0;
2250		2430
2251	$map->load;	2431	$map->load;
2252	$map->load_diag;	2432	$map->load_neighbours;
2253		2433
2254	return unless $self->contr->active;	2434	return unless $self->contr->active;
2255	$self->activate_recursive;	2435	$self->activate_recursive;
2256		2436
2257	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2437	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
…		…
2277	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2457	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2278		2458
2279	$self->enter_link;	2459	$self->enter_link;
2280		2460
2281	(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
2282	my $map = eval {	2483	my $map = eval {
2283	my $map = cf::map::find $path;	2484	my $map = defined $path ? cf::map::find $path : undef;
2284		2485
2285	if ($map) {	2486	if ($map) {
2286	$map = $map->customise_for ($self);	2487	$map = $map->customise_for ($self);
2287	$map = $check->($map) if $check && $map;	2488	$map = $check->($map) if $check && $map;
2288	} else {	2489	} else {
2289	$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);
2290	}	2491	}
2291		2492
2292	$map	2493	$map
2293	};	2494	};
2294		2495
…		…
2384	# if exit is damned, update players death & WoR home-position	2585	# if exit is damned, update players death & WoR home-position
2385	$self->contr->savebed ($slaying, $hp, $sp)	2586	$self->contr->savebed ($slaying, $hp, $sp)
2386	if $exit->flag (FLAG_DAMNED);	2587	if $exit->flag (FLAG_DAMNED);
2387		2588
2388	(async {	2589	(async {
		2590	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2591
2389	$self->deactivate_recursive; # just to be sure	2592	$self->deactivate_recursive; # just to be sure
2390	unless (eval {	2593	unless (eval {
2391	$self->goto ($slaying, $hp, $sp);	2594	$self->goto ($slaying, $hp, $sp);
2392		2595
2393	1;	2596	1;
…		…
2419		2622
2420	utf8::encode $text;	2623	utf8::encode $text;
2421	$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);
2422	}	2625	}
2423		2626
2424	=item $client->send_msg ($color, $type, $msg, [extra...])	2627	=item $client->send_msg ($channel, $msg, $color, [extra...])
2425		2628
2426	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
2427	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
2428	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
2429	the message unless the client supports the msg packet.	2632	the message unless the client supports the msg packet.
2430		2633
2431	=cut	2634	=cut
2432		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
2433	sub cf::client::send_msg {	2651	sub cf::client::send_msg {
2434	my ($self, $color, $type, $msg, @extra) = @_;	2652	my ($self, $channel, $msg, $color, @extra) = @_;
2435		2653
2436	$msg = $self->pl->expand_cfpod ($msg);	2654	$msg = $self->pl->expand_cfpod ($msg);
2437		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
2438	return unless @extra \|\| length $msg;	2672	return unless @extra \|\| length $msg;
2439		2673
2440	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
2441	$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]));
2442	} else {	2681	} else {
2443	# replace some tags by gcfclient-compatible ones
2444	for ($msg) {
2445	1 while
2446	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2447	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2448	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2449	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2450	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2451	}
2452
2453	if ($color >= 0) {	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
2454	if (0 && $msg =~ /\[/) {	2697	if (0 && $msg =~ /\[/) {
		2698	# COMMAND/INFO
2455	$self->send_packet ("drawextinfo $color 4 0 $msg")	2699	$self->send_packet ("drawextinfo $color 10 8 $msg")
2456	} else {	2700	} else {
2457	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2701	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2458	$self->send_packet ("drawinfo $color $msg")	2702	$self->send_packet ("drawinfo $color $msg")
2459	}	2703	}
2460	}	2704	}
2461	}	2705	}
2462	}	2706	}
2463		2707
2464	=item $client->ext_event ($type, %msg)	2708	=item $client->ext_msg ($type, @msg)
2465		2709
2466	Sends an ext event to the client.	2710	Sends an ext event to the client.
2467		2711
2468	=cut	2712	=cut
2469		2713
2470	sub cf::client::ext_event($$%) {	2714	sub cf::client::ext_msg($$@) {
2471	my ($self, $type, %msg) = @_;	2715	my ($self, $type, @msg) = @_;
2472		2716
2473	return unless $self->extcmd;	2717	if ($self->extcmd == 2) {
2474		2718	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2719	} elsif ($self->extcmd == 1) { # TODO: remove
2475	$msg{msgtype} = "event_$type";	2720	push @msg, msgtype => "event_$type";
2476	$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	}
2477	}	2741	}
2478		2742
2479	=item $success = $client->query ($flags, "text", \&cb)	2743	=item $success = $client->query ($flags, "text", \&cb)
2480		2744
2481	Queues a query to the client, calling the given callback with	2745	Queues a query to the client, calling the given callback with
…		…
2536	my ($ns, $buf) = @_;	2800	my ($ns, $buf) = @_;
2537		2801
2538	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2802	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2539		2803
2540	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
2541	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2812	if (my $cb = $EXTICMD{$type}) {
2542	if (my %reply = $cb->($ns, $msg)) {	2813	@reply = $cb->($ns, @payload);
2543	$reply{msgid} = $msg->{msgid};
2544	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2545	}
2546	}	2814	}
		2815
		2816	$ns->ext_reply ($reply, @reply)
		2817	if $reply;
		2818
2547	} else {	2819	} else {
2548	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";
2549	}	2821	}
2550		2822
2551	cf::override;	2823	cf::override;
…		…
2598	our $safe = new Safe "safe";	2870	our $safe = new Safe "safe";
2599	our $safe_hole = new Safe::Hole;	2871	our $safe_hole = new Safe::Hole;
2600		2872
2601	$SIG{FPE} = 'IGNORE';	2873	$SIG{FPE} = 'IGNORE';
2602		2874
2603	$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	));
2604		2880
2605	# here we export the classes and methods available to script code	2881	# here we export the classes and methods available to script code
2606		2882
2607	=pod	2883	=pod
2608		2884
2609	The following functions and methods are available within a safe environment:	2885	The following functions and methods are available within a safe environment:
2610		2886
2611	cf::object	2887	cf::object
2612	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
2613	insert remove	2889	insert remove name archname title slaying race decrease_ob_nr
2614		2890
2615	cf::object::player	2891	cf::object::player
2616	player	2892	player
2617		2893
2618	cf::player	2894	cf::player
…		…
2623		2899
2624	=cut	2900	=cut
2625		2901
2626	for (	2902	for (
2627	["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
2628	insert remove)],	2905	decrease_ob_nr)],
2629	["cf::object::player" => qw(player)],	2906	["cf::object::player" => qw(player)],
2630	["cf::player" => qw(peaceful)],	2907	["cf::player" => qw(peaceful)],
2631	["cf::map" => qw(trigger)],	2908	["cf::map" => qw(trigger)],
2632	) {	2909	) {
2633	no strict 'refs';	2910	no strict 'refs';
…		…
2709	# the server's init and main functions	2986	# the server's init and main functions
2710		2987
2711	sub load_facedata($) {	2988	sub load_facedata($) {
2712	my ($path) = @_;	2989	my ($path) = @_;
2713		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
2714	warn "loading facedata from $path\n";	2997	warn "loading facedata from $path\n";
2715		2998
2716	my $facedata;	2999	my $facedata;
2717	0 < aio_load $path, $facedata	3000	0 < aio_load $path, $facedata
2718	or die "$path: $!";	3001	or die "$path: $!";
2719		3002
2720	$facedata = Coro::Storable::thaw $facedata;	3003	$facedata = Coro::Storable::thaw $facedata;
2721		3004
2722	$facedata->{version} == 2	3005	$facedata->{version} == 2
2723	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;
2724		3014
2725	{	3015	{
2726	my $faces = $facedata->{faceinfo};	3016	my $faces = $facedata->{faceinfo};
2727		3017
2728	while (my ($face, $info) = each %$faces) {	3018	while (my ($face, $info) = each %$faces) {
2729	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3019	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2730	cf::face::set_visibility $idx, $info->{visibility};	3020	cf::face::set_visibility $idx, $info->{visibility};
2731	cf::face::set_magicmap $idx, $info->{magicmap};	3021	cf::face::set_magicmap $idx, $info->{magicmap};
2732	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3022	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2733	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3023	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2734		3024
2735	cf::cede_to_tick;	3025	cf::cede_to_tick;
2736	}	3026	}
2737		3027
2738	while (my ($face, $info) = each %$faces) {	3028	while (my ($face, $info) = each %$faces) {
…		…
2763		3053
2764	{	3054	{
2765	# TODO: for gcfclient pleasure, we should give resources	3055	# TODO: for gcfclient pleasure, we should give resources
2766	# that gcfclient doesn't grok a >10000 face index.	3056	# that gcfclient doesn't grok a >10000 face index.
2767	my $res = $facedata->{resource};	3057	my $res = $facedata->{resource};
2768	my $enc = JSON::XS->new->utf8->canonical;	3058
		3059	my $soundconf = delete $res->{"res/sound.conf"};
2769		3060
2770	while (my ($name, $info) = each %$res) {	3061	while (my ($name, $info) = each %$res) {
2771	my $meta = $enc->encode ({
2772	name => $name,
2773	type => $info->{type},
2774	copyright => $info->{copyright}, #TODO#
2775	});
2776	my $data = pack "(w/a)", $meta, $info->{data};
2777	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2778
2779	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3062	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3063	my $data;
		3064
		3065	if ($info->{type} & 1) {
		3066	# prepend meta info
		3067
		3068	my $meta = $enc->encode ({
		3069	name => $name,
		3070	%{ $info->{meta} \|\| {} },
		3071	});
		3072
		3073	$data = pack "(w/a)", $meta, $info->{data};
		3074	} else {
		3075	$data = $info->{data};
		3076	}
		3077
		3078	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2780	cf::face::set_type $idx, 1;	3079	cf::face::set_type $idx, $info->{type};
2781	cf::face::set_data $idx, 0, $data, $chk;
2782		3080
2783	cf::cede_to_tick;	3081	cf::cede_to_tick;
2784	}	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	}
2785	}	3101	}
2786		3102
2787	1	3103	1
2788	}	3104	}
2789		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
2790	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
2791	load_resource_file "$MAPDIR/regions"	3119	load_resource_file "$MAPDIR/regions"
2792	or die "unable to load regions file\n";	3120	or die "unable to load regions file\n";
2793		3121
2794	for (cf::region::list) {	3122	for (cf::region::list) {
2795	$_->{match} = qr/$_->{match}/	3123	$_->{match} = qr/$_->{match}/
…		…
2831		3159
2832	sub init {	3160	sub init {
2833	reload_resources;	3161	reload_resources;
2834	}	3162	}
2835		3163
2836	sub cfg_load {	3164	sub reload_config {
2837	open my $fh, "<:utf8", "$CONFDIR/config"	3165	open my $fh, "<:utf8", "$CONFDIR/config"
2838	or return;	3166	or return;
2839		3167
2840	local $/;	3168	local $/;
2841	*CFG = YAML::Syck::Load <$fh>;	3169	*CFG = YAML::Syck::Load <$fh>;
…		…
2857	sub main {	3185	sub main {
2858	# we must not ever block the main coroutine	3186	# we must not ever block the main coroutine
2859	local $Coro::idle = sub {	3187	local $Coro::idle = sub {
2860	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#
2861	(async {	3189	(async {
		3190	$Coro::current->{desc} = "IDLE BUG HANDLER";
2862	Event::one_event;	3191	Event::one_event;
2863	})->prio (Coro::PRIO_MAX);	3192	})->prio (Coro::PRIO_MAX);
2864	};	3193	};
2865		3194
2866	cfg_load;	3195	reload_config;
2867	db_init;	3196	db_init;
2868	load_extensions;	3197	load_extensions;
2869		3198
2870	$TICK_WATCHER->start;	3199	$TICK_WATCHER->start;
2871	Event::loop;	3200	Event::loop;
…		…
3064	warn "reloading cf.pm";	3393	warn "reloading cf.pm";
3065	require cf;	3394	require cf;
3066	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3395	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3067		3396
3068	warn "loading config and database again";	3397	warn "loading config and database again";
3069	cf::cfg_load;	3398	cf::reload_config;
3070		3399
3071	warn "loading extensions";	3400	warn "loading extensions";
3072	cf::load_extensions;	3401	cf::load_extensions;
3073		3402
3074	warn "reattaching attachments to objects/players";	3403	warn "reattaching attachments to objects/players";
…		…
3110	register_command "reload" => sub {	3439	register_command "reload" => sub {
3111	my ($who, $arg) = @_;	3440	my ($who, $arg) = @_;
3112		3441
3113	if ($who->flag (FLAG_WIZ)) {	3442	if ($who->flag (FLAG_WIZ)) {
3114	$who->message ("reloading server.");	3443	$who->message ("reloading server.");
		3444	async {
		3445	$Coro::current->{desc} = "perl_reload";
3115	async { reload_perl };	3446	reload_perl;
		3447	};
3116	}	3448	}
3117	};	3449	};
3118		3450
3119	unshift @INC, $LIBDIR;	3451	unshift @INC, $LIBDIR;
3120		3452
…		…
3139	my $signal = new Coro::Signal;	3471	my $signal = new Coro::Signal;
3140	push @WAIT_FOR_TICK_BEGIN, $signal;	3472	push @WAIT_FOR_TICK_BEGIN, $signal;
3141	$signal->wait;	3473	$signal->wait;
3142	}	3474	}
3143		3475
3144	my $min = 1e6;#d#
3145	my $avg = 10;
3146	$TICK_WATCHER = Event->timer (	3476	$TICK_WATCHER = Event->timer (
3147	reentrant => 0,	3477	reentrant => 0,
3148	parked => 1,	3478	parked => 1,
3149	prio => 0,	3479	prio => 0,
3150	at => $NEXT_TICK \|\| $TICK,	3480	at => $NEXT_TICK \|\| $TICK,
…		…
3158		3488
3159	$NOW = $tick_start = Event::time;	3489	$NOW = $tick_start = Event::time;
3160		3490
3161	cf::server_tick; # one server iteration	3491	cf::server_tick; # one server iteration
3162		3492
3163	0 && sync_job {#d#
3164	for(1..10) {
3165	my $t = Event::time;
3166	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3167	or die;
3168
3169	$map->width (50);
3170	$map->height (50);
3171	$map->alloc;
3172	$map->_load_objects ("/tmp/x.map", 1);
3173	my $t = Event::time - $t;
3174
3175	#next unless $t < 0.0013;#d#
3176	if ($t < $min) {
3177	$min = $t;
3178	}
3179	$avg = $avg * 0.99 + $t * 0.01;
3180	}
3181	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3182	exit 0;
3183	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3184	};
3185
3186	$RUNTIME += $TICK;	3493	$RUNTIME += $TICK;
3187	$NEXT_TICK += $TICK;	3494	$NEXT_TICK += $TICK;
3188		3495
3189	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3496	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3190	$NEXT_RUNTIME_WRITE = $NOW + 10;	3497	$NEXT_RUNTIME_WRITE = $NOW + 10;
3191	Coro::async_pool {	3498	Coro::async_pool {
		3499	$Coro::current->{desc} = "runtime saver";
3192	write_runtime	3500	write_runtime
3193	or warn "ERROR: unable to write runtime file: $!";	3501	or warn "ERROR: unable to write runtime file: $!";
3194	};	3502	};
3195	}	3503	}
3196		3504
3197	# my $AFTER = Event::time;
3198	# warn $AFTER - $NOW;#d#
3199
3200	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3505	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3201	$sig->send;	3506	$sig->send;
3202	}	3507	}
3203	while (my $sig = shift @WAIT_FOR_TICK) {	3508	while (my $sig = shift @WAIT_FOR_TICK) {
3204	$sig->send;	3509	$sig->send;
…		…
3214		3519
3215	$LOAD = ($NOW - $tick_start) / $TICK;	3520	$LOAD = ($NOW - $tick_start) / $TICK;
3216	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3521	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3217		3522
3218	_post_tick;	3523	_post_tick;
3219
3220
3221	},	3524	},
3222	);	3525	);
3223		3526
3224	{	3527	{
		3528	BDB::min_parallel 8;
3225	BDB::max_poll_time $TICK * 0.1;	3529	BDB::max_poll_time $TICK * 0.1;
3226	$BDB_POLL_WATCHER = Event->io (	3530	$BDB_POLL_WATCHER = Event->io (
3227	reentrant => 0,	3531	reentrant => 0,
3228	fd => BDB::poll_fileno,	3532	fd => BDB::poll_fileno,
3229	poll => 'r',	3533	poll => 'r',
3230	prio => 0,	3534	prio => 0,
3231	data => WF_AUTOCANCEL,	3535	data => WF_AUTOCANCEL,
3232	cb => \&BDB::poll_cb,	3536	cb => \&BDB::poll_cb,
3233	);	3537	);
3234	BDB::min_parallel 8;
3235		3538
3236	BDB::set_sync_prepare {	3539	BDB::set_sync_prepare {
3237	my $status;	3540	my $status;
3238	my $current = $Coro::current;	3541	my $current = $Coro::current;
3239	(	3542	(
…		…
3248	)	3551	)
3249	};	3552	};
3250		3553
3251	unless ($DB_ENV) {	3554	unless ($DB_ENV) {
3252	$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);
3253		3560
3254	cf::sync_job {	3561	cf::sync_job {
3255	eval {	3562	eval {
3256	BDB::db_env_open	3563	BDB::db_env_open
3257	$DB_ENV,	3564	$DB_ENV,
…		…
3259	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
3260	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3567	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3261	0666;	3568	0666;
3262		3569
3263	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3570	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3264
3265	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
3266	$DB_ENV->set_lk_detect;
3267	};	3571	};
3268		3572
3269	cf::cleanup "db_env_open(db): $@" if $@;	3573	cf::cleanup "db_env_open(db): $@" if $@;
3270	};	3574	};
3271	}	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	);
3272	}	3607	}
3273		3608
3274	{	3609	{
3275	IO::AIO::min_parallel 8;	3610	IO::AIO::min_parallel 8;
3276		3611
…		…
3295		3630
3296	# limit the # of concurrent backtraces	3631	# limit the # of concurrent backtraces
3297	if ($_log_backtrace < 2) {	3632	if ($_log_backtrace < 2) {
3298	++$_log_backtrace;	3633	++$_log_backtrace;
3299	async {	3634	async {
		3635	$Coro::current->{desc} = "abt $msg";
		3636
3300	my @bt = fork_call {	3637	my @bt = fork_call {
3301	@addr = map { sprintf "%x", $_ } @addr;	3638	@addr = map { sprintf "%x", $_ } @addr;
3302	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3639	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3303	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 \|"
3304	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.306 by root, Sat Jul 14 14:33:30 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.306 by root, Sat Jul 14 14:33:30 2007 UTC vs.
Revision 1.374 by root, Wed Sep 19 22:07:16 2007 UTC