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

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.293 by root, Tue Jul 3 05:14:15 2007 UTC vs.
Revision 1.378 by root, Thu Oct 4 11:36:54 2007 UTC

…		…
10	use Event;	10	use Event;
11	use Opcode;	11	use Opcode;
12	use Safe;	12	use Safe;
13	use Safe::Hole;	13	use Safe::Hole;
14		14
15	use Coro 3.61 ();	15	use Coro 3.64 ();
16	use Coro::State;	16	use Coro::State;
17	use Coro::Handle;	17	use Coro::Handle;
18	use Coro::Event;	18	use Coro::Event;
19	use Coro::Timer;	19	use Coro::Timer;
20	use Coro::Signal;	20	use Coro::Signal;
21	use Coro::Semaphore;	21	use Coro::Semaphore;
22	use Coro::AIO;	22	use Coro::AIO;
23	use Coro::Storable;	23	use Coro::Storable;
		24	use Coro::Util ();
24		25
25	use JSON::XS 1.4 ();	26	use JSON::XS ();
26	use BDB ();	27	use BDB ();
27	use Data::Dumper;	28	use Data::Dumper;
28	use Digest::MD5;	29	use Digest::MD5;
29	use Fcntl;	30	use Fcntl;
30	use YAML::Syck ();	31	use YAML::Syck ();
31	use IO::AIO 2.32 ();	32	use IO::AIO 2.32 ();
32	use Time::HiRes;	33	use Time::HiRes;
33	use Compress::LZF;	34	use Compress::LZF;
		35	use Digest::MD5 ();
34		36
35	# configure various modules to our taste	37	# configure various modules to our taste
36	#	38	#
37	$Storable::canonical = 1; # reduce rsync transfers	39	$Storable::canonical = 1; # reduce rsync transfers
38	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	40	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
…		…
78	our $NEXT_TICK;	80	our $NEXT_TICK;
79	our $NOW;	81	our $NOW;
80	our $USE_FSYNC = 1; # use fsync to write maps - default off	82	our $USE_FSYNC = 1; # use fsync to write maps - default off
81		83
82	our $BDB_POLL_WATCHER;	84	our $BDB_POLL_WATCHER;
		85	our $BDB_DEADLOCK_WATCHER;
		86	our $BDB_CHECKPOINT_WATCHER;
		87	our $BDB_TRICKLE_WATCHER;
83	our $DB_ENV;	88	our $DB_ENV;
84		89
85	our %CFG;	90	our %CFG;
86		91
87	our $UPTIME; $UPTIME \|\|= time;	92	our $UPTIME; $UPTIME \|\|= time;
88	our $RUNTIME;	93	our $RUNTIME;
89		94
90	our %PLAYER; # all users	95	our (%PLAYER, %PLAYER_LOADING); # all users
91	our %MAP; # all maps	96	our (%MAP, %MAP_LOADING ); # all maps
92	our $LINK_MAP; # the special {link} map, which is always available	97	our $LINK_MAP; # the special {link} map, which is always available
93		98
94	# used to convert map paths into valid unix filenames by replacing / by ∕	99	# used to convert map paths into valid unix filenames by replacing / by ∕
95	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	100	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96		101
…		…
166		171
167	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	172	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168	returns directly I<after> the tick processing (and consequently, can only wake one process	173	returns directly I<after> the tick processing (and consequently, can only wake one process
169	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	174	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170		175
		176	=item @cf::INVOKE_RESULTS
		177
		178	This array contains the results of the last C<invoke ()> call. When
		179	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		180	that call.
		181
171	=back	182	=back
172		183
173	=cut	184	=cut
174		185
175	BEGIN {	186	BEGIN {
…		…
179	$msg .= "\n"	190	$msg .= "\n"
180	unless $msg =~ /\n$/;	191	unless $msg =~ /\n$/;
181		192
182	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	193	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183		194
184	utf8::encode $msg;
185	LOG llevError, $msg;	195	LOG llevError, $msg;
186	};	196	};
187	}	197	}
188		198
189	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	199	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
264	Wait until the given lock is available and then acquires it and returns	274	Wait until the given lock is available and then acquires it and returns
265	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	275	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
266	for example when the coroutine gets canceled), the lock is automatically	276	for example when the coroutine gets canceled), the lock is automatically
267	returned.	277	returned.
268		278
		279	Locks are not recursive, locking from the same coro twice results in a
		280	deadlocked coro.
		281
269	Lock names should begin with a unique identifier (for example, cf::map::find	282	Lock names should begin with a unique identifier (for example, cf::map::find
270	uses map_find and cf::map::load uses map_load).	283	uses map_find and cf::map::load uses map_load).
271		284
272	=item $locked = cf::lock_active $string	285	=item $locked = cf::lock_active $string
273		286
274	Return true if the lock is currently active, i.e. somebody has locked it.	287	Return true if the lock is currently active, i.e. somebody has locked it.
275		288
276	=cut	289	=cut
277		290
278	our %LOCK;	291	our %LOCK;
		292	our %LOCKER;#d#
