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

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.292 by root, Tue Jul 3 00:54:57 2007 UTC vs.
Revision 1.388 by root, Thu Oct 18 02:56:13 2007 UTC

…		…
4	use strict;	4	use strict;
5		5
6	use Symbol;	6	use Symbol;
7	use List::Util;	7	use List::Util;
8	use Socket;	8	use Socket;
9	use Storable;
10	use Event;	9	use Event;
11	use Opcode;	10	use Opcode;
12	use Safe;	11	use Safe;
13	use Safe::Hole;	12	use Safe::Hole;
		13	use Storable ();
14		14
15	use Coro 3.61 ();	15	use Coro 4.1 ();
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.51 ();
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
…		…
315	};	336	};
316	$TICK_WATCHER->stop;	337	$TICK_WATCHER->stop;
317	$guard	338	$guard
318	}	339	}
319		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;
		397	}
		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
323	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only	402	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
324	thing you are allowed to do is call C<prio> on it.	403	thing you are allowed to do is call C<prio> on it.
…		…
348	my $time = Event::time;	427	my $time = Event::time;
349		428
350	# this is the main coro, too bad, we have to block	429	# this is the main coro, too bad, we have to block
351	# till the operation succeeds, freezing the server :/	430	# till the operation succeeds, freezing the server :/
352		431
		432	LOG llevError, Carp::longmess "sync job";#d#
		433
353	# TODO: use suspend/resume instead	434	# TODO: use suspend/resume instead
354	# (but this is cancel-safe)	435	# (but this is cancel-safe)
355	my $freeze_guard = freeze_mainloop;	436	my $freeze_guard = freeze_mainloop;
356		437
357	my $busy = 1;	438	my $busy = 1;
358	my @res;	439	my @res;
359		440
360	(async {	441	(async {
		442	$Coro::current->desc ("sync job coro");
361	@res = eval { $job->() };	443	@res = eval { $job->() };
362	warn $@ if $@;	444	warn $@ if $@;
363	undef $busy;	445	undef $busy;
364	})->prio (Coro::PRIO_MAX);	446	})->prio (Coro::PRIO_MAX);
365		447
366	while ($busy) {	448	while ($busy) {
		449	if (Coro::nready) {
		450	Coro::cede_notself;
		451	} else {
367	Coro::cede or Event::one_event;	452	Event::one_event;
		453	}
368	}	454	}
369		455
370	$time = Event::time - $time;	456	$time = Event::time - $time;
371		457
372	LOG llevError \| logBacktrace, Carp::longmess "long sync job"	458	LOG llevError \| logBacktrace, Carp::longmess "long sync job"
…		…
412	=cut	498	=cut
413		499
414	sub fork_call(&@) {	500	sub fork_call(&@) {
415	my ($cb, @args) = @_;	501	my ($cb, @args) = @_;
416		502
417	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	503	# we seemingly have to make a local copy of the whole thing,
418	# or die "socketpair: $!";	504	# otherwise perl prematurely frees the stuff :/
419	pipe my $fh1, my $fh2	505	# TODO: investigate and fix (likely this will be rather laborious)
420	or die "pipe: $!";
421		506
422	if (my $pid = fork) {	507	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;	508	reset_signals;
435	local $SIG{__WARN__};	509	&$cb
436	local $SIG{__DIE__};	510	}, @args;
437	eval {
438	close $fh1;
439		511
440	my @res = eval { $cb->(@args) };	512	wantarray ? @res : $res[-1]
441	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442	};
443
444	warn $@ if $@;
445	_exit 0;
446	}
447	}	513	}
448		514
449	=item $value = cf::db_get $family => $key	515	=item $value = cf::db_get $family => $key
450		516
451	Returns a single value from the environment database.	517	Returns a single value from the environment database.
…		…
453	=item cf::db_put $family => $key => $value	519	=item cf::db_put $family => $key => $value
454		520
455	Stores the given C<$value> in the family. It can currently store binary	521	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).	522	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
457		523
		524	=item $db = cf::db_table "name"
		525
		526	Create and/or open a new database table. The string must not be "db" and must be unique
		527	within each server.
		528
458	=cut	529	=cut
		530
		531	sub db_table($) {
		532	my ($name) = @_;
		533	my $db = BDB::db_create $DB_ENV;
		534
		535	eval {
		536	$db->set_flags (BDB::CHKSUM);
		537
		538	utf8::encode $name;
		539	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		540	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
		541	cf::cleanup "db_open(db): $!" if $!;
		542	};
		543	cf::cleanup "db_open(db): $@" if $@;
		544
		545	$db
		546	}