279		293
280	sub lock_wait($) {	294	sub lock_wait($) {
281	my ($key) = @_;	295	my ($key) = @_;
		296
		297	if ($LOCKER{$key} == $Coro::current) {#d#
		298	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		299	return;#d#
		300	}#d#
282		301
283	# wait for lock, if any	302	# wait for lock, if any
284	while ($LOCK{$key}) {	303	while ($LOCK{$key}) {
285	push @{ $LOCK{$key} }, $Coro::current;	304	push @{ $LOCK{$key} }, $Coro::current;
286	Coro::schedule;	305	Coro::schedule;
…		…
292		311
293	# wait, to be sure we are not locked	312	# wait, to be sure we are not locked
294	lock_wait $key;	313	lock_wait $key;
295		314
296	$LOCK{$key} = [];	315	$LOCK{$key} = [];
		316	$LOCKER{$key} = $Coro::current;#d#
297		317
298	Coro::guard {	318	Coro::guard {
		319	delete $LOCKER{$key};#d#
299	# wake up all waiters, to be on the safe side	320	# wake up all waiters, to be on the safe side
300	$_->ready for @{ delete $LOCK{$key} };	321	$_->ready for @{ delete $LOCK{$key} };
301	}	322	}
302	}	323	}
303		324
…		…
313	my $guard = Coro::guard {	334	my $guard = Coro::guard {
314	$TICK_WATCHER->start;	335	$TICK_WATCHER->start;
315	};	336	};
316	$TICK_WATCHER->stop;	337	$TICK_WATCHER->stop;
317	$guard	338	$guard
		339	}
		340
		341	=item cf::get_slot $time[, $priority[, $name]]
		342
		343	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		344	This call blocks and returns only when you have at least C<$time> seconds
		345	of cpu time till the next tick. The slot is only valid till the next cede.
		346
		347	The optional C<$name> can be used to identify the job to run. It might be
		348	used for statistical purposes and should identify the same time-class.
		349
		350	Useful for short background jobs.
		351
		352	=cut
		353
		354	our @SLOT_QUEUE;
		355	our $SLOT_QUEUE;
		356
		357	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		358	$SLOT_QUEUE = Coro::async {
		359	$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;
318	}	397	}
319		398
320	=item cf::async { BLOCK }	399	=item cf::async { BLOCK }
321		400
322	Currently the same as Coro::async_pool, meaning you cannot use	401	Currently the same as Coro::async_pool, meaning you cannot use
…		…
356		435
357	my $busy = 1;	436	my $busy = 1;
358	my @res;	437	my @res;
359		438
360	(async {	439	(async {
		440	$Coro::current->desc ("sync job coro");
361	@res = eval { $job->() };	441	@res = eval { $job->() };
362	warn $@ if $@;	442	warn $@ if $@;
363	undef $busy;	443	undef $busy;
364	})->prio (Coro::PRIO_MAX);	444	})->prio (Coro::PRIO_MAX);
365		445
…		…
412	=cut	492	=cut
413		493
414	sub fork_call(&@) {	494	sub fork_call(&@) {
415	my ($cb, @args) = @_;	495	my ($cb, @args) = @_;
416		496
417	# 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,
418	# or die "socketpair: $!";	498	# otherwise perl prematurely frees the stuff :/
419	pipe my $fh1, my $fh2	499	# TODO: investigate and fix (likely this will be rather laborious)
420	or die "pipe: $!";
421		500
422	if (my $pid = fork) {	501	my @res = Coro::Util::fork_eval {
423	close $fh2;
424
425	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426	$res = Coro::Storable::thaw $res;
427
428	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430	die $$res unless "ARRAY" eq ref $res;
431
432	return wantarray ? @$res : $res->[-1];
433	} else {
434	reset_signals;	502	reset_signals;
435	local $SIG{__WARN__};	503	&$cb
436	local $SIG{__DIE__};	504	}, @args;
437	eval {
438	close $fh1;
439		505
440	my @res = eval { $cb->(@args) };	506	wantarray ? @res : $res[-1]
441	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442	};
443
444	warn $@ if $@;
445	_exit 0;
446	}
447	}	507	}
448		508
449	=item $value = cf::db_get $family => $key	509	=item $value = cf::db_get $family => $key
450		510
451	Returns a single value from the environment database.	511	Returns a single value from the environment database.
…		…
453	=item cf::db_put $family => $key => $value	513	=item cf::db_put $family => $key => $value
454		514
455	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
456	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).
457		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
458	=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	}
459		541
460	our $DB;	542	our $DB;
461		543
462	sub db_init {	544	sub db_init {
463	unless ($DB) {
464	$DB = BDB::db_create $DB_ENV;
465
466	cf::sync_job {	545	cf::sync_job {
467	eval {	546	$DB \|\|= db_table "db";
468	$DB->set_flags (BDB::CHKSUM);
469
470	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
472	cf::cleanup "db_open(db): $!" if $!;
473	};
474	cf::cleanup "db_open(db): $@" if $@;
475	};
476	}	547	};
477	}	548	}
478		549
479	sub db_get($$) {	550	sub db_get($$) {
480	my $key = "$_[0]/$_[1]";	551	my $key = "$_[0]/$_[1]";
481		552
…		…
531	if (1) {	602	if (1) {
532	$md5 =	603	$md5 =
533	join "\x00",	604	join "\x00",
534	$processversion,	605	$processversion,
535	map {	606	map {
536	Coro::cede;	607	cf::cede_to_tick;
537	($src->[$_], Digest::MD5::md5_hex $data[$_])	608	($src->[$_], Digest::MD5::md5_hex $data[$_])
538	} 0.. $#$src;	609	} 0.. $#$src;
539		610
540		611
541	my $dbmd5 = db_get cache => "$id/md5";	612	my $dbmd5 = db_get cache => "$id/md5";
…		…
847	";	918	";
848	die if $@;	919	die if $@;
849	}	920	}
850		921
851	our $override;	922	our $override;
852	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?
853		924
854	sub override {	925	sub override {
855	$override = 1;	926	$override = 1;
856	@invoke_results = ();	927	@INVOKE_RESULTS = (@_);
857	}	928	}
858		929
859	sub do_invoke {	930	sub do_invoke {
860	my $event = shift;	931	my $event = shift;
861	my $callbacks = shift;	932	my $callbacks = shift;
862		933
863	@invoke_results = ();	934	@INVOKE_RESULTS = ();
864		935
865	local $override;	936	local $override;
866		937
867	for (@$callbacks) {	938	for (@$callbacks) {
868	eval { &{$_->[1]} };	939	eval { &{$_->[1]} };
…		…
885		956
886	Generate an object-specific event with the given arguments.	957	Generate an object-specific event with the given arguments.
887		958
888	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
889	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
890	results (if you must, access C<@cf::invoke_results> directly).	961	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891		962
892	=back	963	=back
893		964
894	=cut	965	=cut
895		966
896	#############################################################################	967	#############################################################################
897	# 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	}
898		980
899	sub reattach {	981	sub reattach {
900	# basically do the same as instantiate, without calling instantiate	982	# basically do the same as instantiate, without calling instantiate
901	my ($obj) = @_;	983	my ($obj) = @_;
902		984
…		…
949	sub object_freezer_save {	1031	sub object_freezer_save {
950	my ($filename, $rdata, $objs) = @_;	1032	my ($filename, $rdata, $objs) = @_;
951		1033
952	sync_job {	1034	sync_job {
953	if (length $$rdata) {	1035	if (length $$rdata) {
		1036	utf8::decode (my $decname = $filename);
954	warn sprintf "saving %s (%d,%d)\n",	1037	warn sprintf "saving %s (%d,%d)\n",
955	$filename, length $$rdata, scalar @$objs;	1038	$decname, length $$rdata, scalar @$objs;
956		1039
957	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1040	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
958	chmod SAVE_MODE, $fh;	1041	chmod SAVE_MODE, $fh;
959	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1042	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960	aio_fsync $fh if $cf::USE_FSYNC;	1043	aio_fsync $fh if $cf::USE_FSYNC;
…		…
979	}	1062	}
980	} else {	1063	} else {
981	aio_unlink $filename;	1064	aio_unlink $filename;
982	aio_unlink "$filename.pst";	1065	aio_unlink "$filename.pst";
983	}	1066	}
984	}	1067	};
985	}	1068	}
986		1069
987	sub object_freezer_as_string {	1070	sub object_freezer_as_string {
988	my ($rdata, $objs) = @_;	1071	my ($rdata, $objs) = @_;
989		1072
…		…
1001	or return;	1084	or return;
1002		1085
1003	unless (aio_stat "$filename.pst") {	1086	unless (aio_stat "$filename.pst") {
1004	(aio_load "$filename.pst", $av) >= 0	1087	(aio_load "$filename.pst", $av) >= 0
1005	or return;	1088	or return;
		1089
1006	$av = eval { (Storable::thaw $av)->{objs} };	1090	$av = eval { (Storable::thaw $av)->{objs} };
1007	}	1091	}
1008		1092
		1093	utf8::decode (my $decname = $filename);
1009	warn sprintf "loading %s (%d)\n",	1094	warn sprintf "loading %s (%d,%d)\n",
1010	$filename, length $data, scalar @{$av \|\| []};	1095	$decname, length $data, scalar @{$av \|\| []};
		1096
1011	return ($data, $av);	1097	($data, $av)
1012	}	1098	}
1013		1099
1014	=head2 COMMAND CALLBACKS	1100	=head2 COMMAND CALLBACKS
1015		1101
1016	=over 4	1102	=over 4
…		…
1089	my ($pl, $buf) = @_;	1175	my ($pl, $buf) = @_;
1090		1176
1091	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1177	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092		1178
1093	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
1094	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1187	if (my $cb = $EXTCMD{$type}) {
1095	if (my %reply = $cb->($pl, $msg)) {	1188	@reply = $cb->($pl, @payload);
1096	$pl->ext_reply ($msg->{msgid}, %reply);
1097	}
1098	}	1189	}
		1190
		1191	$pl->ext_reply ($reply, @reply)
		1192	if $reply;
		1193
1099	} else {	1194	} else {
1100	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1195	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101	}	1196	}
1102		1197
1103	cf::override;	1198	cf::override;
…		…
1193		1288
1194	=head3 cf::player	1289	=head3 cf::player
1195		1290
1196	=over 4	1291	=over 4
1197		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
1198	=item cf::player::find $login	1307	=item cf::player::find $login
1199		1308
1200	Returns the given player object, loading it if necessary (might block).	1309	Returns the given player object, loading it if necessary (might block).
1201		1310
1202	=cut	1311	=cut
…		…
1237	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1346	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1347	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1348	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240	aio_unlink +(playerdir $login) . "/$login.pl";	1349	aio_unlink +(playerdir $login) . "/$login.pl";
1241		1350
1242	my $pl = load_pl path $login	1351	my $f = new_from_file cf::object::thawer path $login
1243	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;
1244	$cf::PLAYER{$login} = $pl	1358	$cf::PLAYER{$login} = $pl
1245	}	1359	}
1246	}	1360	}
1247	}	1361	}
1248		1362
…		…
1258		1372
1259	aio_mkdir playerdir $pl, 0770;	1373	aio_mkdir playerdir $pl, 0770;
1260	$pl->{last_save} = $cf::RUNTIME;	1374	$pl->{last_save} = $cf::RUNTIME;
1261		1375
1262	$pl->save_pl ($path);	1376	$pl->save_pl ($path);
1263	Coro::cede;	1377	cf::cede_to_tick;
1264	}	1378	}
1265		1379
1266	sub new($) {	1380	sub new($) {
1267	my ($login) = @_;	1381	my ($login) = @_;
1268		1382
…		…
1272	$self->{deny_save} = 1;	1386	$self->{deny_save} = 1;
1273		1387
1274	$cf::PLAYER{$login} = $self;	1388	$cf::PLAYER{$login} = $self;
1275		1389
1276	$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 (@_);
1277	}	1401	}
1278		1402
1279	=item $pl->quit_character	1403	=item $pl->quit_character
1280		1404
1281	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
…		…
1336	or return [];	1460	or return [];
1337		1461
1338	my @logins;	1462	my @logins;
1339		1463
1340	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") {
1341	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1469	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342	aio_read $fh, 0, 512, my $buf, 0 or next;	1470	aio_read $fh, 0, 512, my $buf, 0 or next;
1343	$buf !~ /^password -------------$/m or next; # official not-valid tag	1471	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1472	}
1344		1473
1345	utf8::decode $login;	1474	utf8::decode $login;
1346	push @logins, $login;	1475	push @logins, $login;
1347	}	1476	}
1348		1477
…		…
1386	sub expand_cfpod {	1515	sub expand_cfpod {
1387	((my $self), (local $_)) = @_;	1516	((my $self), (local $_)) = @_;
1388		1517
1389	# escape & and <	1518	# escape & and <
1390	s/&/&/g;	1519	s/&/&/g;
1391	s/(?<![BIUGH])</</g;	1520	s/(?<![BIUGHT])</</g;
1392		1521
1393	# 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
1394		1523
1395	1 while	1524	1 while
1396	# replace B<>, I<>, U<> etc.	1525	# replace B<>, I<>, U<> etc.
1397	s/B<([^\>]*)>/<b>$1<\/b>/	1526	s/B<([^\>]*)>/<b>$1<\/b>/
1398	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1527	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1399	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1528	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1529	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1400	# replace G<male\|female> tags	1530	# replace G<male\|female> tags
1401	\|\| s{G<([^>\|])\\|([^>])>}{	1531	\|\| s{G<([^>\|])\\|([^>])>}{
1402	$self->gender ? $2 : $1	1532	$self->gender ? $2 : $1
1403	}ge	1533	}ge
1404	# replace H<hint text>	1534	# replace H<hint text>
…		…
1412		1542
1413	# create single paragraphs (very hackish)	1543	# create single paragraphs (very hackish)
1414	s/(?<=\S)\n(?=\w)/ /g;	1544	s/(?<=\S)\n(?=\w)/ /g;
1415		1545
1416	# compress some whitespace	1546	# compress some whitespace
1417	1 while s/\s\n\s\n\s*/\n/;	1547	s/\s+\n/\n/g; # ws line-ends
1418		1548	s/\n\n+/\n/g; # double lines
1419	s/^\s+//;	1549	s/^\n+//; # beginning lines
1420	s/\s+$//;	1550	s/\n+$//; # ending lines
1421		1551
1422	$_	1552	$_
1423	}	1553	}
1424		1554
1425	sub hintmode {	1555	sub hintmode {
1426	$_[0]{hintmode} = $_[1] if @_ > 1;	1556	$_[0]{hintmode} = $_[1] if @_ > 1;
1427	$_[0]{hintmode}	1557	$_[0]{hintmode}
1428	}	1558	}
1429		1559
1430	=item $player->ext_reply ($msgid, %msg)	1560	=item $player->ext_reply ($msgid, @msg)
1431		1561
1432	Sends an ext reply to the player.	1562	Sends an ext reply to the player.
1433		1563
1434	=cut	1564	=cut
1435		1565
1436	sub ext_reply($$%) {	1566	sub ext_reply($$@) {
1437	my ($self, $id, %msg) = @_;	1567	my ($self, $id, @msg) = @_;
1438		1568
1439	$msg{msgid} = $id;	1569	$self->ns->ext_reply ($id, @msg)
1440	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1441	}	1570	}
1442		1571
1443	=item $player->ext_event ($type, %msg)	1572	=item $player->ext_msg ($type, @msg)
1444		1573
1445	Sends an ext event to the client.	1574	Sends an ext event to the client.
1446		1575
1447	=cut	1576	=cut
1448		1577
1449	sub ext_event($$%) {	1578	sub ext_msg($$@) {
1450	my ($self, $type, %msg) = @_;	1579	my ($self, $type, @msg) = @_;
1451		1580
1452	$self->ns->ext_event ($type, %msg);	1581	$self->ns->ext_msg ($type, @msg);
1453	}	1582	}
1454		1583
1455	=head3 cf::region	1584	=head3 cf::region
1456		1585
1457	=over 4	1586	=over 4
…		…
1470	my ($path) = @_;	1599	my ($path) = @_;
1471		1600
1472	my ($match, $specificity);	1601	my ($match, $specificity);
1473		1602
1474	for my $region (list) {	1603	for my $region (list) {
1475	if ($region->match && $path =~ $region->match) {	1604	if ($region->{match} && $path =~ $region->{match}) {
1476	($match, $specificity) = ($region, $region->specificity)	1605	($match, $specificity) = ($region, $region->specificity)
1477	if $region->specificity > $specificity;	1606	if $region->specificity > $specificity;
1478	}	1607	}
1479	}	1608	}
1480		1609
…		…
1600	$self->init; # pass $1 etc.	1729	$self->init; # pass $1 etc.
1601	return $self;	1730	return $self;
1602	}	1731	}
1603	}	1732	}
1604		1733
1605	Carp::carp "unable to resolve path '$path' (base '$base').";	1734	Carp::cluck "unable to resolve path '$path' (base '$base').";
1606	()	1735	()
1607	}	1736	}
1608		1737
1609	sub init {	1738	sub init {
1610	my ($self) = @_;	1739	my ($self) = @_;
…		…
1673		1802
1674	sub load_header_from($) {	1803	sub load_header_from($) {
1675	my ($self, $path) = @_;	1804	my ($self, $path) = @_;
1676		1805
1677	utf8::encode $path;	1806	utf8::encode $path;
1678	#aio_open $path, O_RDONLY, 0	1807	my $f = new_from_file cf::object::thawer $path
1679	# or return;
1680
1681	$self->_load_header ($path)
1682	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;
1683		1815
1684	$self->{load_path} = $path;	1816	$self->{load_path} = $path;
1685		1817
1686	1	1818	1
1687	}	1819	}
…		…
1741	sub find {	1873	sub find {
1742	my ($path, $origin) = @_;	1874	my ($path, $origin) = @_;
1743		1875
1744	$path = normalise $path, $origin && $origin->path;	1876	$path = normalise $path, $origin && $origin->path;
1745		1877
		1878	cf::lock_wait "map_data:$path";#d#remove
1746	cf::lock_wait "map_find:$path";	1879	cf::lock_wait "map_find:$path";
1747		1880
1748	$cf::MAP{$path} \|\| do {	1881	$cf::MAP{$path} \|\| do {
1749	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
1750	my $map = new_from_path cf::map $path	1885	my $map = new_from_path cf::map $path
1751	or return;	1886	or return;
1752		1887
1753	$map->{last_save} = $cf::RUNTIME;	1888	$map->{last_save} = $cf::RUNTIME;
1754		1889
…		…
1756	or return;	1891	or return;
1757		1892
1758	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1893	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1759	# doing this can freeze the server in a sync job, obviously	1894	# doing this can freeze the server in a sync job, obviously
1760	#$cf::WAIT_FOR_TICK->wait;	1895	#$cf::WAIT_FOR_TICK->wait;
		1896	undef $guard1;
		1897	undef $guard2;
1761	$map->reset;	1898	$map->reset;
1762	undef $guard;
1763	return find $path;	1899	return find $path;
1764	}	1900	}
1765		1901
1766	$cf::MAP{$path} = $map	1902	$cf::MAP{$path} = $map
1767	}	1903	}
…		…
1776	local $self->{deny_reset} = 1; # loading can take a long time	1912	local $self->{deny_reset} = 1; # loading can take a long time
1777		1913
1778	my $path = $self->{path};	1914	my $path = $self->{path};
1779		1915
1780	{	1916	{
1781	my $guard = cf::lock_acquire "map_load:$path";	1917	my $guard = cf::lock_acquire "map_data:$path";
1782		1918
		1919	return unless $self->valid;
1783	return if $self->in_memory != cf::MAP_SWAPPED;	1920	return unless $self->in_memory == cf::MAP_SWAPPED;
1784		1921
1785	$self->in_memory (cf::MAP_LOADING);	1922	$self->in_memory (cf::MAP_LOADING);
1786		1923
1787	$self->alloc;	1924	$self->alloc;
1788		1925
1789	$self->pre_load;	1926	$self->pre_load;
1790	Coro::cede;	1927	cf::cede_to_tick;
1791		1928
		1929	my $f = new_from_file cf::object::thawer $self->{load_path};
		1930	$f->skip_block;
1792	$self->_load_objects ($self->{load_path}, 1)	1931	$self->_load_objects ($f)
1793	or return;	1932	or return;
1794		1933
1795	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1934	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1796	if delete $self->{load_original};	1935	if delete $self->{load_original};
1797		1936
1798	if (my $uniq = $self->uniq_path) {	1937	if (my $uniq = $self->uniq_path) {
1799	utf8::encode $uniq;	1938	utf8::encode $uniq;
1800	if (aio_open $uniq, O_RDONLY, 0) {	1939	unless (aio_stat $uniq) {
		1940	if (my $f = new_from_file cf::object::thawer $uniq) {
1801	$self->clear_unique_items;	1941	$self->clear_unique_items;
1802	$self->_load_objects ($uniq, 0);	1942	$self->_load_objects ($f);
		1943	$f->resolve_delayed_derefs;
		1944	}
1803	}	1945	}
1804	}	1946	}
1805		1947
1806	Coro::cede;	1948	$f->resolve_delayed_derefs;
		1949
		1950	cf::cede_to_tick;
1807	# now do the right thing for maps	1951	# now do the right thing for maps
1808	$self->link_multipart_objects;	1952	$self->link_multipart_objects;
1809	$self->difficulty ($self->estimate_difficulty)	1953	$self->difficulty ($self->estimate_difficulty)
1810	unless $self->difficulty;	1954	unless $self->difficulty;
1811	Coro::cede;	1955	cf::cede_to_tick;
1812		1956
1813	unless ($self->{deny_activate}) {	1957	unless ($self->{deny_activate}) {
1814	$self->decay_objects;	1958	$self->decay_objects;
1815	$self->fix_auto_apply;	1959	$self->fix_auto_apply;
1816	$self->update_buttons;	1960	$self->update_buttons;
1817	Coro::cede;	1961	cf::cede_to_tick;
1818	$self->set_darkness_map;	1962	$self->set_darkness_map;
1819	Coro::cede;	1963	cf::cede_to_tick;
1820	$self->activate;	1964	$self->activate;
1821	}	1965	}
		1966
		1967	$self->{last_save} = $cf::RUNTIME;
		1968	$self->last_access ($cf::RUNTIME);
1822		1969
1823	$self->in_memory (cf::MAP_IN_MEMORY);	1970	$self->in_memory (cf::MAP_IN_MEMORY);
1824	}	1971	}
1825		1972
1826	$self->post_load;	1973	$self->post_load;
…		…
1837		1984
1838	$self	1985	$self
1839	}	1986	}
1840		1987
1841	# 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
1842	sub load_diag {	1989	sub load_neighbours {
1843	my ($map) = @_;	1990	my ($map) = @_;
1844		1991
1845	my @diag; # diagonal neighbours	1992	my @neigh; # diagonal neighbours
1846		1993
1847	for (0 .. 3) {	1994	for (0 .. 3) {
1848	my $neigh = $map->tile_path ($_)	1995	my $neigh = $map->tile_path ($_)
1849	or next;	1996	or next;
1850	$neigh = find $neigh, $map	1997	$neigh = find $neigh, $map
1851	or next;	1998	or next;
1852	$neigh->load;	1999	$neigh->load;
1853		2000
		2001	push @neigh,
1854	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2002	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1855	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2003	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1856	}	2004	}
1857		2005
1858	for (@diag) {	2006	for (grep defined $_->[0], @neigh) {
		2007	my ($path, $origin) = @$_;
1859	my $neigh = find @$_	2008	my $neigh = find $path, $origin
1860	or next;	2009	or next;
1861	$neigh->load;	2010	$neigh->load;
1862	}	2011	}
1863	}	2012	}
1864		2013
…		…
1869	}	2018	}
1870		2019
1871	sub do_load_sync {	2020	sub do_load_sync {
1872	my ($map) = @_;	2021	my ($map) = @_;
1873		2022
		2023	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2024	if $Coro::current == $Coro::main;
		2025
1874	cf::sync_job { $map->load };	2026	cf::sync_job { $map->load };
1875	}	2027	}
1876		2028
1877	our %MAP_PREFETCH;	2029	our %MAP_PREFETCH;
1878	our $MAP_PREFETCHER = undef;	2030	our $MAP_PREFETCHER = undef;
1879		2031
1880	sub find_async {	2032	sub find_async {
1881	my ($path, $origin) = @_;	2033	my ($path, $origin, $load) = @_;
1882		2034
1883	$path = normalise $path, $origin && $origin->{path};	2035	$path = normalise $path, $origin && $origin->{path};
1884		2036
1885	if (my $map = $cf::MAP{$path}) {	2037	if (my $map = $cf::MAP{$path}) {
1886	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2038	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1887	}	2039	}
1888		2040
1889	undef $MAP_PREFETCH{$path};	2041	$MAP_PREFETCH{$path} \|= $load;
		2042
1890	$MAP_PREFETCHER \|\|= cf::async {	2043	$MAP_PREFETCHER \|\|= cf::async {
		2044	$Coro::current->{desc} = "map prefetcher";
		2045
1891	while (%MAP_PREFETCH) {	2046	while (%MAP_PREFETCH) {
1892	for my $path (keys %MAP_PREFETCH) {	2047	while (my ($k, $v) = each %MAP_PREFETCH) {
1893	my $map = find $path	2048	if (my $map = find $k) {
1894	or next;
1895	$map->load;	2049	$map->load if $v;
		2050	}
1896		2051
1897	delete $MAP_PREFETCH{$path};	2052	delete $MAP_PREFETCH{$k};
1898	}	2053	}
1899	}	2054	}
1900	undef $MAP_PREFETCHER;	2055	undef $MAP_PREFETCHER;
1901	};	2056	};
1902	$MAP_PREFETCHER->prio (6);	2057	$MAP_PREFETCHER->prio (6);
…		…
1905	}	2060	}
1906		2061
1907	sub save {	2062	sub save {
1908	my ($self) = @_;	2063	my ($self) = @_;
1909		2064
1910	my $lock = cf::lock_acquire "map_data:" . $self->path;	2065	my $lock = cf::lock_acquire "map_data:$self->{path}";
1911		2066
1912	$self->{last_save} = $cf::RUNTIME;	2067	$self->{last_save} = $cf::RUNTIME;
1913		2068
1914	return unless $self->dirty;	2069	return unless $self->dirty;
1915		2070
…		…
1921	return if $self->{deny_save};	2076	return if $self->{deny_save};
1922		2077
1923	local $self->{last_access} = $self->last_access;#d#	2078	local $self->{last_access} = $self->last_access;#d#
1924		2079
1925	cf::async {	2080	cf::async {
		2081	$Coro::current->{desc} = "map player save";
1926	$_->contr->save for $self->players;	2082	$_->contr->save for $self->players;
1927	};	2083	};
1928		2084
1929	if ($uniq) {	2085	if ($uniq) {
1930	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	2086	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
…		…
1938	my ($self) = @_;	2094	my ($self) = @_;
1939		2095
1940	# save first because save cedes	2096	# save first because save cedes
1941	$self->save;	2097	$self->save;
1942		2098
1943	my $lock = cf::lock_acquire "map_data:" . $self->path;	2099	my $lock = cf::lock_acquire "map_data:$self->{path}";
1944		2100
1945	return if $self->players;	2101	return if $self->players;
1946	return if $self->in_memory != cf::MAP_IN_MEMORY;	2102	return if $self->in_memory != cf::MAP_IN_MEMORY;
1947	return if $self->{deny_save};	2103	return if $self->{deny_save};
1948		2104
		2105	$self->in_memory (cf::MAP_SWAPPED);
		2106
		2107	$self->deactivate;
		2108	$_->clear_links_to ($self) for values %cf::MAP;
1949	$self->clear;	2109	$self->clear;
1950	$self->in_memory (cf::MAP_SWAPPED);
1951	}	2110	}
1952		2111
1953	sub reset_at {	2112	sub reset_at {
1954	my ($self) = @_;	2113	my ($self) = @_;
1955		2114
…		…
1987	if $uniq;	2146	if $uniq;
1988	}	2147	}
1989		2148
1990	delete $cf::MAP{$self->path};	2149	delete $cf::MAP{$self->path};
1991		2150
		2151	$self->deactivate;
		2152	$_->clear_links_to ($self) for values %cf::MAP;
1992	$self->clear;	2153	$self->clear;
1993
1994	$_->clear_links_to ($self) for values %cf::MAP;
1995		2154
1996	$self->unlink_save;	2155	$self->unlink_save;
1997	$self->destroy;	2156	$self->destroy;
1998	}	2157	}
1999		2158
2000	my $nuke_counter = "aaaa";	2159	my $nuke_counter = "aaaa";
2001		2160
2002	sub nuke {	2161	sub nuke {
2003	my ($self) = @_;	2162	my ($self) = @_;
2004		2163
		2164	{
		2165	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2166
2005	delete $cf::MAP{$self->path};	2167	delete $cf::MAP{$self->path};
2006		2168
2007	$self->unlink_save;	2169	$self->unlink_save;
2008		2170
2009	bless $self, "cf::map";	2171	bless $self, "cf::map";
2010	delete $self->{deny_reset};	2172	delete $self->{deny_reset};
2011	$self->{deny_save} = 1;	2173	$self->{deny_save} = 1;
2012	$self->reset_timeout (1);	2174	$self->reset_timeout (1);
2013	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2175	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2014		2176
2015	$cf::MAP{$self->path} = $self;	2177	$cf::MAP{$self->path} = $self;
		2178	}
2016		2179
2017	$self->reset; # polite request, might not happen	2180	$self->reset; # polite request, might not happen
2018	}	2181	}
2019		2182
2020	=item $maps = cf::map::tmp_maps	2183	=item $maps = cf::map::tmp_maps
…		…
2096		2259
2097	sub inv_recursive {	2260	sub inv_recursive {
2098	inv_recursive_ inv $_[0]	2261	inv_recursive_ inv $_[0]
2099	}	2262	}
2100		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	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2279	my ($uuid, $name) = ($1, $2);
		2280	my $pl = $cf::PLAYER_LOADING{$name} \|\| cf::player::find $name
		2281	or return;
		2282	$pl->ob->uuid eq $uuid
		2283	or return;
		2284
		2285	$pl->ob
		2286	} else {
		2287	warn "$ref: cannot resolve object reference\n";
		2288	undef
		2289	}
		2290	}
		2291