459		547
460	our $DB;	548	our $DB;
461		549
462	sub db_init {	550	sub db_init {
463	unless ($DB) {
464	$DB = BDB::db_create $DB_ENV;
465
466	cf::sync_job {	551	cf::sync_job {
467	eval {	552	$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	}	553	};
477	}	554	}
478		555
479	sub db_get($$) {	556	sub db_get($$) {
480	my $key = "$_[0]/$_[1]";	557	my $key = "$_[0]/$_[1]";
481		558
…		…
531	if (1) {	608	if (1) {
532	$md5 =	609	$md5 =
533	join "\x00",	610	join "\x00",
534	$processversion,	611	$processversion,
535	map {	612	map {
536	Coro::cede;	613	cf::cede_to_tick;
537	($src->[$_], Digest::MD5::md5_hex $data[$_])	614	($src->[$_], Digest::MD5::md5_hex $data[$_])
538	} 0.. $#$src;	615	} 0.. $#$src;
539		616
540		617
541	my $dbmd5 = db_get cache => "$id/md5";	618	my $dbmd5 = db_get cache => "$id/md5";
…		…
847	";	924	";
848	die if $@;	925	die if $@;
849	}	926	}
850		927
851	our $override;	928	our $override;
852	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	929	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
853		930
854	sub override {	931	sub override {
855	$override = 1;	932	$override = 1;
856	@invoke_results = ();	933	@INVOKE_RESULTS = (@_);
857	}	934	}
858		935
859	sub do_invoke {	936	sub do_invoke {
860	my $event = shift;	937	my $event = shift;
861	my $callbacks = shift;	938	my $callbacks = shift;
862		939
863	@invoke_results = ();	940	@INVOKE_RESULTS = ();
864		941
865	local $override;	942	local $override;
866		943
867	for (@$callbacks) {	944	for (@$callbacks) {
868	eval { &{$_->[1]} };	945	eval { &{$_->[1]} };
…		…
885		962
886	Generate an object-specific event with the given arguments.	963	Generate an object-specific event with the given arguments.
887		964
888	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	965	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	966	removed in future versions), and there is no public API to access override
890	results (if you must, access C<@cf::invoke_results> directly).	967	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891		968
892	=back	969	=back
893		970
894	=cut	971	=cut
895		972
896	#############################################################################	973	#############################################################################
897	# object support	974	# object support
		975
		976	sub _object_equal($$);
		977	sub _object_equal($$) {
		978	my ($a, $b) = @_;
		979
		980	return 0 unless (ref $a) eq (ref $b);
		981
		982	if ("HASH" eq ref $a) {
		983	my @ka = keys %$a;
		984	my @kb = keys %$b;
		985
		986	return 0 if @ka != @kb;
		987
		988	for (0 .. $#ka) {
		989	return 0 unless $ka[$_] eq $kb[$_];
		990	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		991	}
		992
		993	} elsif ("ARRAY" eq ref $a) {
		994
		995	return 0 if @$a != @$b;
		996
		997	for (0 .. $#$a) {
		998	return 0 unless _object_equal $a->[$_], $b->[$_];
		999	}
		1000
		1001	} elsif ($a ne $b) {
		1002	return 0;
		1003	}
		1004
		1005	1
		1006	}
		1007
		1008	our $SLOW_MERGES;#d#
		1009	sub _can_merge {
		1010	my ($ob1, $ob2) = @_;
		1011
		1012	++$SLOW_MERGES;#d#
		1013
		1014	# we do the slow way here
		1015	return _object_equal $ob1, $ob2
		1016	}
898		1017
899	sub reattach {	1018	sub reattach {
900	# basically do the same as instantiate, without calling instantiate	1019	# basically do the same as instantiate, without calling instantiate
901	my ($obj) = @_;	1020	my ($obj) = @_;
902		1021
…		…
949	sub object_freezer_save {	1068	sub object_freezer_save {
950	my ($filename, $rdata, $objs) = @_;	1069	my ($filename, $rdata, $objs) = @_;
951		1070
952	sync_job {	1071	sync_job {
953	if (length $$rdata) {	1072	if (length $$rdata) {
		1073	utf8::decode (my $decname = $filename);
954	warn sprintf "saving %s (%d,%d)\n",	1074	warn sprintf "saving %s (%d,%d)\n",
955	$filename, length $$rdata, scalar @$objs;	1075	$decname, length $$rdata, scalar @$objs;
956		1076
957	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1077	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
958	chmod SAVE_MODE, $fh;	1078	chmod SAVE_MODE, $fh;
959	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1079	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960	aio_fsync $fh if $cf::USE_FSYNC;	1080	aio_fsync $fh if $cf::USE_FSYNC;
961	close $fh;	1081	close $fh;
962		1082
963	if (@$objs) {	1083	if (@$objs) {
964	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {	1084	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {
965	chmod SAVE_MODE, $fh;	1085	chmod SAVE_MODE, $fh;
966	my $data = Storable::nfreeze { version => 1, objs => $objs };	1086	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
967	aio_write $fh, 0, (length $data), $data, 0;	1087	aio_write $fh, 0, (length $data), $data, 0;
968	aio_fsync $fh if $cf::USE_FSYNC;	1088	aio_fsync $fh if $cf::USE_FSYNC;
969	close $fh;	1089	close $fh;
970	aio_rename "$filename.pst~", "$filename.pst";	1090	aio_rename "$filename.pst~", "$filename.pst";
971	}	1091	}
…		…
979	}	1099	}
980	} else {	1100	} else {
981	aio_unlink $filename;	1101	aio_unlink $filename;
982	aio_unlink "$filename.pst";	1102	aio_unlink "$filename.pst";
983	}	1103	}
984	}	1104	};
985	}	1105	}
986		1106
987	sub object_freezer_as_string {	1107	sub object_freezer_as_string {
988	my ($rdata, $objs) = @_;	1108	my ($rdata, $objs) = @_;
989		1109
…		…
1001	or return;	1121	or return;
1002		1122
1003	unless (aio_stat "$filename.pst") {	1123	unless (aio_stat "$filename.pst") {
1004	(aio_load "$filename.pst", $av) >= 0	1124	(aio_load "$filename.pst", $av) >= 0
1005	or return;	1125	or return;
		1126
1006	$av = eval { (Storable::thaw $av)->{objs} };	1127	my $st = eval { Coro::Storable::thaw $av };
		1128	$av = $st->{objs};
1007	}	1129	}
1008		1130
		1131	utf8::decode (my $decname = $filename);
1009	warn sprintf "loading %s (%d)\n",	1132	warn sprintf "loading %s (%d,%d)\n",
1010	$filename, length $data, scalar @{$av \|\| []};	1133	$decname, length $data, scalar @{$av \|\| []};
		1134
1011	return ($data, $av);	1135	($data, $av)
1012	}	1136	}
1013		1137
1014	=head2 COMMAND CALLBACKS	1138	=head2 COMMAND CALLBACKS
1015		1139
1016	=over 4	1140	=over 4
…		…
1089	my ($pl, $buf) = @_;	1213	my ($pl, $buf) = @_;
1090		1214
1091	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1215	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092		1216
1093	if (ref $msg) {	1217	if (ref $msg) {
		1218	my ($type, $reply, @payload) =
		1219	"ARRAY" eq ref $msg
		1220	? @$msg
		1221	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1222
		1223	my @reply;
		1224
1094	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1225	if (my $cb = $EXTCMD{$type}) {
1095	if (my %reply = $cb->($pl, $msg)) {	1226	@reply = $cb->($pl, @payload);
1096	$pl->ext_reply ($msg->{msgid}, %reply);
1097	}
1098	}	1227	}
		1228
		1229	$pl->ext_reply ($reply, @reply)
		1230	if $reply;
		1231
1099	} else {	1232	} else {
1100	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1233	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101	}	1234	}
1102		1235
1103	cf::override;	1236	cf::override;
…		…
1193		1326
1194	=head3 cf::player	1327	=head3 cf::player
1195		1328
1196	=over 4	1329	=over 4
1197		1330
		1331	=item cf::player::num_playing
		1332
		1333	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1334
		1335	=cut
		1336
		1337	sub num_playing {
		1338	scalar grep
		1339	$_->ob->map
		1340	&& !$_->hidden
		1341	&& !$_->ob->flag (cf::FLAG_WIZ),
		1342	cf::player::list
		1343	}
		1344
1198	=item cf::player::find $login	1345	=item cf::player::find $login
1199		1346
1200	Returns the given player object, loading it if necessary (might block).	1347	Returns the given player object, loading it if necessary (might block).
1201		1348
1202	=cut	1349	=cut
…		…
1237	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1384	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1385	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1386	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240	aio_unlink +(playerdir $login) . "/$login.pl";	1387	aio_unlink +(playerdir $login) . "/$login.pl";
1241		1388
1242	my $pl = load_pl path $login	1389	my $f = new_from_file cf::object::thawer path $login
1243	or return;	1390	or return;
		1391
		1392	my $pl = cf::player::load_pl $f
		1393	or return;
		1394	local $cf::PLAYER_LOADING{$login} = $pl;
		1395	$f->resolve_delayed_derefs;
1244	$cf::PLAYER{$login} = $pl	1396	$cf::PLAYER{$login} = $pl
1245	}	1397	}
1246	}	1398	}
1247	}	1399	}
1248		1400
…		…
1258		1410
1259	aio_mkdir playerdir $pl, 0770;	1411	aio_mkdir playerdir $pl, 0770;
1260	$pl->{last_save} = $cf::RUNTIME;	1412	$pl->{last_save} = $cf::RUNTIME;
1261		1413
1262	$pl->save_pl ($path);	1414	$pl->save_pl ($path);
1263	Coro::cede;	1415	cf::cede_to_tick;
1264	}	1416	}
1265		1417
1266	sub new($) {	1418	sub new($) {
1267	my ($login) = @_;	1419	my ($login) = @_;
1268		1420
…		…
1272	$self->{deny_save} = 1;	1424	$self->{deny_save} = 1;
1273		1425
1274	$cf::PLAYER{$login} = $self;	1426	$cf::PLAYER{$login} = $self;
1275		1427
1276	$self	1428	$self
		1429	}
		1430
		1431	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1432
		1433	=cut
		1434
		1435	sub send_msg {
		1436	my $ns = shift->ns
		1437	or return;
		1438	$ns->send_msg (@_);
1277	}	1439	}
1278		1440
1279	=item $pl->quit_character	1441	=item $pl->quit_character
1280		1442
1281	Nukes the player without looking back. If logged in, the connection will	1443	Nukes the player without looking back. If logged in, the connection will
…		…
1336	or return [];	1498	or return [];
1337		1499
1338	my @logins;	1500	my @logins;
1339		1501
1340	for my $login (@$dirs) {	1502	for my $login (@$dirs) {
		1503	my $path = path $login;
		1504
		1505	# a .pst is a dead give-away for a valid player
		1506	unless (-e "$path.pst") {
1341	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1507	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342	aio_read $fh, 0, 512, my $buf, 0 or next;	1508	aio_read $fh, 0, 512, my $buf, 0 or next;
1343	$buf !~ /^password -------------$/m or next; # official not-valid tag	1509	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1510	}
1344		1511
1345	utf8::decode $login;	1512	utf8::decode $login;
1346	push @logins, $login;	1513	push @logins, $login;
1347	}	1514	}
1348		1515
…		…
1386	sub expand_cfpod {	1553	sub expand_cfpod {
1387	((my $self), (local $_)) = @_;	1554	((my $self), (local $_)) = @_;
1388		1555
1389	# escape & and <	1556	# escape & and <
1390	s/&/&/g;	1557	s/&/&/g;
1391	s/(?<![BIUGH])</</g;	1558	s/(?<![BIUGHT])</</g;
1392		1559
1393	# this is buggy, it needs to properly take care of nested <'s	1560	# this is buggy, it needs to properly take care of nested <'s
1394		1561
1395	1 while	1562	1 while
1396	# replace B<>, I<>, U<> etc.	1563	# replace B<>, I<>, U<> etc.
1397	s/B<([^\>]*)>/<b>$1<\/b>/	1564	s/B<([^\>]*)>/<b>$1<\/b>/
1398	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1565	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1399	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1566	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1567	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1400	# replace G<male\|female> tags	1568	# replace G<male\|female> tags
1401	\|\| s{G<([^>\|])\\|([^>])>}{	1569	\|\| s{G<([^>\|])\\|([^>])>}{
1402	$self->gender ? $2 : $1	1570	$self->gender ? $2 : $1
1403	}ge	1571	}ge
1404	# replace H<hint text>	1572	# replace H<hint text>
…		…
1412		1580
1413	# create single paragraphs (very hackish)	1581	# create single paragraphs (very hackish)
1414	s/(?<=\S)\n(?=\w)/ /g;	1582	s/(?<=\S)\n(?=\w)/ /g;
1415		1583
1416	# compress some whitespace	1584	# compress some whitespace
1417	1 while s/\s\n\s\n\s*/\n/;	1585	s/\s+\n/\n/g; # ws line-ends
		1586	s/\n\n+/\n/g; # double lines
		1587	s/^\n+//; # beginning lines
		1588	s/\n+$//; # ending lines
1418		1589
1419	$_	1590	$_
1420	}	1591	}
1421		1592
1422	sub hintmode {	1593	sub hintmode {
1423	$_[0]{hintmode} = $_[1] if @_ > 1;	1594	$_[0]{hintmode} = $_[1] if @_ > 1;
1424	$_[0]{hintmode}	1595	$_[0]{hintmode}
1425	}	1596	}
1426		1597
1427	=item $player->ext_reply ($msgid, %msg)	1598	=item $player->ext_reply ($msgid, @msg)
1428		1599
1429	Sends an ext reply to the player.	1600	Sends an ext reply to the player.
1430		1601
1431	=cut	1602	=cut
1432		1603
1433	sub ext_reply($$%) {	1604	sub ext_reply($$@) {
1434	my ($self, $id, %msg) = @_;	1605	my ($self, $id, @msg) = @_;
1435		1606
1436	$msg{msgid} = $id;	1607	$self->ns->ext_reply ($id, @msg)
1437	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1438	}	1608	}
1439		1609
1440	=item $player->ext_event ($type, %msg)	1610	=item $player->ext_msg ($type, @msg)
1441		1611
1442	Sends an ext event to the client.	1612	Sends an ext event to the client.
1443		1613
1444	=cut	1614	=cut
1445		1615
1446	sub ext_event($$%) {	1616	sub ext_msg($$@) {
1447	my ($self, $type, %msg) = @_;	1617	my ($self, $type, @msg) = @_;
1448		1618
1449	$self->ns->ext_event ($type, %msg);	1619	$self->ns->ext_msg ($type, @msg);
1450	}	1620	}
1451		1621
1452	=head3 cf::region	1622	=head3 cf::region
1453		1623
1454	=over 4	1624	=over 4
…		…
1467	my ($path) = @_;	1637	my ($path) = @_;
1468		1638
1469	my ($match, $specificity);	1639	my ($match, $specificity);
1470		1640
1471	for my $region (list) {	1641	for my $region (list) {
1472	if ($region->match && $path =~ $region->match) {	1642	if ($region->{match} && $path =~ $region->{match}) {
1473	($match, $specificity) = ($region, $region->specificity)	1643	($match, $specificity) = ($region, $region->specificity)
1474	if $region->specificity > $specificity;	1644	if $region->specificity > $specificity;
1475	}	1645	}
1476	}	1646	}
1477		1647
…		…
1597	$self->init; # pass $1 etc.	1767	$self->init; # pass $1 etc.
1598	return $self;	1768	return $self;
1599	}	1769	}
1600	}	1770	}
1601		1771
1602	Carp::carp "unable to resolve path '$path' (base '$base').";	1772	Carp::cluck "unable to resolve path '$path' (base '$base').";
1603	()	1773	()
1604	}	1774	}
1605		1775
1606	sub init {	1776	sub init {
1607	my ($self) = @_;	1777	my ($self) = @_;
…		…
1670		1840
1671	sub load_header_from($) {	1841	sub load_header_from($) {
1672	my ($self, $path) = @_;	1842	my ($self, $path) = @_;
1673		1843
1674	utf8::encode $path;	1844	utf8::encode $path;
1675	#aio_open $path, O_RDONLY, 0	1845	my $f = new_from_file cf::object::thawer $path
1676	# or return;
1677
1678	$self->_load_header ($path)
1679	or return;	1846	or return;
		1847
		1848	$self->_load_header ($f)
		1849	or return;
		1850
		1851	local $MAP_LOADING{$self->{path}} = $self;
		1852	$f->resolve_delayed_derefs;
1680		1853
1681	$self->{load_path} = $path;	1854	$self->{load_path} = $path;
1682		1855
1683	1	1856	1
1684	}	1857	}
…		…
1738	sub find {	1911	sub find {
1739	my ($path, $origin) = @_;	1912	my ($path, $origin) = @_;
1740		1913
1741	$path = normalise $path, $origin && $origin->path;	1914	$path = normalise $path, $origin && $origin->path;
1742		1915
		1916	cf::lock_wait "map_data:$path";#d#remove
1743	cf::lock_wait "map_find:$path";	1917	cf::lock_wait "map_find:$path";
1744		1918
1745	$cf::MAP{$path} \|\| do {	1919	$cf::MAP{$path} \|\| do {
1746	my $guard = cf::lock_acquire "map_find:$path";	1920	my $guard1 = cf::lock_acquire "map_find:$path";
		1921	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1922
1747	my $map = new_from_path cf::map $path	1923	my $map = new_from_path cf::map $path
1748	or return;	1924	or return;
1749		1925
1750	$map->{last_save} = $cf::RUNTIME;	1926	$map->{last_save} = $cf::RUNTIME;
1751		1927
…		…
1753	or return;	1929	or return;
1754		1930
1755	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1931	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1756	# doing this can freeze the server in a sync job, obviously	1932	# doing this can freeze the server in a sync job, obviously
1757	#$cf::WAIT_FOR_TICK->wait;	1933	#$cf::WAIT_FOR_TICK->wait;
		1934	undef $guard1;
		1935	undef $guard2;
1758	$map->reset;	1936	$map->reset;
1759	undef $guard;
1760	return find $path;	1937	return find $path;
1761	}	1938	}
1762		1939
1763	$cf::MAP{$path} = $map	1940	$cf::MAP{$path} = $map
1764	}	1941	}
…		…
1773	local $self->{deny_reset} = 1; # loading can take a long time	1950	local $self->{deny_reset} = 1; # loading can take a long time
1774		1951
1775	my $path = $self->{path};	1952	my $path = $self->{path};
1776		1953
1777	{	1954	{
1778	my $guard = cf::lock_acquire "map_load:$path";	1955	my $guard = cf::lock_acquire "map_data:$path";
1779		1956
		1957	return unless $self->valid;
1780	return if $self->in_memory != cf::MAP_SWAPPED;	1958	return unless $self->in_memory == cf::MAP_SWAPPED;
1781		1959
1782	$self->in_memory (cf::MAP_LOADING);	1960	$self->in_memory (cf::MAP_LOADING);
1783		1961
1784	$self->alloc;	1962	$self->alloc;
1785		1963
1786	$self->pre_load;	1964	$self->pre_load;
1787	Coro::cede;	1965	cf::cede_to_tick;
1788		1966
		1967	my $f = new_from_file cf::object::thawer $self->{load_path};
		1968	$f->skip_block;
1789	$self->_load_objects ($self->{load_path}, 1)	1969	$self->_load_objects ($f)
1790	or return;	1970	or return;
1791		1971
1792	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1972	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1793	if delete $self->{load_original};	1973	if delete $self->{load_original};
1794		1974
1795	if (my $uniq = $self->uniq_path) {	1975	if (my $uniq = $self->uniq_path) {
1796	utf8::encode $uniq;	1976	utf8::encode $uniq;
1797	if (aio_open $uniq, O_RDONLY, 0) {	1977	unless (aio_stat $uniq) {
		1978	if (my $f = new_from_file cf::object::thawer $uniq) {
1798	$self->clear_unique_items;	1979	$self->clear_unique_items;
1799	$self->_load_objects ($uniq, 0);	1980	$self->_load_objects ($f);
		1981	$f->resolve_delayed_derefs;
		1982	}
1800	}	1983	}
1801	}	1984	}
1802		1985
1803	Coro::cede;	1986	$f->resolve_delayed_derefs;
		1987
		1988	cf::cede_to_tick;
1804	# now do the right thing for maps	1989	# now do the right thing for maps
1805	$self->link_multipart_objects;	1990	$self->link_multipart_objects;
1806	$self->difficulty ($self->estimate_difficulty)	1991	$self->difficulty ($self->estimate_difficulty)
1807	unless $self->difficulty;	1992	unless $self->difficulty;
1808	Coro::cede;	1993	cf::cede_to_tick;
1809		1994
1810	unless ($self->{deny_activate}) {	1995	unless ($self->{deny_activate}) {
1811	$self->decay_objects;	1996	$self->decay_objects;
1812	$self->fix_auto_apply;	1997	$self->fix_auto_apply;
1813	$self->update_buttons;	1998	$self->update_buttons;
1814	Coro::cede;	1999	cf::cede_to_tick;
1815	$self->set_darkness_map;	2000	$self->set_darkness_map;
1816	Coro::cede;	2001	cf::cede_to_tick;
1817	$self->activate;	2002	$self->activate;
1818	}	2003	}
		2004
		2005	$self->{last_save} = $cf::RUNTIME;
		2006	$self->last_access ($cf::RUNTIME);
1819		2007
1820	$self->in_memory (cf::MAP_IN_MEMORY);	2008	$self->in_memory (cf::MAP_IN_MEMORY);
1821	}	2009	}
1822		2010
1823	$self->post_load;	2011	$self->post_load;
…		…
1834		2022
1835	$self	2023	$self
1836	}	2024	}
1837		2025
1838	# find and load all maps in the 3x3 area around a map	2026	# find and load all maps in the 3x3 area around a map
1839	sub load_diag {	2027	sub load_neighbours {
1840	my ($map) = @_;	2028	my ($map) = @_;
1841		2029
1842	my @diag; # diagonal neighbours	2030	my @neigh; # diagonal neighbours
1843		2031
1844	for (0 .. 3) {	2032	for (0 .. 3) {
1845	my $neigh = $map->tile_path ($_)	2033	my $neigh = $map->tile_path ($_)
1846	or next;	2034	or next;
1847	$neigh = find $neigh, $map	2035	$neigh = find $neigh, $map
1848	or next;	2036	or next;
1849	$neigh->load;	2037	$neigh->load;
1850		2038
		2039	push @neigh,
1851	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2040	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1852	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2041	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1853	}	2042	}
1854		2043
1855	for (@diag) {	2044	for (grep defined $_->[0], @neigh) {
		2045	my ($path, $origin) = @$_;
1856	my $neigh = find @$_	2046	my $neigh = find $path, $origin
1857	or next;	2047	or next;
1858	$neigh->load;	2048	$neigh->load;
1859	}	2049	}
1860	}	2050	}
1861		2051
…		…
1866	}	2056	}
1867		2057
1868	sub do_load_sync {	2058	sub do_load_sync {
1869	my ($map) = @_;	2059	my ($map) = @_;
1870		2060
		2061	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2062	if $Coro::current == $Coro::main;
		2063
1871	cf::sync_job { $map->load };	2064	cf::sync_job { $map->load };
1872	}	2065	}
1873		2066
1874	our %MAP_PREFETCH;	2067	our %MAP_PREFETCH;
1875	our $MAP_PREFETCHER = undef;	2068	our $MAP_PREFETCHER = undef;
1876		2069
1877	sub find_async {	2070	sub find_async {
1878	my ($path, $origin) = @_;	2071	my ($path, $origin, $load) = @_;
1879		2072
1880	$path = normalise $path, $origin && $origin->{path};	2073	$path = normalise $path, $origin && $origin->{path};
1881		2074
1882	if (my $map = $cf::MAP{$path}) {	2075	if (my $map = $cf::MAP{$path}) {
1883	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2076	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1884	}	2077	}
1885		2078
1886	undef $MAP_PREFETCH{$path};	2079	$MAP_PREFETCH{$path} \|= $load;
		2080
1887	$MAP_PREFETCHER \|\|= cf::async {	2081	$MAP_PREFETCHER \|\|= cf::async {
		2082	$Coro::current->{desc} = "map prefetcher";
		2083
1888	while (%MAP_PREFETCH) {	2084	while (%MAP_PREFETCH) {
1889	for my $path (keys %MAP_PREFETCH) {	2085	while (my ($k, $v) = each %MAP_PREFETCH) {
1890	my $map = find $path	2086	if (my $map = find $k) {
1891	or next;
1892	$map->load;	2087	$map->load if $v;
		2088	}
1893		2089
1894	delete $MAP_PREFETCH{$path};	2090	delete $MAP_PREFETCH{$k};
1895	}	2091	}
1896	}	2092	}
1897	undef $MAP_PREFETCHER;	2093	undef $MAP_PREFETCHER;
1898	};	2094	};
1899	$MAP_PREFETCHER->prio (6);	2095	$MAP_PREFETCHER->prio (6);
…		…
1902	}	2098	}
1903		2099
1904	sub save {	2100	sub save {
1905	my ($self) = @_;	2101	my ($self) = @_;
1906		2102
1907	my $lock = cf::lock_acquire "map_data:" . $self->path;	2103	my $lock = cf::lock_acquire "map_data:$self->{path}";
1908		2104
1909	$self->{last_save} = $cf::RUNTIME;	2105	$self->{last_save} = $cf::RUNTIME;
1910		2106
1911	return unless $self->dirty;	2107	return unless $self->dirty;
1912		2108
…		…
1918	return if $self->{deny_save};	2114	return if $self->{deny_save};
1919		2115
1920	local $self->{last_access} = $self->last_access;#d#	2116	local $self->{last_access} = $self->last_access;#d#
1921		2117
1922	cf::async {	2118	cf::async {
		2119	$Coro::current->{desc} = "map player save";
1923	$_->contr->save for $self->players;	2120	$_->contr->save for $self->players;
1924	};	2121	};
1925		2122
1926	if ($uniq) {	2123	if ($uniq) {
1927	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	2124	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
…		…
1935	my ($self) = @_;	2132	my ($self) = @_;
1936		2133
1937	# save first because save cedes	2134	# save first because save cedes
1938	$self->save;	2135	$self->save;
1939		2136
1940	my $lock = cf::lock_acquire "map_data:" . $self->path;	2137	my $lock = cf::lock_acquire "map_data:$self->{path}";
1941		2138
1942	return if $self->players;	2139	return if $self->players;
1943	return if $self->in_memory != cf::MAP_IN_MEMORY;	2140	return if $self->in_memory != cf::MAP_IN_MEMORY;
1944	return if $self->{deny_save};	2141	return if $self->{deny_save};
1945		2142
		2143	$self->in_memory (cf::MAP_SWAPPED);
		2144
		2145	$self->deactivate;
		2146	$_->clear_links_to ($self) for values %cf::MAP;
1946	$self->clear;	2147	$self->clear;
1947	$self->in_memory (cf::MAP_SWAPPED);
1948	}	2148	}
1949		2149
1950	sub reset_at {	2150	sub reset_at {
1951	my ($self) = @_;	2151	my ($self) = @_;
1952		2152
…		…
1984	if $uniq;	2184	if $uniq;
1985	}	2185	}
1986		2186
1987	delete $cf::MAP{$self->path};	2187	delete $cf::MAP{$self->path};
1988		2188
		2189	$self->deactivate;
		2190	$_->clear_links_to ($self) for values %cf::MAP;
1989	$self->clear;	2191	$self->clear;
1990
1991	$_->clear_links_to ($self) for values %cf::MAP;
1992		2192
1993	$self->unlink_save;	2193	$self->unlink_save;
1994	$self->destroy;	2194	$self->destroy;
1995	}	2195	}
1996		2196
1997	my $nuke_counter = "aaaa";	2197	my $nuke_counter = "aaaa";
1998		2198
1999	sub nuke {	2199	sub nuke {
2000	my ($self) = @_;	2200	my ($self) = @_;
2001		2201
		2202	{
		2203	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2204
2002	delete $cf::MAP{$self->path};	2205	delete $cf::MAP{$self->path};
2003		2206
2004	$self->unlink_save;	2207	$self->unlink_save;
2005		2208
2006	bless $self, "cf::map";	2209	bless $self, "cf::map";
2007	delete $self->{deny_reset};	2210	delete $self->{deny_reset};
2008	$self->{deny_save} = 1;	2211	$self->{deny_save} = 1;
2009	$self->reset_timeout (1);	2212	$self->reset_timeout (1);
2010	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2213	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2011		2214
2012	$cf::MAP{$self->path} = $self;	2215	$cf::MAP{$self->path} = $self;
		2216	}
2013		2217
2014	$self->reset; # polite request, might not happen	2218	$self->reset; # polite request, might not happen
2015	}	2219	}
2016		2220
2017	=item $maps = cf::map::tmp_maps	2221	=item $maps = cf::map::tmp_maps
…		…
2093		2297
2094	sub inv_recursive {	2298	sub inv_recursive {
2095	inv_recursive_ inv $_[0]	2299	inv_recursive_ inv $_[0]
2096	}	2300	}
2097		2301
		2302	=item $ref = $ob->ref
		2303
		2304	creates and returns a persistent reference to an objetc that can be stored as a string.
		2305
		2306	=item $ob = cf::object::deref ($refstring)
		2307
		2308	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2309	even if the object actually exists. May block.
		2310
		2311	=cut
		2312
		2313	sub deref {
		2314	my ($ref) = @_;
		2315
		2316	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2317	my ($uuid, $name) = ($1, $2);
		2318	my $pl = $cf::PLAYER_LOADING{$name} \|\| cf::player::find $name
		2319	or return;
		2320	$pl->ob->uuid eq $uuid
		2321	or return;
		2322
		2323	$pl->ob
		2324	} else {
		2325	warn "$ref: cannot resolve object reference\n";
		2326	undef
		2327	}
		2328	}
		2329
2098	package cf;	2330	package cf;
2099		2331
2100	=back	2332	=back
2101		2333
2102	=head3 cf::object::player	2334	=head3 cf::object::player
…		…
2124		2356
2125	} else {	2357	} else {
2126	my $pl = $self->contr;	2358	my $pl = $self->contr;
2127		2359
2128	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2360	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2129	my $diag = $pl->{npc_dialog};	2361	my $dialog = $pl->{npc_dialog};
2130	$diag->{pl}->ext_reply (	2362	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2131	$diag->{id},
2132	msgtype => "reply",
2133	msg => $diag->{pl}->expand_cfpod ($msg),
2134	add_topics => []
2135	);
2136		2363
2137	} else {	2364	} else {
2138	$msg = $npc->name . " says: $msg" if $npc;	2365	$msg = $npc->name . " says: $msg" if $npc;
2139	$self->message ($msg, $flags);	2366	$self->message ($msg, $flags);
2140	}	2367	}
2141	}	2368	}
		2369	}
		2370
		2371	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2372
		2373	=cut
		2374
		2375	sub cf::object::send_msg {
		2376	my $pl = shift->contr
		2377	or return;
		2378	$pl->send_msg (@_);
2142	}	2379	}
2143		2380
2144	=item $player_object->may ("access")	2381	=item $player_object->may ("access")
2145		2382
2146	Returns wether the given player is authorized to access resource "access"	2383	Returns wether the given player is authorized to access resource "access"
…		…
2225	# use -1 or undef as default coordinates, not 0, 0	2462	# use -1 or undef as default coordinates, not 0, 0
2226	($x, $y) = ($map->enter_x, $map->enter_y)	2463	($x, $y) = ($map->enter_x, $map->enter_y)
2227	if $x <=0 && $y <= 0;	2464	if $x <=0 && $y <= 0;
2228		2465
2229	$map->load;	2466	$map->load;
2230	$map->load_diag;	2467	$map->load_neighbours;
2231		2468
2232	return unless $self->contr->active;	2469	return unless $self->contr->active;
2233	$self->activate_recursive;	2470	$self->activate_recursive;
2234		2471
2235	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2472	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2236	$self->enter_map ($map, $x, $y);	2473	$self->enter_map ($map, $x, $y);
2237	}	2474	}
2238		2475
2239	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2476	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2240		2477
2241	Moves the player to the given map-path and coordinates by first freezing	2478	Moves the player to the given map-path and coordinates by first freezing
2242	her, loading and preparing them map, calling the provided $check callback	2479	her, loading and preparing them map, calling the provided $check callback
2243	that has to return the map if sucecssful, and then unfreezes the player on	2480	that has to return the map if sucecssful, and then unfreezes the player on
2244	the new (success) or old (failed) map position.	2481	the new (success) or old (failed) map position. In either case, $done will
		2482	be called at the end of this process.