2101	package cf;	2292	package cf;
2102		2293
2103	=back	2294	=back
2104		2295
2105	=head3 cf::object::player	2296	=head3 cf::object::player
…		…
2127		2318
2128	} else {	2319	} else {
2129	my $pl = $self->contr;	2320	my $pl = $self->contr;
2130		2321
2131	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2322	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2132	my $diag = $pl->{npc_dialog};	2323	my $dialog = $pl->{npc_dialog};
2133	$diag->{pl}->ext_reply (	2324	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2134	$diag->{id},
2135	msgtype => "reply",
2136	msg => $diag->{pl}->expand_cfpod ($msg),
2137	add_topics => []
2138	);
2139		2325
2140	} else {	2326	} else {
2141	$msg = $npc->name . " says: $msg" if $npc;	2327	$msg = $npc->name . " says: $msg" if $npc;
2142	$self->message ($msg, $flags);	2328	$self->message ($msg, $flags);
2143	}	2329	}
2144	}	2330	}
		2331	}
		2332
		2333	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2334
		2335	=cut
		2336
		2337	sub cf::object::send_msg {
		2338	my $pl = shift->contr
		2339	or return;
		2340	$pl->send_msg (@_);
2145	}	2341	}
2146		2342
2147	=item $player_object->may ("access")	2343	=item $player_object->may ("access")
2148		2344
2149	Returns wether the given player is authorized to access resource "access"	2345	Returns wether the given player is authorized to access resource "access"
…		…
2228	# use -1 or undef as default coordinates, not 0, 0	2424	# use -1 or undef as default coordinates, not 0, 0
2229	($x, $y) = ($map->enter_x, $map->enter_y)	2425	($x, $y) = ($map->enter_x, $map->enter_y)
2230	if $x <=0 && $y <= 0;	2426	if $x <=0 && $y <= 0;
2231		2427
2232	$map->load;	2428	$map->load;
2233	$map->load_diag;	2429	$map->load_neighbours;
2234		2430
2235	return unless $self->contr->active;	2431	return unless $self->contr->active;
2236	$self->activate_recursive;	2432	$self->activate_recursive;
2237		2433
2238	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2434	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2239	$self->enter_map ($map, $x, $y);	2435	$self->enter_map ($map, $x, $y);
2240	}	2436	}
2241		2437
2242	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2438	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2243		2439
2244	Moves the player to the given map-path and coordinates by first freezing	2440	Moves the player to the given map-path and coordinates by first freezing
2245	her, loading and preparing them map, calling the provided $check callback	2441	her, loading and preparing them map, calling the provided $check callback
2246	that has to return the map if sucecssful, and then unfreezes the player on	2442	that has to return the map if sucecssful, and then unfreezes the player on
2247	the new (success) or old (failed) map position.	2443	the new (success) or old (failed) map position. In either case, $done will
		2444	be called at the end of this process.