2245		2483
2246	=cut	2484	=cut
2247		2485
2248	our $GOTOGEN;	2486	our $GOTOGEN;
2249		2487
2250	sub cf::object::player::goto {	2488	sub cf::object::player::goto {
2251	my ($self, $path, $x, $y, $check) = @_;	2489	my ($self, $path, $x, $y, $check, $done) = @_;
2252		2490
2253	# do generation counting so two concurrent goto's will be executed in-order	2491	# do generation counting so two concurrent goto's will be executed in-order
2254	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2492	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2255		2493
2256	$self->enter_link;	2494	$self->enter_link;
2257		2495
2258	(async {	2496	(async {
		2497	$Coro::current->{desc} = "player::goto $path $x $y";
		2498
		2499	# *tag paths override both path and x\|y
		2500	if ($path =~ /^\(.)$/) {
		2501	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2502	my $ob = $obs[rand @obs];
		2503
		2504	# see if we actually can go there
		2505	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2506	$ob = $obs[rand @obs];
		2507	} else {
		2508	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE \| cf::NDI_RED);
		2509	}
		2510	# else put us there anyways for now #d#
		2511
		2512	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2513	} else {
		2514	($path, $x, $y) = (undef, undef, undef);
		2515	}
		2516	}
		2517
2259	my $map = eval {	2518	my $map = eval {
2260	my $map = cf::map::find $path;	2519	my $map = defined $path ? cf::map::find $path : undef;
2261		2520
2262	if ($map) {	2521	if ($map) {
2263	$map = $map->customise_for ($self);	2522	$map = $map->customise_for ($self);
2264	$map = $check->($map) if $check && $map;	2523	$map = $check->($map) if $check && $map;
2265	} else {	2524	} else {
2266	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);	2525	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE \| cf::NDI_RED);
2267	}	2526	}
2268		2527
2269	$map	2528	$map
2270	};	2529	};
2271		2530
…		…
2276		2535
2277	if ($gen == $self->{_goto_generation}) {	2536	if ($gen == $self->{_goto_generation}) {
2278	delete $self->{_goto_generation};	2537	delete $self->{_goto_generation};
2279	$self->leave_link ($map, $x, $y);	2538	$self->leave_link ($map, $x, $y);
2280	}	2539	}
		2540
		2541	$done->() if $done;
2281	})->prio (1);	2542	})->prio (1);
2282	}	2543	}
2283		2544
2284	=item $player_object->enter_exit ($exit_object)	2545	=item $player_object->enter_exit ($exit_object)
2285		2546
…		…
2354	my $hp = $exit->stats->hp;	2615	my $hp = $exit->stats->hp;
2355	my $sp = $exit->stats->sp;	2616	my $sp = $exit->stats->sp;
2356		2617
2357	$self->enter_link;	2618	$self->enter_link;
2358		2619
		2620	# if exit is damned, update players death & WoR home-position
		2621	$self->contr->savebed ($slaying, $hp, $sp)
		2622	if $exit->flag (FLAG_DAMNED);
		2623