2248		2445
2249	=cut	2446	=cut
2250		2447
2251	our $GOTOGEN;	2448	our $GOTOGEN;
2252		2449
2253	sub cf::object::player::goto {	2450	sub cf::object::player::goto {
2254	my ($self, $path, $x, $y, $check) = @_;	2451	my ($self, $path, $x, $y, $check, $done) = @_;
2255		2452
2256	# do generation counting so two concurrent goto's will be executed in-order	2453	# do generation counting so two concurrent goto's will be executed in-order
2257	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2454	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2258		2455
2259	$self->enter_link;	2456	$self->enter_link;
2260		2457
2261	(async {	2458	(async {
		2459	$Coro::current->{desc} = "player::goto $path $x $y";
		2460
		2461	# *tag paths override both path and x\|y
		2462	if ($path =~ /^\(.)$/) {
		2463	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2464	my $ob = $obs[rand @obs];
		2465
		2466	# see if we actually can go there
		2467	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2468	$ob = $obs[rand @obs];
		2469	} else {
		2470	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE \| cf::NDI_RED);
		2471	}
		2472	# else put us there anyways for now #d#
		2473
		2474	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2475	} else {
		2476	($path, $x, $y) = (undef, undef, undef);
		2477	}
		2478	}
		2479
2262	my $map = eval {	2480	my $map = eval {
2263	my $map = cf::map::find $path;	2481	my $map = defined $path ? cf::map::find $path : undef;
2264		2482
2265	if ($map) {	2483	if ($map) {
2266	$map = $map->customise_for ($self);	2484	$map = $map->customise_for ($self);
2267	$map = $check->($map) if $check && $map;	2485	$map = $check->($map) if $check && $map;
2268	} else {	2486	} else {
2269	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);	2487	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE \| cf::NDI_RED);
2270	}	2488	}
2271		2489
2272	$map	2490	$map
2273	};	2491	};
2274		2492
…		…
2279		2497
2280	if ($gen == $self->{_goto_generation}) {	2498	if ($gen == $self->{_goto_generation}) {
2281	delete $self->{_goto_generation};	2499	delete $self->{_goto_generation};
2282	$self->leave_link ($map, $x, $y);	2500	$self->leave_link ($map, $x, $y);
2283	}	2501	}
		2502
		2503	$done->() if $done;
2284	})->prio (1);	2504	})->prio (1);
2285	}	2505	}
2286		2506
2287	=item $player_object->enter_exit ($exit_object)	2507	=item $player_object->enter_exit ($exit_object)
2288		2508
…		…
2357	my $hp = $exit->stats->hp;	2577	my $hp = $exit->stats->hp;
2358	my $sp = $exit->stats->sp;	2578	my $sp = $exit->stats->sp;
2359		2579
2360	$self->enter_link;	2580	$self->enter_link;
2361		2581
		2582	# if exit is damned, update players death & WoR home-position
		2583	$self->contr->savebed ($slaying, $hp, $sp)
		2584	if $exit->flag (FLAG_DAMNED);
		2585
2362	(async {	2586	(async {
		2587	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2588
2363	$self->deactivate_recursive; # just to be sure	2589	$self->deactivate_recursive; # just to be sure
2364	unless (eval {	2590	unless (eval {
2365	$self->goto ($slaying, $hp, $sp);	2591	$self->goto ($slaying, $hp, $sp);
2366		2592
2367	1;	2593	1;
…		…
2393		2619
2394	utf8::encode $text;	2620	utf8::encode $text;
2395	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2621	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2396	}	2622	}
2397		2623
2398	=item $client->send_msg ($color, $type, $msg, [extra...])	2624	=item $client->send_msg ($channel, $msg, $color, [extra...])
2399		2625
2400	Send a drawinfo or msg packet to the client, formatting the msg for the	2626	Send a drawinfo or msg packet to the client, formatting the msg for the
2401	client if neccessary. C<$type> should be a string identifying the type of	2627	client if neccessary. C<$type> should be a string identifying the type of
2402	the message, with C<log> being the default. If C<$color> is negative, suppress	2628	the message, with C<log> being the default. If C<$color> is negative, suppress
2403	the message unless the client supports the msg packet.	2629	the message unless the client supports the msg packet.
2404		2630
2405	=cut	2631	=cut
2406		2632
		2633	our %CHANNEL = (
		2634	"c/identify" => {
		2635	id => "infobox",
		2636	title => "Identify",
		2637	reply => undef,
		2638	tooltip => "Items recently identified",
		2639	},
		2640	"c/examine" => {
		2641	id => "infobox",
		2642	title => "Examine",
		2643	reply => undef,
		2644	tooltip => "Signs and other items you examined",
		2645	},
		2646	"c/lookat" => {
		2647	id => "infobox",
		2648	title => "Look",
		2649	reply => undef,
		2650	tooltip => "What you saw there",
		2651	},
		2652	);
		2653
2407	sub cf::client::send_msg {	2654	sub cf::client::send_msg {
2408	my ($self, $color, $type, $msg, @extra) = @_;	2655	my ($self, $channel, $msg, $color, @extra) = @_;
2409		2656
2410	$msg = $self->pl->expand_cfpod ($msg);	2657	$msg = $self->pl->expand_cfpod ($msg);
2411		2658
		2659	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2660
		2661	# check predefined channels, for the benefit of C
		2662	if ($CHANNEL{$channel}) {
		2663	$channel = $CHANNEL{$channel};
		2664
		2665	$self->ext_msg (channel_info => $channel)
		2666	if $self->can_msg;
		2667
		2668	$channel = $channel->{id};
		2669
		2670	} elsif (ref $channel) {
		2671	# send meta info to client, if not yet sent
		2672	unless (exists $self->{channel}{$channel->{id}}) {
		2673	$self->{channel}{$channel->{id}} = $channel;
		2674	$self->ext_msg (channel_info => $channel)
		2675	if $self->can_msg;
		2676	}
		2677
		2678	$channel = $channel->{id};
		2679	}
		2680
		2681	return unless @extra \|\| length $msg;
		2682
2412	if ($self->can_msg) {	2683	if ($self->can_msg) {
		2684	# default colour, mask it out
		2685	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2686	if $color & cf::NDI_DEF;
		2687
2413	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));	2688	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2689	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2414	} else {	2690	} else {
2415	# replace some tags by gcfclient-compatible ones
2416	for ($msg) {
2417	1 while
2418	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2419	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2420	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2421	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2422	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2423	}
2424
2425	if ($color >= 0) {	2691	if ($color >= 0) {
		2692	# replace some tags by gcfclient-compatible ones
		2693	for ($msg) {
		2694	1 while
		2695	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2696	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2697	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2698	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2699	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2700	}
		2701
		2702	$color &= cf::NDI_COLOR_MASK;
		2703
		2704	utf8::encode $msg;
		2705
2426	if (0 && $msg =~ /\[/) {	2706	if (0 && $msg =~ /\[/) {
		2707	# COMMAND/INFO
2427	$self->send_packet ("drawextinfo $color 4 0 $msg")	2708	$self->send_packet ("drawextinfo $color 10 8 $msg")
2428	} else {	2709	} else {
2429	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2710	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2430	$self->send_packet ("drawinfo $color $msg")	2711	$self->send_packet ("drawinfo $color $msg")
2431	}	2712	}
2432	}	2713	}
2433	}	2714	}
2434	}	2715	}
2435		2716
2436	=item $client->ext_event ($type, %msg)	2717	=item $client->ext_msg ($type, @msg)
2437		2718
2438	Sends an ext event to the client.	2719	Sends an ext event to the client.
2439		2720
2440	=cut	2721	=cut
2441		2722
2442	sub cf::client::ext_event($$%) {	2723	sub cf::client::ext_msg($$@) {
2443	my ($self, $type, %msg) = @_;	2724	my ($self, $type, @msg) = @_;
2444		2725
		2726	if ($self->extcmd == 2) {
		2727	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2728	} elsif ($self->extcmd == 1) { # TODO: remove
2445	$msg{msgtype} = "event_$type";	2729	push @msg, msgtype => "event_$type";
2446	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2730	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2731	}
		2732	}
		2733
		2734	=item $client->ext_reply ($msgid, @msg)
		2735
		2736	Sends an ext reply to the client.
		2737
		2738	=cut
		2739
		2740	sub cf::client::ext_reply($$@) {
		2741	my ($self, $id, @msg) = @_;
		2742
		2743	if ($self->extcmd == 2) {
		2744	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2745	} elsif ($self->extcmd == 1) {
		2746	#TODO: version 1, remove
		2747	unshift @msg, msgtype => "reply", msgid => $id;
		2748	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2749	}
2447	}	2750	}
2448		2751
2449	=item $success = $client->query ($flags, "text", \&cb)	2752	=item $success = $client->query ($flags, "text", \&cb)
2450		2753
2451	Queues a query to the client, calling the given callback with	2754	Queues a query to the client, calling the given callback with
…		…
2506	my ($ns, $buf) = @_;	2809	my ($ns, $buf) = @_;
2507		2810
2508	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2811	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2509		2812
2510	if (ref $msg) {	2813	if (ref $msg) {
		2814	my ($type, $reply, @payload) =
		2815	"ARRAY" eq ref $msg
		2816	? @$msg
		2817	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2818
		2819	my @reply;
		2820
2511	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2821	if (my $cb = $EXTICMD{$type}) {
2512	if (my %reply = $cb->($ns, $msg)) {	2822	@reply = $cb->($ns, @payload);
2513	$reply{msgid} = $msg->{msgid};
2514	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2515	}
2516	}	2823	}
		2824
		2825	$ns->ext_reply ($reply, @reply)
		2826	if $reply;
		2827
2517	} else {	2828	} else {
2518	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2829	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2519	}	2830	}
2520		2831
2521	cf::override;	2832	cf::override;
…		…
2568	our $safe = new Safe "safe";	2879	our $safe = new Safe "safe";
2569	our $safe_hole = new Safe::Hole;	2880	our $safe_hole = new Safe::Hole;
2570		2881
2571	$SIG{FPE} = 'IGNORE';	2882	$SIG{FPE} = 'IGNORE';
2572		2883
2573	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2884	$safe->permit_only (Opcode::opset qw(
		2885	:base_core :base_mem :base_orig :base_math
		2886	grepstart grepwhile mapstart mapwhile
		2887	sort time
		2888	));
2574		2889
2575	# here we export the classes and methods available to script code	2890	# here we export the classes and methods available to script code
2576		2891
2577	=pod	2892	=pod
2578		2893
2579	The following functions and methods are available within a safe environment:	2894	The following functions and methods are available within a safe environment:
2580		2895
2581	cf::object contr pay_amount pay_player map	2896	cf::object
		2897	contr pay_amount pay_player map x y force_find force_add
		2898	insert remove name archname title slaying race decrease_ob_nr
		2899
2582	cf::object::player player	2900	cf::object::player
2583	cf::player peaceful	2901	player
2584	cf::map trigger	2902
		2903	cf::player
		2904	peaceful
		2905
		2906	cf::map
		2907	trigger
2585		2908
2586	=cut	2909	=cut
2587		2910
2588	for (	2911	for (
2589	["cf::object" => qw(contr pay_amount pay_player map)],	2912	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2913	insert remove inv name archname title slaying race
		2914	decrease_ob_nr)],
2590	["cf::object::player" => qw(player)],	2915	["cf::object::player" => qw(player)],
2591	["cf::player" => qw(peaceful)],	2916	["cf::player" => qw(peaceful)],
2592	["cf::map" => qw(trigger)],	2917	["cf::map" => qw(trigger)],
2593	) {	2918	) {
2594	no strict 'refs';	2919	no strict 'refs';
…		…
2670	# the server's init and main functions	2995	# the server's init and main functions
2671		2996
2672	sub load_facedata($) {	2997	sub load_facedata($) {
2673	my ($path) = @_;	2998	my ($path) = @_;
2674		2999
		3000	# HACK to clear player env face cache, we need some signal framework
		3001	# for this (global event?)
		3002	%ext::player_env::MUSIC_FACE_CACHE = ();
		3003
		3004	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3005
2675	warn "loading facedata from $path\n";	3006	warn "loading facedata from $path\n";
2676		3007
2677	my $facedata;	3008	my $facedata;
2678	0 < aio_load $path, $facedata	3009	0 < aio_load $path, $facedata
2679	or die "$path: $!";	3010	or die "$path: $!";
…		…
2681	$facedata = Coro::Storable::thaw $facedata;	3012	$facedata = Coro::Storable::thaw $facedata;
2682		3013
2683	$facedata->{version} == 2	3014	$facedata->{version} == 2
2684	or cf::cleanup "$path: version mismatch, cannot proceed.";	3015	or cf::cleanup "$path: version mismatch, cannot proceed.";
2685		3016
		3017	# patch in the exptable
		3018	$facedata->{resource}{"res/exp_table"} = {
		3019	type => FT_RSRC,
		3020	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3021	};
		3022	cf::cede_to_tick;
		3023
2686	{	3024	{
2687	my $faces = $facedata->{faceinfo};	3025	my $faces = $facedata->{faceinfo};
2688		3026
2689	while (my ($face, $info) = each %$faces) {	3027	while (my ($face, $info) = each %$faces) {
2690	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3028	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2691	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3029	cf::face::set_visibility $idx, $info->{visibility};
		3030	cf::face::set_magicmap $idx, $info->{magicmap};
2692	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3031	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2693	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3032	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2694	Coro::cede;	3033
		3034	cf::cede_to_tick;
2695	}	3035	}
2696		3036
2697	while (my ($face, $info) = each %$faces) {	3037	while (my ($face, $info) = each %$faces) {
2698	next unless $info->{smooth};	3038	next unless $info->{smooth};
2699	my $idx = cf::face::find $face	3039	my $idx = cf::face::find $face
2700	or next;	3040	or next;
2701	if (my $smooth = cf::face::find $info->{smooth}) {	3041	if (my $smooth = cf::face::find $info->{smooth}) {
		3042	cf::face::set_smooth $idx, $smooth;
2702	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3043	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2703	} else {	3044	} else {
2704	warn "smooth face '$info->{smooth}' not found for face '$face'";	3045	warn "smooth face '$info->{smooth}' not found for face '$face'";
2705	}	3046	}
2706	Coro::cede;	3047
		3048	cf::cede_to_tick;
2707	}	3049	}
2708	}	3050	}
2709		3051
2710	{	3052	{
2711	my $anims = $facedata->{animinfo};	3053	my $anims = $facedata->{animinfo};
2712		3054
2713	while (my ($anim, $info) = each %$anims) {	3055	while (my ($anim, $info) = each %$anims) {
2714	cf::anim::set $anim, $info->{frames}, $info->{facings};	3056	cf::anim::set $anim, $info->{frames}, $info->{facings};
2715	Coro::cede;	3057	cf::cede_to_tick;
2716	}	3058	}
2717		3059
2718	cf::anim::invalidate_all; # d'oh	3060	cf::anim::invalidate_all; # d'oh
2719	}	3061	}
2720		3062
		3063	{
		3064	# TODO: for gcfclient pleasure, we should give resources
		3065	# that gcfclient doesn't grok a >10000 face index.
		3066	my $res = $facedata->{resource};
		3067
		3068	my $soundconf = delete $res->{"res/sound.conf"};
		3069
		3070	while (my ($name, $info) = each %$res) {
		3071	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3072	my $data;
		3073
		3074	if ($info->{type} & 1) {
		3075	# prepend meta info
		3076
		3077	my $meta = $enc->encode ({
		3078	name => $name,
		3079	%{ $info->{meta} \|\| {} },
		3080	});
		3081
		3082	$data = pack "(w/a)", $meta, $info->{data};
		3083	} else {
		3084	$data = $info->{data};
		3085	}
		3086
		3087	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3088	cf::face::set_type $idx, $info->{type};
		3089
		3090	cf::cede_to_tick;
		3091	}
		3092
		3093	if ($soundconf) {
		3094	$soundconf = $enc->decode (delete $soundconf->{data});
		3095
		3096	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3097	my $sound = $soundconf->{compat}[$_]
		3098	or next;
		3099
		3100	my $face = cf::face::find "sound/$sound->[1]";
		3101	cf::sound::set $sound->[0] => $face;
		3102	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3103	}
		3104
		3105	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3106	my $face = cf::face::find "sound/$v";
		3107	cf::sound::set $k => $face;
		3108	}
		3109	}
		3110	}
		3111
2721	1	3112	1
2722	}	3113	}
2723		3114
		3115	register_exticmd fx_want => sub {
		3116	my ($ns, $want) = @_;
		3117
		3118	while (my ($k, $v) = each %$want) {
		3119	$ns->fx_want ($k, $v);
		3120	}
		3121	};
		3122
2724	sub reload_regions {	3123	sub reload_regions {
		3124	# HACK to clear player env face cache, we need some signal framework
		3125	# for this (global event?)
		3126	%ext::player_env::MUSIC_FACE_CACHE = ();
		3127
2725	load_resource_file "$MAPDIR/regions"	3128	load_resource_file "$MAPDIR/regions"
2726	or die "unable to load regions file\n";	3129	or die "unable to load regions file\n";
		3130
		3131	for (cf::region::list) {
		3132	$_->{match} = qr/$_->{match}/
		3133	if exists $_->{match};
		3134	}
2727	}	3135	}
2728		3136
2729	sub reload_facedata {	3137	sub reload_facedata {
2730	load_facedata "$DATADIR/facedata"	3138	load_facedata "$DATADIR/facedata"
2731	or die "unable to load facedata\n";	3139	or die "unable to load facedata\n";
…		…
2760		3168
2761	sub init {	3169	sub init {
2762	reload_resources;	3170	reload_resources;
2763	}	3171	}
2764		3172
2765	sub cfg_load {	3173	sub reload_config {
2766	open my $fh, "<:utf8", "$CONFDIR/config"	3174	open my $fh, "<:utf8", "$CONFDIR/config"
2767	or return;	3175	or return;
2768		3176
2769	local $/;	3177	local $/;
2770	*CFG = YAML::Syck::Load <$fh>;	3178	*CFG = YAML::Syck::Load <$fh>;
…		…
2786	sub main {	3194	sub main {
2787	# we must not ever block the main coroutine	3195	# we must not ever block the main coroutine
2788	local $Coro::idle = sub {	3196	local $Coro::idle = sub {
2789	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3197	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2790	(async {	3198	(async {
		3199	$Coro::current->{desc} = "IDLE BUG HANDLER";
2791	Event::one_event;	3200	Event::one_event;
2792	})->prio (Coro::PRIO_MAX);	3201	})->prio (Coro::PRIO_MAX);
2793	};	3202	};
2794		3203
2795	cfg_load;	3204	reload_config;
2796	db_init;	3205	db_init;
2797	load_extensions;	3206	load_extensions;
2798		3207
2799	$TICK_WATCHER->start;	3208	$TICK_WATCHER->start;
2800	Event::loop;	3209	Event::loop;
…		…
2993	warn "reloading cf.pm";	3402	warn "reloading cf.pm";
2994	require cf;	3403	require cf;
2995	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3404	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2996		3405
2997	warn "loading config and database again";	3406	warn "loading config and database again";
2998	cf::cfg_load;	3407	cf::reload_config;
2999		3408
3000	warn "loading extensions";	3409	warn "loading extensions";
3001	cf::load_extensions;	3410	cf::load_extensions;
3002		3411
3003	warn "reattaching attachments to objects/players";	3412	warn "reattaching attachments to objects/players";
…		…
3039	register_command "reload" => sub {	3448	register_command "reload" => sub {
3040	my ($who, $arg) = @_;	3449	my ($who, $arg) = @_;
3041		3450
3042	if ($who->flag (FLAG_WIZ)) {	3451	if ($who->flag (FLAG_WIZ)) {
3043	$who->message ("reloading server.");	3452	$who->message ("reloading server.");
		3453	async {
		3454	$Coro::current->{desc} = "perl_reload";
3044	async { reload_perl };	3455	reload_perl;
		3456	};
3045	}	3457	}
3046	};	3458	};
3047		3459
3048	unshift @INC, $LIBDIR;	3460	unshift @INC, $LIBDIR;
3049		3461
…		…
3068	my $signal = new Coro::Signal;	3480	my $signal = new Coro::Signal;
3069	push @WAIT_FOR_TICK_BEGIN, $signal;	3481	push @WAIT_FOR_TICK_BEGIN, $signal;
3070	$signal->wait;	3482	$signal->wait;
3071	}	3483	}
3072		3484
3073	my $min = 1e6;#d#
3074	my $avg = 10;
3075	$TICK_WATCHER = Event->timer (	3485	$TICK_WATCHER = Event->timer (
3076	reentrant => 0,	3486	reentrant => 0,
3077	parked => 1,	3487	parked => 1,
3078	prio => 0,	3488	prio => 0,
3079	at => $NEXT_TICK \|\| $TICK,	3489	at => $NEXT_TICK \|\| $TICK,
…		…
3087		3497
3088	$NOW = $tick_start = Event::time;	3498	$NOW = $tick_start = Event::time;
3089		3499
3090	cf::server_tick; # one server iteration	3500	cf::server_tick; # one server iteration
3091		3501
3092	0 && sync_job {#d#
3093	for(1..10) {
3094	my $t = Event::time;
3095	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3096	or die;
3097
3098	$map->width (50);
3099	$map->height (50);
3100	$map->alloc;
3101	$map->_load_objects ("/tmp/x.map", 1);
3102	my $t = Event::time - $t;
3103
3104	#next unless $t < 0.0013;#d#
3105	if ($t < $min) {
3106	$min = $t;
3107	}
3108	$avg = $avg * 0.99 + $t * 0.01;
3109	}
3110	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3111	exit 0;
3112	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3113	};
3114
3115	$RUNTIME += $TICK;	3502	$RUNTIME += $TICK;
3116	$NEXT_TICK += $TICK;	3503	$NEXT_TICK += $TICK;
3117		3504
3118	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3505	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3119	$NEXT_RUNTIME_WRITE = $NOW + 10;	3506	$NEXT_RUNTIME_WRITE = $NOW + 10;
3120	Coro::async_pool {	3507	Coro::async_pool {
		3508	$Coro::current->{desc} = "runtime saver";
3121	write_runtime	3509	write_runtime
3122	or warn "ERROR: unable to write runtime file: $!";	3510	or warn "ERROR: unable to write runtime file: $!";
3123	};	3511	};
3124	}	3512	}
3125		3513
3126	# my $AFTER = Event::time;
3127	# warn $AFTER - $NOW;#d#
3128
3129	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3514	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3130	$sig->send;	3515	$sig->send;
3131	}	3516	}
3132	while (my $sig = shift @WAIT_FOR_TICK) {	3517	while (my $sig = shift @WAIT_FOR_TICK) {
3133	$sig->send;	3518	$sig->send;
…		…
3143		3528
3144	$LOAD = ($NOW - $tick_start) / $TICK;	3529	$LOAD = ($NOW - $tick_start) / $TICK;
3145	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3530	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3146		3531
3147	_post_tick;	3532	_post_tick;
3148
3149
3150	},	3533	},
3151	);	3534	);
3152		3535
3153	{	3536	{
		3537	BDB::min_parallel 8;
3154	BDB::max_poll_time $TICK * 0.1;	3538	BDB::max_poll_time $TICK * 0.1;
3155	$BDB_POLL_WATCHER = Event->io (	3539	$BDB_POLL_WATCHER = Event->io (
3156	reentrant => 0,	3540	reentrant => 0,
3157	fd => BDB::poll_fileno,	3541	fd => BDB::poll_fileno,
3158	poll => 'r',	3542	poll => 'r',
3159	prio => 0,	3543	prio => 0,
3160	data => WF_AUTOCANCEL,	3544	data => WF_AUTOCANCEL,
3161	cb => \&BDB::poll_cb,	3545	cb => \&BDB::poll_cb,
3162	);	3546	);
3163	BDB::min_parallel 8;
3164		3547
3165	BDB::set_sync_prepare {	3548	BDB::set_sync_prepare {
3166	my $status;	3549	my $status;
3167	my $current = $Coro::current;	3550	my $current = $Coro::current;
3168	(	3551	(
…		…
3177	)	3560	)
3178	};	3561	};
3179		3562
3180	unless ($DB_ENV) {	3563	unless ($DB_ENV) {
3181	$DB_ENV = BDB::db_env_create;	3564	$DB_ENV = BDB::db_env_create;
		3565	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC
		3566	\| BDB::LOG_AUTOREMOVE, 1);
		3567	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3568	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3182		3569
3183	cf::sync_job {	3570	cf::sync_job {
3184	eval {	3571	eval {
3185	BDB::db_env_open	3572	BDB::db_env_open
3186	$DB_ENV,	3573	$DB_ENV,
…		…
3188	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN	3575	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN
3189	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3576	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3190	0666;	3577	0666;
3191		3578
3192	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3579	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3193
3194	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
3195	$DB_ENV->set_lk_detect;
3196	};	3580	};
3197		3581
3198	cf::cleanup "db_env_open(db): $@" if $@;	3582	cf::cleanup "db_env_open(db): $@" if $@;
3199	};	3583	};
3200	}	3584	}
		3585
		3586	$BDB_DEADLOCK_WATCHER = Event->timer (
		3587	after => 3,
		3588	interval => 1,
		3589	hard => 1,
		3590	prio => 0,
		3591	data => WF_AUTOCANCEL,
		3592	cb => sub {
		3593	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3594	},
		3595	);
		3596	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3597	after => 11,
		3598	interval => 60,
		3599	hard => 1,
		3600	prio => 0,
		3601	data => WF_AUTOCANCEL,
		3602	cb => sub {
		3603	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3604	},
		3605	);
		3606	$BDB_TRICKLE_WATCHER = Event->timer (
		3607	after => 5,
		3608	interval => 10,
		3609	hard => 1,
		3610	prio => 0,
		3611	data => WF_AUTOCANCEL,
		3612	cb => sub {
		3613	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3614	},
		3615	);
3201	}	3616	}
3202		3617
3203	{	3618	{
3204	IO::AIO::min_parallel 8;	3619	IO::AIO::min_parallel 8;
3205		3620
…		…
3208	$AIO_POLL_WATCHER = Event->io (	3623	$AIO_POLL_WATCHER = Event->io (
3209	reentrant => 0,	3624	reentrant => 0,
3210	data => WF_AUTOCANCEL,	3625	data => WF_AUTOCANCEL,
3211	fd => IO::AIO::poll_fileno,	3626	fd => IO::AIO::poll_fileno,
3212	poll => 'r',	3627	poll => 'r',
3213	prio => 6,	3628	prio => 0,
3214	cb => \&IO::AIO::poll_cb,	3629	cb => \&IO::AIO::poll_cb,
3215	);	3630	);
3216	}	3631	}
3217		3632
3218	my $_log_backtrace;	3633	my $_log_backtrace;
…		…
3224		3639
3225	# limit the # of concurrent backtraces	3640	# limit the # of concurrent backtraces
3226	if ($_log_backtrace < 2) {	3641	if ($_log_backtrace < 2) {
3227	++$_log_backtrace;	3642	++$_log_backtrace;
3228	async {	3643	async {
		3644	$Coro::current->{desc} = "abt $msg";
		3645
3229	my @bt = fork_call {	3646	my @bt = fork_call {
3230	@addr = map { sprintf "%x", $_ } @addr;	3647	@addr = map { sprintf "%x", $_ } @addr;
3231	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3648	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3232	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"	3649	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"
3233	or die "addr2line: $!";	3650	or die "addr2line: $!";

Diff Legend

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

Comparing cf.schmorp.de/server/lib/cf.pm (file contents): Revision 1.293 by root, Tue Jul 3 05:14:15 2007 UTC vs. Revision 1.378 by root, Thu Oct 4 11:36:54 2007 UTC

Diff Legend

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.293 by root, Tue Jul 3 05:14:15 2007 UTC vs.
Revision 1.378 by root, Thu Oct 4 11:36:54 2007 UTC