2359	(async {	2624	(async {
		2625	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2626
2360	$self->deactivate_recursive; # just to be sure	2627	$self->deactivate_recursive; # just to be sure
2361	unless (eval {	2628	unless (eval {
2362	$self->goto ($slaying, $hp, $sp);	2629	$self->goto ($slaying, $hp, $sp);
2363		2630
2364	1;	2631	1;
…		…
2390		2657
2391	utf8::encode $text;	2658	utf8::encode $text;
2392	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2659	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2393	}	2660	}
2394		2661
2395	=item $client->send_msg ($color, $type, $msg, [extra...])	2662	=item $client->send_msg ($channel, $msg, $color, [extra...])
2396		2663
2397	Send a drawinfo or msg packet to the client, formatting the msg for the	2664	Send a drawinfo or msg packet to the client, formatting the msg for the
2398	client if neccessary. C<$type> should be a string identifying the type of	2665	client if neccessary. C<$type> should be a string identifying the type of
2399	the message, with C<log> being the default. If C<$color> is negative, suppress	2666	the message, with C<log> being the default. If C<$color> is negative, suppress
2400	the message unless the client supports the msg packet.	2667	the message unless the client supports the msg packet.
2401		2668
2402	=cut	2669	=cut
2403		2670
		2671	our %CHANNEL = (
		2672	"c/identify" => {
		2673	id => "infobox",
		2674	title => "Identify",
		2675	reply => undef,
		2676	tooltip => "Items recently identified",
		2677	},
		2678	"c/examine" => {
		2679	id => "infobox",
		2680	title => "Examine",
		2681	reply => undef,
		2682	tooltip => "Signs and other items you examined",
		2683	},
		2684	"c/lookat" => {
		2685	id => "infobox",
		2686	title => "Look",
		2687	reply => undef,
		2688	tooltip => "What you saw there",
		2689	},
		2690	);
		2691
2404	sub cf::client::send_msg {	2692	sub cf::client::send_msg {
2405	my ($self, $color, $type, $msg, @extra) = @_;	2693	my ($self, $channel, $msg, $color, @extra) = @_;
2406		2694
2407	$msg = $self->pl->expand_cfpod ($msg);	2695	$msg = $self->pl->expand_cfpod ($msg);
2408		2696
		2697	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2698
		2699	# check predefined channels, for the benefit of C
		2700	if ($CHANNEL{$channel}) {
		2701	$channel = $CHANNEL{$channel};
		2702
		2703	$self->ext_msg (channel_info => $channel)
		2704	if $self->can_msg;
		2705
		2706	$channel = $channel->{id};
		2707
		2708	} elsif (ref $channel) {
		2709	# send meta info to client, if not yet sent
		2710	unless (exists $self->{channel}{$channel->{id}}) {
		2711	$self->{channel}{$channel->{id}} = $channel;
		2712	$self->ext_msg (channel_info => $channel)
		2713	if $self->can_msg;
		2714	}
		2715
		2716	$channel = $channel->{id};
		2717	}
		2718
		2719	return unless @extra \|\| length $msg;
		2720
2409	if ($self->can_msg) {	2721	if ($self->can_msg) {
		2722	# default colour, mask it out
		2723	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2724	if $color & cf::NDI_DEF;
		2725
2410	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));	2726	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2727	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2411	} else {	2728	} else {
2412	# replace some tags by gcfclient-compatible ones
2413	for ($msg) {
2414	1 while
2415	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2416	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2417	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2418	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2419	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2420	}
2421
2422	if ($color >= 0) {	2729	if ($color >= 0) {
		2730	# replace some tags by gcfclient-compatible ones
		2731	for ($msg) {
		2732	1 while
		2733	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2734	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2735	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2736	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2737	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2738	}
		2739
		2740	$color &= cf::NDI_COLOR_MASK;
		2741
		2742	utf8::encode $msg;
		2743
2423	if (0 && $msg =~ /\[/) {	2744	if (0 && $msg =~ /\[/) {
		2745	# COMMAND/INFO
2424	$self->send_packet ("drawextinfo $color 4 0 $msg")	2746	$self->send_packet ("drawextinfo $color 10 8 $msg")
2425	} else {	2747	} else {
2426	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2748	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2427	$self->send_packet ("drawinfo $color $msg")	2749	$self->send_packet ("drawinfo $color $msg")
2428	}	2750	}
2429	}	2751	}
2430	}	2752	}
2431	}	2753	}
2432		2754
2433	=item $client->ext_event ($type, %msg)	2755	=item $client->ext_msg ($type, @msg)
2434		2756
2435	Sends an ext event to the client.	2757	Sends an ext event to the client.
2436		2758
2437	=cut	2759	=cut
2438		2760
2439	sub cf::client::ext_event($$%) {	2761	sub cf::client::ext_msg($$@) {
2440	my ($self, $type, %msg) = @_;	2762	my ($self, $type, @msg) = @_;
2441		2763
		2764	if ($self->extcmd == 2) {
		2765	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2766	} elsif ($self->extcmd == 1) { # TODO: remove
2442	$msg{msgtype} = "event_$type";	2767	push @msg, msgtype => "event_$type";
2443	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2768	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2769	}
		2770	}
		2771
		2772	=item $client->ext_reply ($msgid, @msg)
		2773
		2774	Sends an ext reply to the client.
		2775
		2776	=cut
		2777
		2778	sub cf::client::ext_reply($$@) {
		2779	my ($self, $id, @msg) = @_;
		2780
		2781	if ($self->extcmd == 2) {
		2782	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2783	} elsif ($self->extcmd == 1) {
		2784	#TODO: version 1, remove
		2785	unshift @msg, msgtype => "reply", msgid => $id;
		2786	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2787	}
2444	}	2788	}
2445		2789
2446	=item $success = $client->query ($flags, "text", \&cb)	2790	=item $success = $client->query ($flags, "text", \&cb)
2447		2791
2448	Queues a query to the client, calling the given callback with	2792	Queues a query to the client, calling the given callback with
…		…
2503	my ($ns, $buf) = @_;	2847	my ($ns, $buf) = @_;
2504		2848
2505	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2849	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2506		2850
2507	if (ref $msg) {	2851	if (ref $msg) {
		2852	my ($type, $reply, @payload) =
		2853	"ARRAY" eq ref $msg
		2854	? @$msg
		2855	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2856
		2857	my @reply;
		2858
2508	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2859	if (my $cb = $EXTICMD{$type}) {
2509	if (my %reply = $cb->($ns, $msg)) {	2860	@reply = $cb->($ns, @payload);
2510	$reply{msgid} = $msg->{msgid};
2511	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2512	}
2513	}	2861	}
		2862
		2863	$ns->ext_reply ($reply, @reply)
		2864	if $reply;
		2865
2514	} else {	2866	} else {
2515	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2867	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2516	}	2868	}
2517		2869
2518	cf::override;	2870	cf::override;
…		…
2565	our $safe = new Safe "safe";	2917	our $safe = new Safe "safe";
2566	our $safe_hole = new Safe::Hole;	2918	our $safe_hole = new Safe::Hole;
2567		2919
2568	$SIG{FPE} = 'IGNORE';	2920	$SIG{FPE} = 'IGNORE';
2569		2921
2570	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2922	$safe->permit_only (Opcode::opset qw(
		2923	:base_core :base_mem :base_orig :base_math
		2924	grepstart grepwhile mapstart mapwhile
		2925	sort time
		2926	));
2571		2927
2572	# here we export the classes and methods available to script code	2928	# here we export the classes and methods available to script code
2573		2929
2574	=pod	2930	=pod
2575		2931
2576	The following functions and methods are available within a safe environment:	2932	The following functions and methods are available within a safe environment:
2577		2933
2578	cf::object contr pay_amount pay_player map	2934	cf::object
		2935	contr pay_amount pay_player map x y force_find force_add destroy
		2936	insert remove name archname title slaying race decrease_ob_nr
		2937
2579	cf::object::player player	2938	cf::object::player
2580	cf::player peaceful	2939	player
2581	cf::map trigger	2940
		2941	cf::player
		2942	peaceful
		2943
		2944	cf::map
		2945	trigger
2582		2946
2583	=cut	2947	=cut
2584		2948
2585	for (	2949	for (
2586	["cf::object" => qw(contr pay_amount pay_player map)],	2950	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2951	insert remove inv name archname title slaying race
		2952	decrease_ob_nr destroy)],
2587	["cf::object::player" => qw(player)],	2953	["cf::object::player" => qw(player)],
2588	["cf::player" => qw(peaceful)],	2954	["cf::player" => qw(peaceful)],
2589	["cf::map" => qw(trigger)],	2955	["cf::map" => qw(trigger)],
2590	) {	2956	) {
2591	no strict 'refs';	2957	no strict 'refs';
…		…
2667	# the server's init and main functions	3033	# the server's init and main functions
2668		3034
2669	sub load_facedata($) {	3035	sub load_facedata($) {
2670	my ($path) = @_;	3036	my ($path) = @_;
2671		3037
		3038	# HACK to clear player env face cache, we need some signal framework
		3039	# for this (global event?)
		3040	%ext::player_env::MUSIC_FACE_CACHE = ();
		3041
		3042	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3043
2672	warn "loading facedata from $path\n";	3044	warn "loading facedata from $path\n";
2673		3045
2674	my $facedata;	3046	my $facedata;
2675	0 < aio_load $path, $facedata	3047	0 < aio_load $path, $facedata
2676	or die "$path: $!";	3048	or die "$path: $!";
…		…
2678	$facedata = Coro::Storable::thaw $facedata;	3050	$facedata = Coro::Storable::thaw $facedata;
2679		3051
2680	$facedata->{version} == 2	3052	$facedata->{version} == 2
2681	or cf::cleanup "$path: version mismatch, cannot proceed.";	3053	or cf::cleanup "$path: version mismatch, cannot proceed.";
2682		3054
		3055	# patch in the exptable
		3056	$facedata->{resource}{"res/exp_table"} = {
		3057	type => FT_RSRC,
		3058	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3059	};
		3060	cf::cede_to_tick;
		3061
2683	{	3062	{
2684	my $faces = $facedata->{faceinfo};	3063	my $faces = $facedata->{faceinfo};
2685		3064
2686	while (my ($face, $info) = each %$faces) {	3065	while (my ($face, $info) = each %$faces) {
2687	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3066	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2688	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3067	cf::face::set_visibility $idx, $info->{visibility};
		3068	cf::face::set_magicmap $idx, $info->{magicmap};
2689	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3069	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2690	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3070	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2691	Coro::cede;	3071
		3072	cf::cede_to_tick;
2692	}	3073	}
2693		3074
2694	while (my ($face, $info) = each %$faces) {	3075	while (my ($face, $info) = each %$faces) {
2695	next unless $info->{smooth};	3076	next unless $info->{smooth};
2696	my $idx = cf::face::find $face	3077	my $idx = cf::face::find $face
2697	or next;	3078	or next;
2698	if (my $smooth = cf::face::find $info->{smooth}) {	3079	if (my $smooth = cf::face::find $info->{smooth}) {
		3080	cf::face::set_smooth $idx, $smooth;
2699	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3081	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2700	} else {	3082	} else {
2701	warn "smooth face '$info->{smooth}' not found for face '$face'";	3083	warn "smooth face '$info->{smooth}' not found for face '$face'";
2702	}	3084	}
2703	Coro::cede;	3085
		3086	cf::cede_to_tick;
2704	}	3087	}
2705	}	3088	}
2706		3089
2707	{	3090	{
2708	my $anims = $facedata->{animinfo};	3091	my $anims = $facedata->{animinfo};
2709		3092
2710	while (my ($anim, $info) = each %$anims) {	3093	while (my ($anim, $info) = each %$anims) {
2711	cf::anim::set $anim, $info->{frames}, $info->{facings};	3094	cf::anim::set $anim, $info->{frames}, $info->{facings};
2712	Coro::cede;	3095	cf::cede_to_tick;
2713	}	3096	}
2714		3097
2715	cf::anim::invalidate_all; # d'oh	3098	cf::anim::invalidate_all; # d'oh
2716	}	3099	}
2717		3100
		3101	{
		3102	# TODO: for gcfclient pleasure, we should give resources
		3103	# that gcfclient doesn't grok a >10000 face index.
		3104	my $res = $facedata->{resource};
		3105
		3106	my $soundconf = delete $res->{"res/sound.conf"};
		3107
		3108	while (my ($name, $info) = each %$res) {
		3109	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3110	my $data;
		3111
		3112	if ($info->{type} & 1) {
		3113	# prepend meta info
		3114
		3115	my $meta = $enc->encode ({
		3116	name => $name,
		3117	%{ $info->{meta} \|\| {} },
		3118	});
		3119
		3120	$data = pack "(w/a)", $meta, $info->{data};
		3121	} else {
		3122	$data = $info->{data};
		3123	}
		3124
		3125	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3126	cf::face::set_type $idx, $info->{type};
		3127
		3128	cf::cede_to_tick;
		3129	}
		3130
		3131	if ($soundconf) {
		3132	$soundconf = $enc->decode (delete $soundconf->{data});
		3133
		3134	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3135	my $sound = $soundconf->{compat}[$_]
		3136	or next;
		3137
		3138	my $face = cf::face::find "sound/$sound->[1]";
		3139	cf::sound::set $sound->[0] => $face;
		3140	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3141	}
		3142
		3143	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3144	my $face = cf::face::find "sound/$v";
		3145	cf::sound::set $k => $face;
		3146	}
		3147	}
		3148	}
		3149
2718	1	3150	1
2719	}	3151	}
2720		3152
		3153	register_exticmd fx_want => sub {
		3154	my ($ns, $want) = @_;
		3155
		3156	while (my ($k, $v) = each %$want) {
		3157	$ns->fx_want ($k, $v);
		3158	}
		3159	};
		3160
2721	sub reload_regions {	3161	sub reload_regions {
		3162	# HACK to clear player env face cache, we need some signal framework
		3163	# for this (global event?)
		3164	%ext::player_env::MUSIC_FACE_CACHE = ();
		3165
2722	load_resource_file "$MAPDIR/regions"	3166	load_resource_file "$MAPDIR/regions"
2723	or die "unable to load regions file\n";	3167	or die "unable to load regions file\n";
		3168
		3169	for (cf::region::list) {
		3170	$_->{match} = qr/$_->{match}/
		3171	if exists $_->{match};
		3172	}
2724	}	3173	}
2725		3174
2726	sub reload_facedata {	3175	sub reload_facedata {
2727	load_facedata "$DATADIR/facedata"	3176	load_facedata "$DATADIR/facedata"
2728	or die "unable to load facedata\n";	3177	or die "unable to load facedata\n";
…		…
2757		3206
2758	sub init {	3207	sub init {
2759	reload_resources;	3208	reload_resources;
2760	}	3209	}
2761		3210
2762	sub cfg_load {	3211	sub reload_config {
2763	open my $fh, "<:utf8", "$CONFDIR/config"	3212	open my $fh, "<:utf8", "$CONFDIR/config"
2764	or return;	3213	or return;
2765		3214
2766	local $/;	3215	local $/;
2767	*CFG = YAML::Syck::Load <$fh>;	3216	*CFG = YAML::Syck::Load <$fh>;
…		…
2783	sub main {	3232	sub main {
2784	# we must not ever block the main coroutine	3233	# we must not ever block the main coroutine
2785	local $Coro::idle = sub {	3234	local $Coro::idle = sub {
2786	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3235	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2787	(async {	3236	(async {
		3237	$Coro::current->{desc} = "IDLE BUG HANDLER";
2788	Event::one_event;	3238	Event::one_event;
2789	})->prio (Coro::PRIO_MAX);	3239	})->prio (Coro::PRIO_MAX);
2790	};	3240	};
2791		3241
2792	cfg_load;	3242	reload_config;
2793	db_init;	3243	db_init;
2794	load_extensions;	3244	load_extensions;
2795		3245
2796	$TICK_WATCHER->start;	3246	$TICK_WATCHER->start;
2797	Event::loop;	3247	Event::loop;
…		…
2864	# and maps saved/destroyed asynchronously.	3314	# and maps saved/destroyed asynchronously.
2865	warn "begin emergency player save\n";	3315	warn "begin emergency player save\n";
2866	for my $login (keys %cf::PLAYER) {	3316	for my $login (keys %cf::PLAYER) {
2867	my $pl = $cf::PLAYER{$login} or next;	3317	my $pl = $cf::PLAYER{$login} or next;
2868	$pl->valid or next;	3318	$pl->valid or next;
		3319	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2869	$pl->save;	3320	$pl->save;
2870	}	3321	}
2871	warn "end emergency player save\n";	3322	warn "end emergency player save\n";
2872		3323
2873	warn "begin emergency map save\n";	3324	warn "begin emergency map save\n";
…		…
2921		3372
2922	warn "flushing outstanding aio requests";	3373	warn "flushing outstanding aio requests";
2923	for (;;) {	3374	for (;;) {
2924	BDB::flush;	3375	BDB::flush;
2925	IO::AIO::flush;	3376	IO::AIO::flush;
2926	Coro::cede;	3377	Coro::cede_notself;
2927	last unless IO::AIO::nreqs \|\| BDB::nreqs;	3378	last unless IO::AIO::nreqs \|\| BDB::nreqs;
2928	warn "iterate...";	3379	warn "iterate...";
2929	}	3380	}
2930		3381
2931	++$RELOAD;	3382	++$RELOAD;
…		…
2990	warn "reloading cf.pm";	3441	warn "reloading cf.pm";
2991	require cf;	3442	require cf;
2992	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3443	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2993		3444
2994	warn "loading config and database again";	3445	warn "loading config and database again";
2995	cf::cfg_load;	3446	cf::reload_config;
2996		3447
2997	warn "loading extensions";	3448	warn "loading extensions";
2998	cf::load_extensions;	3449	cf::load_extensions;
2999		3450
3000	warn "reattaching attachments to objects/players";	3451	warn "reattaching attachments to objects/players";
…		…
3036	register_command "reload" => sub {	3487	register_command "reload" => sub {
3037	my ($who, $arg) = @_;	3488	my ($who, $arg) = @_;
3038		3489
3039	if ($who->flag (FLAG_WIZ)) {	3490	if ($who->flag (FLAG_WIZ)) {
3040	$who->message ("reloading server.");	3491	$who->message ("reloading server.");
		3492	async {
		3493	$Coro::current->{desc} = "perl_reload";
3041	async { reload_perl };	3494	reload_perl;
		3495	};
3042	}	3496	}
3043	};	3497	};
3044		3498
3045	unshift @INC, $LIBDIR;	3499	unshift @INC, $LIBDIR;
3046		3500
…		…
3065	my $signal = new Coro::Signal;	3519	my $signal = new Coro::Signal;
3066	push @WAIT_FOR_TICK_BEGIN, $signal;	3520	push @WAIT_FOR_TICK_BEGIN, $signal;
3067	$signal->wait;	3521	$signal->wait;
3068	}	3522	}
3069		3523
3070	my $min = 1e6;#d#
3071	my $avg = 10;
3072	$TICK_WATCHER = Event->timer (	3524	$TICK_WATCHER = Event->timer (
3073	reentrant => 0,	3525	reentrant => 0,
3074	parked => 1,	3526	parked => 1,
3075	prio => 0,	3527	prio => 0,
3076	at => $NEXT_TICK \|\| $TICK,	3528	at => $NEXT_TICK \|\| $TICK,
…		…
3084		3536
3085	$NOW = $tick_start = Event::time;	3537	$NOW = $tick_start = Event::time;
3086		3538
3087	cf::server_tick; # one server iteration	3539	cf::server_tick; # one server iteration
3088		3540
3089	0 && sync_job {#d#
3090	for(1..10) {
3091	my $t = Event::time;
3092	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3093	or die;
3094
3095	$map->width (50);
3096	$map->height (50);
3097	$map->alloc;
3098	$map->_load_objects ("/tmp/x.map", 1);
3099	my $t = Event::time - $t;
3100
3101	#next unless $t < 0.0013;#d#
3102	if ($t < $min) {
3103	$min = $t;
3104	}
3105	$avg = $avg * 0.99 + $t * 0.01;
3106	}
3107	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3108	exit 0;
3109	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3110	};
3111
3112	$RUNTIME += $TICK;	3541	$RUNTIME += $TICK;
3113	$NEXT_TICK += $TICK;	3542	$NEXT_TICK += $TICK;
3114		3543
3115	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3544	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3116	$NEXT_RUNTIME_WRITE = $NOW + 10;	3545	$NEXT_RUNTIME_WRITE = $NOW + 10;
3117	Coro::async_pool {	3546	Coro::async_pool {
		3547	$Coro::current->{desc} = "runtime saver";
3118	write_runtime	3548	write_runtime
3119	or warn "ERROR: unable to write runtime file: $!";	3549	or warn "ERROR: unable to write runtime file: $!";
3120	};	3550	};
3121	}	3551	}
3122		3552
3123	# my $AFTER = Event::time;
3124	# warn $AFTER - $NOW;#d#
3125
3126	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3553	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3127	$sig->send;	3554	$sig->send;
3128	}	3555	}
3129	while (my $sig = shift @WAIT_FOR_TICK) {	3556	while (my $sig = shift @WAIT_FOR_TICK) {
3130	$sig->send;	3557	$sig->send;
…		…
3140		3567
3141	$LOAD = ($NOW - $tick_start) / $TICK;	3568	$LOAD = ($NOW - $tick_start) / $TICK;
3142	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3569	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3143		3570
3144	_post_tick;	3571	_post_tick;
3145
3146
3147	},	3572	},
3148	);	3573	);
3149		3574
3150	{	3575	{
		3576	BDB::min_parallel 8;
3151	BDB::max_poll_time $TICK * 0.1;	3577	BDB::max_poll_time $TICK * 0.1;
3152	$BDB_POLL_WATCHER = Event->io (	3578	$BDB_POLL_WATCHER = Event->io (
3153	reentrant => 0,	3579	reentrant => 0,
3154	fd => BDB::poll_fileno,	3580	fd => BDB::poll_fileno,
3155	poll => 'r',	3581	poll => 'r',
3156	prio => 0,	3582	prio => 0,
3157	data => WF_AUTOCANCEL,	3583	data => WF_AUTOCANCEL,
3158	cb => \&BDB::poll_cb,	3584	cb => \&BDB::poll_cb,
3159	);	3585	);
3160	BDB::min_parallel 8;
3161		3586
3162	BDB::set_sync_prepare {	3587	BDB::set_sync_prepare {
3163	my $status;	3588	my $status;
3164	my $current = $Coro::current;	3589	my $current = $Coro::current;
3165	(	3590	(
…		…
3174	)	3599	)
3175	};	3600	};
3176		3601
3177	unless ($DB_ENV) {	3602	unless ($DB_ENV) {
3178	$DB_ENV = BDB::db_env_create;	3603	$DB_ENV = BDB::db_env_create;
		3604	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC
		3605	\| BDB::LOG_AUTOREMOVE, 1);
		3606	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3607	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3179		3608
3180	cf::sync_job {	3609	cf::sync_job {
3181	eval {	3610	eval {
3182	BDB::db_env_open	3611	BDB::db_env_open
3183	$DB_ENV,	3612	$DB_ENV,
…		…
3185	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN	3614	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN
3186	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3615	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3187	0666;	3616	0666;
3188		3617
3189	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3618	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3190
3191	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
3192	$DB_ENV->set_lk_detect;
3193	};	3619	};
3194		3620
3195	cf::cleanup "db_env_open(db): $@" if $@;	3621	cf::cleanup "db_env_open(db): $@" if $@;
3196	};	3622	};
3197	}	3623	}
		3624
		3625	$BDB_DEADLOCK_WATCHER = Event->timer (
		3626	after => 3,
		3627	interval => 1,
		3628	hard => 1,
		3629	prio => 0,
		3630	data => WF_AUTOCANCEL,
		3631	cb => sub {
		3632	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3633	},
		3634	);
		3635	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3636	after => 11,
		3637	interval => 60,
		3638	hard => 1,
		3639	prio => 0,
		3640	data => WF_AUTOCANCEL,
		3641	cb => sub {
		3642	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3643	},
		3644	);
		3645	$BDB_TRICKLE_WATCHER = Event->timer (
		3646	after => 5,
		3647	interval => 10,
		3648	hard => 1,
		3649	prio => 0,
		3650	data => WF_AUTOCANCEL,
		3651	cb => sub {
		3652	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3653	},
		3654	);
3198	}	3655	}
3199		3656
3200	{	3657	{
3201	IO::AIO::min_parallel 8;	3658	IO::AIO::min_parallel 8;
3202		3659
…		…
3205	$AIO_POLL_WATCHER = Event->io (	3662	$AIO_POLL_WATCHER = Event->io (
3206	reentrant => 0,	3663	reentrant => 0,
3207	data => WF_AUTOCANCEL,	3664	data => WF_AUTOCANCEL,
3208	fd => IO::AIO::poll_fileno,	3665	fd => IO::AIO::poll_fileno,
3209	poll => 'r',	3666	poll => 'r',
3210	prio => 6,	3667	prio => 0,
3211	cb => \&IO::AIO::poll_cb,	3668	cb => \&IO::AIO::poll_cb,
3212	);	3669	);
3213	}	3670	}
3214		3671
3215	my $_log_backtrace;	3672	my $_log_backtrace;
…		…
3221		3678
3222	# limit the # of concurrent backtraces	3679	# limit the # of concurrent backtraces
3223	if ($_log_backtrace < 2) {	3680	if ($_log_backtrace < 2) {
3224	++$_log_backtrace;	3681	++$_log_backtrace;
3225	async {	3682	async {
		3683	$Coro::current->{desc} = "abt $msg";
		3684
3226	my @bt = fork_call {	3685	my @bt = fork_call {
3227	@addr = map { sprintf "%x", $_ } @addr;	3686	@addr = map { sprintf "%x", $_ } @addr;
3228	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3687	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3229	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"	3688	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"
3230	or die "addr2line: $!";	3689	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.292 by root, Tue Jul 3 00:54:57 2007 UTC vs. Revision 1.388 by root, Thu Oct 18 02:56:13 2007 UTC

Diff Legend

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.292 by root, Tue Jul 3 00:54:57 2007 UTC vs.
Revision 1.388 by root, Thu Oct 18 02:56:13 2007 UTC