ViewVC Help

View File | Revision Log | Show Annotations | Download File

/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.385 by root, Fri Oct 12 19:13:26 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
…		…
412	=cut	494	=cut
413		495
414	sub fork_call(&@) {	496	sub fork_call(&@) {
415	my ($cb, @args) = @_;	497	my ($cb, @args) = @_;
416		498
417	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	499	# we seemingly have to make a local copy of the whole thing,
418	# or die "socketpair: $!";	500	# otherwise perl prematurely frees the stuff :/
419	pipe my $fh1, my $fh2	501	# TODO: investigate and fix (likely this will be rather laborious)
420	or die "pipe: $!";
421		502
422	if (my $pid = fork) {	503	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;	504	reset_signals;
435	local $SIG{__WARN__};	505	&$cb
436	local $SIG{__DIE__};	506	}, @args;
437	eval {
438	close $fh1;
439		507
440	my @res = eval { $cb->(@args) };	508	wantarray ? @res : $res[-1]
441	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442	};
443
444	warn $@ if $@;
445	_exit 0;
446	}
447	}	509	}
448		510
449	=item $value = cf::db_get $family => $key	511	=item $value = cf::db_get $family => $key
450		512
451	Returns a single value from the environment database.	513	Returns a single value from the environment database.
…		…
453	=item cf::db_put $family => $key => $value	515	=item cf::db_put $family => $key => $value
454		516
455	Stores the given C<$value> in the family. It can currently store binary	517	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).	518	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
457		519
		520	=item $db = cf::db_table "name"
		521
		522	Create and/or open a new database table. The string must not be "db" and must be unique
		523	within each server.
		524
458	=cut	525	=cut
		526
		527	sub db_table($) {
		528	my ($name) = @_;
		529	my $db = BDB::db_create $DB_ENV;
		530
		531	eval {
		532	$db->set_flags (BDB::CHKSUM);
		533
		534	utf8::encode $name;
		535	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		536	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		537	cf::cleanup "db_open(db): $!" if $!;
		538	};
		539	cf::cleanup "db_open(db): $@" if $@;
		540
		541	$db
		542	}
459		543
460	our $DB;	544	our $DB;
461		545
462	sub db_init {	546	sub db_init {
463	unless ($DB) {
464	$DB = BDB::db_create $DB_ENV;
465
466	cf::sync_job {	547	cf::sync_job {
467	eval {	548	$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	}	549	};
477	}	550	}
478		551
479	sub db_get($$) {	552	sub db_get($$) {
480	my $key = "$_[0]/$_[1]";	553	my $key = "$_[0]/$_[1]";
481		554
…		…
531	if (1) {	604	if (1) {
532	$md5 =	605	$md5 =
533	join "\x00",	606	join "\x00",
534	$processversion,	607	$processversion,
535	map {	608	map {
536	Coro::cede;	609	cf::cede_to_tick;
537	($src->[$_], Digest::MD5::md5_hex $data[$_])	610	($src->[$_], Digest::MD5::md5_hex $data[$_])
538	} 0.. $#$src;	611	} 0.. $#$src;
539		612
540		613
541	my $dbmd5 = db_get cache => "$id/md5";	614	my $dbmd5 = db_get cache => "$id/md5";
…		…
847	";	920	";
848	die if $@;	921	die if $@;
849	}	922	}
850		923
851	our $override;	924	our $override;
852	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	925	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
853		926
854	sub override {	927	sub override {
855	$override = 1;	928	$override = 1;
856	@invoke_results = ();	929	@INVOKE_RESULTS = (@_);
857	}	930	}
858		931
859	sub do_invoke {	932	sub do_invoke {
860	my $event = shift;	933	my $event = shift;
861	my $callbacks = shift;	934	my $callbacks = shift;
862		935
863	@invoke_results = ();	936	@INVOKE_RESULTS = ();
864		937
865	local $override;	938	local $override;
866		939
867	for (@$callbacks) {	940	for (@$callbacks) {
868	eval { &{$_->[1]} };	941	eval { &{$_->[1]} };
…		…
885		958
886	Generate an object-specific event with the given arguments.	959	Generate an object-specific event with the given arguments.
887		960
888	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	961	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	962	removed in future versions), and there is no public API to access override
890	results (if you must, access C<@cf::invoke_results> directly).	963	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891		964
892	=back	965	=back
893		966
894	=cut	967	=cut
895		968
896	#############################################################################	969	#############################################################################
897	# object support	970	# object support
		971	#
		972
		973	sub _can_merge {
		974	my ($ob1, $ob2) = @_;
		975
		976	return 1;#d#
		977
		978	#todo#d# kill yourself and do some recursive checking manually without storable
		979	sync_job {
		980	my $guard = Coro::Storable::guard;
		981	local $Storable::canonical = 1;
		982	my $fob1 = Storable::freeze $ob1;
		983	my $fob2 = Storable::freeze $ob2;
		984	$fob1 eq $fob2
		985	}
		986	}
898		987
899	sub reattach {	988	sub reattach {
900	# basically do the same as instantiate, without calling instantiate	989	# basically do the same as instantiate, without calling instantiate
901	my ($obj) = @_;	990	my ($obj) = @_;
902		991
…		…
949	sub object_freezer_save {	1038	sub object_freezer_save {
950	my ($filename, $rdata, $objs) = @_;	1039	my ($filename, $rdata, $objs) = @_;
951		1040
952	sync_job {	1041	sync_job {
953	if (length $$rdata) {	1042	if (length $$rdata) {
		1043	utf8::decode (my $decname = $filename);
954	warn sprintf "saving %s (%d,%d)\n",	1044	warn sprintf "saving %s (%d,%d)\n",
955	$filename, length $$rdata, scalar @$objs;	1045	$decname, length $$rdata, scalar @$objs;
956		1046
957	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1047	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
958	chmod SAVE_MODE, $fh;	1048	chmod SAVE_MODE, $fh;
959	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1049	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960	aio_fsync $fh if $cf::USE_FSYNC;	1050	aio_fsync $fh if $cf::USE_FSYNC;
961	close $fh;	1051	close $fh;
962		1052
963	if (@$objs) {	1053	if (@$objs) {
964	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1054	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
965	chmod SAVE_MODE, $fh;	1055	chmod SAVE_MODE, $fh;
966	my $data = Storable::nfreeze { version => 1, objs => $objs };	1056	my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
967	aio_write $fh, 0, (length $data), $data, 0;	1057	aio_write $fh, 0, (length $data), $data, 0;
968	aio_fsync $fh if $cf::USE_FSYNC;	1058	aio_fsync $fh if $cf::USE_FSYNC;
969	close $fh;	1059	close $fh;
970	aio_rename "$filename.pst~", "$filename.pst";	1060	aio_rename "$filename.pst~", "$filename.pst";
971	}	1061	}
…		…
979	}	1069	}
980	} else {	1070	} else {
981	aio_unlink $filename;	1071	aio_unlink $filename;
982	aio_unlink "$filename.pst";	1072	aio_unlink "$filename.pst";
983	}	1073	}
984	}	1074	};
985	}	1075	}
986		1076
987	sub object_freezer_as_string {	1077	sub object_freezer_as_string {
988	my ($rdata, $objs) = @_;	1078	my ($rdata, $objs) = @_;
989		1079
…		…
1001	or return;	1091	or return;
1002		1092
1003	unless (aio_stat "$filename.pst") {	1093	unless (aio_stat "$filename.pst") {
1004	(aio_load "$filename.pst", $av) >= 0	1094	(aio_load "$filename.pst", $av) >= 0
1005	or return;	1095	or return;
1006	$av = eval { (Storable::thaw $av)->{objs} };
1007	}
1008		1096
		1097	my $st = eval { Coro::Storable::thaw $av }
		1098	|| eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
		1099	$av = $st->{objs};
		1100	}
		1101
		1102	utf8::decode (my $decname = $filename);
1009	warn sprintf "loading %s (%d)\n",	1103	warn sprintf "loading %s (%d,%d)\n",
1010	$filename, length $data, scalar @{$av || []};	1104	$decname, length $data, scalar @{$av || []};
		1105
1011	return ($data, $av);	1106	($data, $av)
1012	}	1107	}
1013		1108
1014	=head2 COMMAND CALLBACKS	1109	=head2 COMMAND CALLBACKS
1015		1110
1016	=over 4	1111	=over 4
…		…
1089	my ($pl, $buf) = @_;	1184	my ($pl, $buf) = @_;
1090		1185
1091	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1186	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092		1187
1093	if (ref $msg) {	1188	if (ref $msg) {
		1189	my ($type, $reply, @payload) =
		1190	"ARRAY" eq ref $msg
		1191	? @$msg
		1192	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1193
		1194	my @reply;
		1195
1094	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1196	if (my $cb = $EXTCMD{$type}) {
1095	if (my %reply = $cb->($pl, $msg)) {	1197	@reply = $cb->($pl, @payload);
1096	$pl->ext_reply ($msg->{msgid}, %reply);
1097	}
1098	}	1198	}
		1199
		1200	$pl->ext_reply ($reply, @reply)
		1201	if $reply;
		1202
1099	} else {	1203	} else {
1100	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1204	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101	}	1205	}
1102		1206
1103	cf::override;	1207	cf::override;
…		…
1193		1297
1194	=head3 cf::player	1298	=head3 cf::player
1195		1299
1196	=over 4	1300	=over 4
1197		1301
		1302	=item cf::player::num_playing
		1303
		1304	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1305
		1306	=cut
		1307
		1308	sub num_playing {
		1309	scalar grep
		1310	$_->ob->map
		1311	&& !$_->hidden
		1312	&& !$_->ob->flag (cf::FLAG_WIZ),
		1313	cf::player::list
		1314	}
		1315
1198	=item cf::player::find $login	1316	=item cf::player::find $login
1199		1317
1200	Returns the given player object, loading it if necessary (might block).	1318	Returns the given player object, loading it if necessary (might block).
1201		1319
1202	=cut	1320	=cut
…		…
1237	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1355	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1356	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1357	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240	aio_unlink +(playerdir $login) . "/$login.pl";	1358	aio_unlink +(playerdir $login) . "/$login.pl";
1241		1359
1242	my $pl = load_pl path $login	1360	my $f = new_from_file cf::object::thawer path $login
1243	or return;	1361	or return;
		1362
		1363	my $pl = cf::player::load_pl $f
		1364	or return;
		1365	local $cf::PLAYER_LOADING{$login} = $pl;
		1366	$f->resolve_delayed_derefs;
1244	$cf::PLAYER{$login} = $pl	1367	$cf::PLAYER{$login} = $pl
1245	}	1368	}
1246	}	1369	}
1247	}	1370	}
1248		1371
…		…
1258		1381
1259	aio_mkdir playerdir $pl, 0770;	1382	aio_mkdir playerdir $pl, 0770;
1260	$pl->{last_save} = $cf::RUNTIME;	1383	$pl->{last_save} = $cf::RUNTIME;
1261		1384
1262	$pl->save_pl ($path);	1385	$pl->save_pl ($path);
1263	Coro::cede;	1386	cf::cede_to_tick;
1264	}	1387	}
1265		1388
1266	sub new($) {	1389	sub new($) {
1267	my ($login) = @_;	1390	my ($login) = @_;
1268		1391
…		…
1272	$self->{deny_save} = 1;	1395	$self->{deny_save} = 1;
1273		1396
1274	$cf::PLAYER{$login} = $self;	1397	$cf::PLAYER{$login} = $self;
1275		1398
1276	$self	1399	$self
		1400	}
		1401
		1402	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1403
		1404	=cut
		1405
		1406	sub send_msg {
		1407	my $ns = shift->ns
		1408	or return;
		1409	$ns->send_msg (@_);
1277	}	1410	}
1278		1411
1279	=item $pl->quit_character	1412	=item $pl->quit_character
1280		1413
1281	Nukes the player without looking back. If logged in, the connection will	1414	Nukes the player without looking back. If logged in, the connection will
…		…
1336	or return [];	1469	or return [];
1337		1470
1338	my @logins;	1471	my @logins;
1339		1472
1340	for my $login (@$dirs) {	1473	for my $login (@$dirs) {
		1474	my $path = path $login;
		1475
		1476	# a .pst is a dead give-away for a valid player
		1477	unless (-e "$path.pst") {
1341	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1478	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342	aio_read $fh, 0, 512, my $buf, 0 or next;	1479	aio_read $fh, 0, 512, my $buf, 0 or next;
1343	$buf !~ /^password -------------$/m or next; # official not-valid tag	1480	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1481	}
1344		1482
1345	utf8::decode $login;	1483	utf8::decode $login;
1346	push @logins, $login;	1484	push @logins, $login;
1347	}	1485	}
1348		1486
…		…
1386	sub expand_cfpod {	1524	sub expand_cfpod {
1387	((my $self), (local $_)) = @_;	1525	((my $self), (local $_)) = @_;
1388		1526
1389	# escape & and <	1527	# escape & and <
1390	s/&/&amp;/g;	1528	s/&/&amp;/g;
1391	s/(?<![BIUGH])</&lt;/g;	1529	s/(?<![BIUGHT])</&lt;/g;
1392		1530
1393	# this is buggy, it needs to properly take care of nested <'s	1531	# this is buggy, it needs to properly take care of nested <'s
1394		1532
1395	1 while	1533	1 while
1396	# replace B<>, I<>, U<> etc.	1534	# replace B<>, I<>, U<> etc.
1397	s/B<([^\>]*)>/<b>$1<\/b>/	1535	s/B<([^\>]*)>/<b>$1<\/b>/
1398	|| s/I<([^\>]*)>/<i>$1<\/i>/	1536	|| s/I<([^\>]*)>/<i>$1<\/i>/
1399	|| s/U<([^\>]*)>/<u>$1<\/u>/	1537	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1538	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1400	# replace G<male|female> tags	1539	# replace G<male|female> tags
1401	|| s{G<([^>|]*)\|([^>]*)>}{	1540	|| s{G<([^>|]*)\|([^>]*)>}{
1402	$self->gender ? $2 : $1	1541	$self->gender ? $2 : $1
1403	}ge	1542	}ge
1404	# replace H<hint text>	1543	# replace H<hint text>
…		…
1412		1551
1413	# create single paragraphs (very hackish)	1552	# create single paragraphs (very hackish)
1414	s/(?<=\S)\n(?=\w)/ /g;	1553	s/(?<=\S)\n(?=\w)/ /g;
1415		1554
1416	# compress some whitespace	1555	# compress some whitespace
1417	1 while s/\s*\n\s*\n\s*/\n/;	1556	s/\s+\n/\n/g; # ws line-ends
1418		1557	s/\n\n+/\n/g; # double lines
1419	s/^\s+//;	1558	s/^\n+//; # beginning lines
1420	s/\s+$//;	1559	s/\n+$//; # ending lines
1421		1560
1422	$_	1561	$_
1423	}	1562	}
1424		1563
1425	sub hintmode {	1564	sub hintmode {
1426	$_[0]{hintmode} = $_[1] if @_ > 1;	1565	$_[0]{hintmode} = $_[1] if @_ > 1;
1427	$_[0]{hintmode}	1566	$_[0]{hintmode}
1428	}	1567	}
1429		1568
1430	=item $player->ext_reply ($msgid, %msg)	1569	=item $player->ext_reply ($msgid, @msg)
1431		1570
1432	Sends an ext reply to the player.	1571	Sends an ext reply to the player.
1433		1572
1434	=cut	1573	=cut
1435		1574
1436	sub ext_reply($$%) {	1575	sub ext_reply($$@) {
1437	my ($self, $id, %msg) = @_;	1576	my ($self, $id, @msg) = @_;
1438		1577
1439	$msg{msgid} = $id;	1578	$self->ns->ext_reply ($id, @msg)
1440	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1441	}	1579	}
1442		1580
1443	=item $player->ext_event ($type, %msg)	1581	=item $player->ext_msg ($type, @msg)
1444		1582
1445	Sends an ext event to the client.	1583	Sends an ext event to the client.
1446		1584
1447	=cut	1585	=cut
1448		1586
1449	sub ext_event($$%) {	1587	sub ext_msg($$@) {
1450	my ($self, $type, %msg) = @_;	1588	my ($self, $type, @msg) = @_;
1451		1589
1452	$self->ns->ext_event ($type, %msg);	1590	$self->ns->ext_msg ($type, @msg);
1453	}	1591	}
1454		1592
1455	=head3 cf::region	1593	=head3 cf::region
1456		1594
1457	=over 4	1595	=over 4
…		…
1470	my ($path) = @_;	1608	my ($path) = @_;
1471		1609
1472	my ($match, $specificity);	1610	my ($match, $specificity);
1473		1611
1474	for my $region (list) {	1612	for my $region (list) {
1475	if ($region->match && $path =~ $region->match) {	1613	if ($region->{match} && $path =~ $region->{match}) {
1476	($match, $specificity) = ($region, $region->specificity)	1614	($match, $specificity) = ($region, $region->specificity)
1477	if $region->specificity > $specificity;	1615	if $region->specificity > $specificity;
1478	}	1616	}
1479	}	1617	}
1480		1618
…		…
1600	$self->init; # pass $1 etc.	1738	$self->init; # pass $1 etc.
1601	return $self;	1739	return $self;
1602	}	1740	}
1603	}	1741	}
1604		1742
1605	Carp::carp "unable to resolve path '$path' (base '$base').";	1743	Carp::cluck "unable to resolve path '$path' (base '$base').";
1606	()	1744	()
1607	}	1745	}
1608		1746
1609	sub init {	1747	sub init {
1610	my ($self) = @_;	1748	my ($self) = @_;
…		…
1673		1811
1674	sub load_header_from($) {	1812	sub load_header_from($) {
1675	my ($self, $path) = @_;	1813	my ($self, $path) = @_;
1676		1814
1677	utf8::encode $path;	1815	utf8::encode $path;
1678	#aio_open $path, O_RDONLY, 0	1816	my $f = new_from_file cf::object::thawer $path
1679	# or return;
1680
1681	$self->_load_header ($path)
1682	or return;	1817	or return;
		1818
		1819	$self->_load_header ($f)
		1820	or return;
		1821
		1822	local $MAP_LOADING{$self->{path}} = $self;
		1823	$f->resolve_delayed_derefs;
1683		1824
1684	$self->{load_path} = $path;	1825	$self->{load_path} = $path;
1685		1826
1686	1	1827	1
1687	}	1828	}
…		…
1741	sub find {	1882	sub find {
1742	my ($path, $origin) = @_;	1883	my ($path, $origin) = @_;
1743		1884
1744	$path = normalise $path, $origin && $origin->path;	1885	$path = normalise $path, $origin && $origin->path;
1745		1886
		1887	cf::lock_wait "map_data:$path";#d#remove
1746	cf::lock_wait "map_find:$path";	1888	cf::lock_wait "map_find:$path";
1747		1889
1748	$cf::MAP{$path} || do {	1890	$cf::MAP{$path} || do {
1749	my $guard = cf::lock_acquire "map_find:$path";	1891	my $guard1 = cf::lock_acquire "map_find:$path";
		1892	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1893
1750	my $map = new_from_path cf::map $path	1894	my $map = new_from_path cf::map $path
1751	or return;	1895	or return;
1752		1896
1753	$map->{last_save} = $cf::RUNTIME;	1897	$map->{last_save} = $cf::RUNTIME;
1754		1898
…		…
1756	or return;	1900	or return;
1757		1901
1758	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1902	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1759	# doing this can freeze the server in a sync job, obviously	1903	# doing this can freeze the server in a sync job, obviously
1760	#$cf::WAIT_FOR_TICK->wait;	1904	#$cf::WAIT_FOR_TICK->wait;
		1905	undef $guard1;
		1906	undef $guard2;
1761	$map->reset;	1907	$map->reset;
1762	undef $guard;
1763	return find $path;	1908	return find $path;
1764	}	1909	}
1765		1910
1766	$cf::MAP{$path} = $map	1911	$cf::MAP{$path} = $map
1767	}	1912	}
…		…
1776	local $self->{deny_reset} = 1; # loading can take a long time	1921	local $self->{deny_reset} = 1; # loading can take a long time
1777		1922
1778	my $path = $self->{path};	1923	my $path = $self->{path};
1779		1924
1780	{	1925	{
1781	my $guard = cf::lock_acquire "map_load:$path";	1926	my $guard = cf::lock_acquire "map_data:$path";
1782		1927
		1928	return unless $self->valid;
1783	return if $self->in_memory != cf::MAP_SWAPPED;	1929	return unless $self->in_memory == cf::MAP_SWAPPED;
1784		1930
1785	$self->in_memory (cf::MAP_LOADING);	1931	$self->in_memory (cf::MAP_LOADING);
1786		1932
1787	$self->alloc;	1933	$self->alloc;
1788		1934
1789	$self->pre_load;	1935	$self->pre_load;
1790	Coro::cede;	1936	cf::cede_to_tick;
1791		1937
		1938	my $f = new_from_file cf::object::thawer $self->{load_path};
		1939	$f->skip_block;
1792	$self->_load_objects ($self->{load_path}, 1)	1940	$self->_load_objects ($f)
1793	or return;	1941	or return;
1794		1942
1795	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1943	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1796	if delete $self->{load_original};	1944	if delete $self->{load_original};
1797		1945
1798	if (my $uniq = $self->uniq_path) {	1946	if (my $uniq = $self->uniq_path) {
1799	utf8::encode $uniq;	1947	utf8::encode $uniq;
1800	if (aio_open $uniq, O_RDONLY, 0) {	1948	unless (aio_stat $uniq) {
		1949	if (my $f = new_from_file cf::object::thawer $uniq) {
1801	$self->clear_unique_items;	1950	$self->clear_unique_items;
1802	$self->_load_objects ($uniq, 0);	1951	$self->_load_objects ($f);
		1952	$f->resolve_delayed_derefs;
		1953	}
1803	}	1954	}
1804	}	1955	}
1805		1956
1806	Coro::cede;	1957	$f->resolve_delayed_derefs;
		1958
		1959	cf::cede_to_tick;
1807	# now do the right thing for maps	1960	# now do the right thing for maps
1808	$self->link_multipart_objects;	1961	$self->link_multipart_objects;
1809	$self->difficulty ($self->estimate_difficulty)	1962	$self->difficulty ($self->estimate_difficulty)
1810	unless $self->difficulty;	1963	unless $self->difficulty;
1811	Coro::cede;	1964	cf::cede_to_tick;
1812		1965
1813	unless ($self->{deny_activate}) {	1966	unless ($self->{deny_activate}) {
1814	$self->decay_objects;	1967	$self->decay_objects;
1815	$self->fix_auto_apply;	1968	$self->fix_auto_apply;
1816	$self->update_buttons;	1969	$self->update_buttons;
1817	Coro::cede;	1970	cf::cede_to_tick;
1818	$self->set_darkness_map;	1971	$self->set_darkness_map;
1819	Coro::cede;	1972	cf::cede_to_tick;
1820	$self->activate;	1973	$self->activate;
1821	}	1974	}
		1975
		1976	$self->{last_save} = $cf::RUNTIME;
		1977	$self->last_access ($cf::RUNTIME);
1822		1978
1823	$self->in_memory (cf::MAP_IN_MEMORY);	1979	$self->in_memory (cf::MAP_IN_MEMORY);
1824	}	1980	}
1825		1981
1826	$self->post_load;	1982	$self->post_load;
…		…
1837		1993
1838	$self	1994	$self
1839	}	1995	}
1840		1996
1841	# find and load all maps in the 3x3 area around a map	1997	# find and load all maps in the 3x3 area around a map
1842	sub load_diag {	1998	sub load_neighbours {
1843	my ($map) = @_;	1999	my ($map) = @_;
1844		2000
1845	my @diag; # diagonal neighbours	2001	my @neigh; # diagonal neighbours
1846		2002
1847	for (0 .. 3) {	2003	for (0 .. 3) {
1848	my $neigh = $map->tile_path ($_)	2004	my $neigh = $map->tile_path ($_)
1849	or next;	2005	or next;
1850	$neigh = find $neigh, $map	2006	$neigh = find $neigh, $map
1851	or next;	2007	or next;
1852	$neigh->load;	2008	$neigh->load;
1853		2009
		2010	push @neigh,
1854	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2011	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1855	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2012	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1856	}	2013	}
1857		2014
1858	for (@diag) {	2015	for (grep defined $_->[0], @neigh) {
		2016	my ($path, $origin) = @$_;
1859	my $neigh = find @$_	2017	my $neigh = find $path, $origin
1860	or next;	2018	or next;
1861	$neigh->load;	2019	$neigh->load;
1862	}	2020	}
1863	}	2021	}
1864		2022
…		…
1869	}	2027	}
1870		2028
1871	sub do_load_sync {	2029	sub do_load_sync {
1872	my ($map) = @_;	2030	my ($map) = @_;
1873		2031
		2032	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2033	if $Coro::current == $Coro::main;
		2034
1874	cf::sync_job { $map->load };	2035	cf::sync_job { $map->load };
1875	}	2036	}
1876		2037
1877	our %MAP_PREFETCH;	2038	our %MAP_PREFETCH;
1878	our $MAP_PREFETCHER = undef;	2039	our $MAP_PREFETCHER = undef;
1879		2040
1880	sub find_async {	2041	sub find_async {
1881	my ($path, $origin) = @_;	2042	my ($path, $origin, $load) = @_;
1882		2043
1883	$path = normalise $path, $origin && $origin->{path};	2044	$path = normalise $path, $origin && $origin->{path};
1884		2045
1885	if (my $map = $cf::MAP{$path}) {	2046	if (my $map = $cf::MAP{$path}) {
1886	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2047	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1887	}	2048	}
1888		2049
1889	undef $MAP_PREFETCH{$path};	2050	$MAP_PREFETCH{$path} |= $load;
		2051
1890	$MAP_PREFETCHER ||= cf::async {	2052	$MAP_PREFETCHER ||= cf::async {
		2053	$Coro::current->{desc} = "map prefetcher";
		2054
1891	while (%MAP_PREFETCH) {	2055	while (%MAP_PREFETCH) {
1892	for my $path (keys %MAP_PREFETCH) {	2056	while (my ($k, $v) = each %MAP_PREFETCH) {
1893	my $map = find $path	2057	if (my $map = find $k) {
1894	or next;
1895	$map->load;	2058	$map->load if $v;
		2059	}
1896		2060
1897	delete $MAP_PREFETCH{$path};	2061	delete $MAP_PREFETCH{$k};
1898	}	2062	}
1899	}	2063	}
1900	undef $MAP_PREFETCHER;	2064	undef $MAP_PREFETCHER;
1901	};	2065	};
1902	$MAP_PREFETCHER->prio (6);	2066	$MAP_PREFETCHER->prio (6);
…		…
1905	}	2069	}
1906		2070
1907	sub save {	2071	sub save {
1908	my ($self) = @_;	2072	my ($self) = @_;
1909		2073
1910	my $lock = cf::lock_acquire "map_data:" . $self->path;	2074	my $lock = cf::lock_acquire "map_data:$self->{path}";
1911		2075
1912	$self->{last_save} = $cf::RUNTIME;	2076	$self->{last_save} = $cf::RUNTIME;
1913		2077
1914	return unless $self->dirty;	2078	return unless $self->dirty;
1915		2079
…		…
1921	return if $self->{deny_save};	2085	return if $self->{deny_save};
1922		2086
1923	local $self->{last_access} = $self->last_access;#d#	2087	local $self->{last_access} = $self->last_access;#d#
1924		2088
1925	cf::async {	2089	cf::async {
		2090	$Coro::current->{desc} = "map player save";
1926	$_->contr->save for $self->players;	2091	$_->contr->save for $self->players;
1927	};	2092	};
1928		2093
1929	if ($uniq) {	2094	if ($uniq) {
1930	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2095	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
1938	my ($self) = @_;	2103	my ($self) = @_;
1939		2104
1940	# save first because save cedes	2105	# save first because save cedes
1941	$self->save;	2106	$self->save;
1942		2107
1943	my $lock = cf::lock_acquire "map_data:" . $self->path;	2108	my $lock = cf::lock_acquire "map_data:$self->{path}";
1944		2109
1945	return if $self->players;	2110	return if $self->players;
1946	return if $self->in_memory != cf::MAP_IN_MEMORY;	2111	return if $self->in_memory != cf::MAP_IN_MEMORY;
1947	return if $self->{deny_save};	2112	return if $self->{deny_save};
1948		2113
		2114	$self->in_memory (cf::MAP_SWAPPED);
		2115
		2116	$self->deactivate;
		2117	$_->clear_links_to ($self) for values %cf::MAP;
1949	$self->clear;	2118	$self->clear;
1950	$self->in_memory (cf::MAP_SWAPPED);
1951	}	2119	}
1952		2120
1953	sub reset_at {	2121	sub reset_at {
1954	my ($self) = @_;	2122	my ($self) = @_;
1955		2123
…		…
1987	if $uniq;	2155	if $uniq;
1988	}	2156	}
1989		2157
1990	delete $cf::MAP{$self->path};	2158	delete $cf::MAP{$self->path};
1991		2159
		2160	$self->deactivate;
		2161	$_->clear_links_to ($self) for values %cf::MAP;
1992	$self->clear;	2162	$self->clear;
1993
1994	$_->clear_links_to ($self) for values %cf::MAP;
1995		2163
1996	$self->unlink_save;	2164	$self->unlink_save;
1997	$self->destroy;	2165	$self->destroy;
1998	}	2166	}
1999		2167
2000	my $nuke_counter = "aaaa";	2168	my $nuke_counter = "aaaa";
2001		2169
2002	sub nuke {	2170	sub nuke {
2003	my ($self) = @_;	2171	my ($self) = @_;
2004		2172
		2173	{
		2174	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2175
2005	delete $cf::MAP{$self->path};	2176	delete $cf::MAP{$self->path};
2006		2177
2007	$self->unlink_save;	2178	$self->unlink_save;
2008		2179
2009	bless $self, "cf::map";	2180	bless $self, "cf::map";
2010	delete $self->{deny_reset};	2181	delete $self->{deny_reset};
2011	$self->{deny_save} = 1;	2182	$self->{deny_save} = 1;
2012	$self->reset_timeout (1);	2183	$self->reset_timeout (1);
2013	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2184	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2014		2185
2015	$cf::MAP{$self->path} = $self;	2186	$cf::MAP{$self->path} = $self;
		2187	}
2016		2188
2017	$self->reset; # polite request, might not happen	2189	$self->reset; # polite request, might not happen
2018	}	2190	}
2019		2191
2020	=item $maps = cf::map::tmp_maps	2192	=item $maps = cf::map::tmp_maps
…		…
2096		2268
2097	sub inv_recursive {	2269	sub inv_recursive {
2098	inv_recursive_ inv $_[0]	2270	inv_recursive_ inv $_[0]
2099	}	2271	}
2100		2272
		2273	=item $ref = $ob->ref
		2274
		2275	creates and returns a persistent reference to an objetc that can be stored as a string.
		2276
		2277	=item $ob = cf::object::deref ($refstring)
		2278
		2279	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2280	even if the object actually exists. May block.
		2281
		2282	=cut
		2283
		2284	sub deref {
		2285	my ($ref) = @_;
		2286
		2287	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2288	my ($uuid, $name) = ($1, $2);
		2289	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2290	or return;
		2291	$pl->ob->uuid eq $uuid
		2292	or return;
		2293
		2294	$pl->ob
		2295	} else {
		2296	warn "$ref: cannot resolve object reference\n";
		2297	undef
		2298	}
		2299	}
		2300
2101	package cf;	2301	package cf;
2102		2302
2103	=back	2303	=back
2104		2304
2105	=head3 cf::object::player	2305	=head3 cf::object::player
…		…
2127		2327
2128	} else {	2328	} else {
2129	my $pl = $self->contr;	2329	my $pl = $self->contr;
2130		2330
2131	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2331	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2132	my $diag = $pl->{npc_dialog};	2332	my $dialog = $pl->{npc_dialog};
2133	$diag->{pl}->ext_reply (	2333	$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		2334
2140	} else {	2335	} else {
2141	$msg = $npc->name . " says: $msg" if $npc;	2336	$msg = $npc->name . " says: $msg" if $npc;
2142	$self->message ($msg, $flags);	2337	$self->message ($msg, $flags);
2143	}	2338	}
2144	}	2339	}
		2340	}
		2341
		2342	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2343
		2344	=cut
		2345
		2346	sub cf::object::send_msg {
		2347	my $pl = shift->contr
		2348	or return;
		2349	$pl->send_msg (@_);
2145	}	2350	}
2146		2351
2147	=item $player_object->may ("access")	2352	=item $player_object->may ("access")
2148		2353
2149	Returns wether the given player is authorized to access resource "access"	2354	Returns wether the given player is authorized to access resource "access"
…		…
2228	# use -1 or undef as default coordinates, not 0, 0	2433	# use -1 or undef as default coordinates, not 0, 0
2229	($x, $y) = ($map->enter_x, $map->enter_y)	2434	($x, $y) = ($map->enter_x, $map->enter_y)
2230	if $x <=0 && $y <= 0;	2435	if $x <=0 && $y <= 0;
2231		2436
2232	$map->load;	2437	$map->load;
2233	$map->load_diag;	2438	$map->load_neighbours;
2234		2439
2235	return unless $self->contr->active;	2440	return unless $self->contr->active;
2236	$self->activate_recursive;	2441	$self->activate_recursive;
2237		2442
2238	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2443	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2239	$self->enter_map ($map, $x, $y);	2444	$self->enter_map ($map, $x, $y);
2240	}	2445	}
2241		2446
2242	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2447	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2243		2448
2244	Moves the player to the given map-path and coordinates by first freezing	2449	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	2450	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	2451	that has to return the map if sucecssful, and then unfreezes the player on
2247	the new (success) or old (failed) map position.	2452	the new (success) or old (failed) map position. In either case, $done will
		2453	be called at the end of this process.
2248		2454
2249	=cut	2455	=cut
2250		2456
2251	our $GOTOGEN;	2457	our $GOTOGEN;
2252		2458
2253	sub cf::object::player::goto {	2459	sub cf::object::player::goto {
2254	my ($self, $path, $x, $y, $check) = @_;	2460	my ($self, $path, $x, $y, $check, $done) = @_;
2255		2461
2256	# do generation counting so two concurrent goto's will be executed in-order	2462	# do generation counting so two concurrent goto's will be executed in-order
2257	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2463	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2258		2464
2259	$self->enter_link;	2465	$self->enter_link;
2260		2466
2261	(async {	2467	(async {
		2468	$Coro::current->{desc} = "player::goto $path $x $y";
		2469
		2470	# *tag paths override both path and x|y
		2471	if ($path =~ /^\*(.*)$/) {
		2472	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2473	my $ob = $obs[rand @obs];
		2474
		2475	# see if we actually can go there
		2476	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2477	$ob = $obs[rand @obs];
		2478	} else {
		2479	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2480	}
		2481	# else put us there anyways for now #d#
		2482
		2483	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2484	} else {
		2485	($path, $x, $y) = (undef, undef, undef);
		2486	}
		2487	}
		2488
2262	my $map = eval {	2489	my $map = eval {
2263	my $map = cf::map::find $path;	2490	my $map = defined $path ? cf::map::find $path : undef;
2264		2491
2265	if ($map) {	2492	if ($map) {
2266	$map = $map->customise_for ($self);	2493	$map = $map->customise_for ($self);
2267	$map = $check->($map) if $check && $map;	2494	$map = $check->($map) if $check && $map;
2268	} else {	2495	} else {
2269	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2496	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2270	}	2497	}
2271		2498
2272	$map	2499	$map
2273	};	2500	};
2274		2501
…		…
2279		2506
2280	if ($gen == $self->{_goto_generation}) {	2507	if ($gen == $self->{_goto_generation}) {
2281	delete $self->{_goto_generation};	2508	delete $self->{_goto_generation};
2282	$self->leave_link ($map, $x, $y);	2509	$self->leave_link ($map, $x, $y);
2283	}	2510	}
		2511
		2512	$done->() if $done;
2284	})->prio (1);	2513	})->prio (1);
2285	}	2514	}
2286		2515
2287	=item $player_object->enter_exit ($exit_object)	2516	=item $player_object->enter_exit ($exit_object)
2288		2517
…		…
2357	my $hp = $exit->stats->hp;	2586	my $hp = $exit->stats->hp;
2358	my $sp = $exit->stats->sp;	2587	my $sp = $exit->stats->sp;
2359		2588
2360	$self->enter_link;	2589	$self->enter_link;
2361		2590
		2591	# if exit is damned, update players death & WoR home-position
		2592	$self->contr->savebed ($slaying, $hp, $sp)
		2593	if $exit->flag (FLAG_DAMNED);
		2594
2362	(async {	2595	(async {
		2596	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2597
2363	$self->deactivate_recursive; # just to be sure	2598	$self->deactivate_recursive; # just to be sure
2364	unless (eval {	2599	unless (eval {
2365	$self->goto ($slaying, $hp, $sp);	2600	$self->goto ($slaying, $hp, $sp);
2366		2601
2367	1;	2602	1;
…		…
2393		2628
2394	utf8::encode $text;	2629	utf8::encode $text;
2395	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2630	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2396	}	2631	}
2397		2632
2398	=item $client->send_msg ($color, $type, $msg, [extra...])	2633	=item $client->send_msg ($channel, $msg, $color, [extra...])
2399		2634
2400	Send a drawinfo or msg packet to the client, formatting the msg for the	2635	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	2636	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	2637	the message, with C<log> being the default. If C<$color> is negative, suppress
2403	the message unless the client supports the msg packet.	2638	the message unless the client supports the msg packet.
2404		2639
2405	=cut	2640	=cut
2406		2641
		2642	our %CHANNEL = (
		2643	"c/identify" => {
		2644	id => "infobox",
		2645	title => "Identify",
		2646	reply => undef,
		2647	tooltip => "Items recently identified",
		2648	},
		2649	"c/examine" => {
		2650	id => "infobox",
		2651	title => "Examine",
		2652	reply => undef,
		2653	tooltip => "Signs and other items you examined",
		2654	},
		2655	"c/lookat" => {
		2656	id => "infobox",
		2657	title => "Look",
		2658	reply => undef,
		2659	tooltip => "What you saw there",
		2660	},
		2661	);
		2662
2407	sub cf::client::send_msg {	2663	sub cf::client::send_msg {
2408	my ($self, $color, $type, $msg, @extra) = @_;	2664	my ($self, $channel, $msg, $color, @extra) = @_;
2409		2665
2410	$msg = $self->pl->expand_cfpod ($msg);	2666	$msg = $self->pl->expand_cfpod ($msg);
2411		2667
		2668	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2669
		2670	# check predefined channels, for the benefit of C
		2671	if ($CHANNEL{$channel}) {
		2672	$channel = $CHANNEL{$channel};
		2673
		2674	$self->ext_msg (channel_info => $channel)
		2675	if $self->can_msg;
		2676
		2677	$channel = $channel->{id};
		2678
		2679	} elsif (ref $channel) {
		2680	# send meta info to client, if not yet sent
		2681	unless (exists $self->{channel}{$channel->{id}}) {
		2682	$self->{channel}{$channel->{id}} = $channel;
		2683	$self->ext_msg (channel_info => $channel)
		2684	if $self->can_msg;
		2685	}
		2686
		2687	$channel = $channel->{id};
		2688	}
		2689
		2690	return unless @extra || length $msg;
		2691
2412	if ($self->can_msg) {	2692	if ($self->can_msg) {
		2693	# default colour, mask it out
		2694	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2695	if $color & cf::NDI_DEF;
		2696
2413	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));	2697	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2698	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2414	} else {	2699	} 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) {	2700	if ($color >= 0) {
		2701	# replace some tags by gcfclient-compatible ones
		2702	for ($msg) {
		2703	1 while
		2704	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2705	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2706	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2707	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2708	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2709	}
		2710
		2711	$color &= cf::NDI_COLOR_MASK;
		2712
		2713	utf8::encode $msg;
		2714
2426	if (0 && $msg =~ /\[/) {	2715	if (0 && $msg =~ /\[/) {
		2716	# COMMAND/INFO
2427	$self->send_packet ("drawextinfo $color 4 0 $msg")	2717	$self->send_packet ("drawextinfo $color 10 8 $msg")
2428	} else {	2718	} else {
2429	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	2719	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2430	$self->send_packet ("drawinfo $color $msg")	2720	$self->send_packet ("drawinfo $color $msg")
2431	}	2721	}
2432	}	2722	}
2433	}	2723	}
2434	}	2724	}
2435		2725
2436	=item $client->ext_event ($type, %msg)	2726	=item $client->ext_msg ($type, @msg)
2437		2727
2438	Sends an ext event to the client.	2728	Sends an ext event to the client.
2439		2729
2440	=cut	2730	=cut
2441		2731
2442	sub cf::client::ext_event($$%) {	2732	sub cf::client::ext_msg($$@) {
2443	my ($self, $type, %msg) = @_;	2733	my ($self, $type, @msg) = @_;
2444		2734
		2735	if ($self->extcmd == 2) {
		2736	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2737	} elsif ($self->extcmd == 1) { # TODO: remove
2445	$msg{msgtype} = "event_$type";	2738	push @msg, msgtype => "event_$type";
2446	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2739	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2740	}
		2741	}
		2742
		2743	=item $client->ext_reply ($msgid, @msg)
		2744
		2745	Sends an ext reply to the client.
		2746
		2747	=cut
		2748
		2749	sub cf::client::ext_reply($$@) {
		2750	my ($self, $id, @msg) = @_;
		2751
		2752	if ($self->extcmd == 2) {
		2753	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2754	} elsif ($self->extcmd == 1) {
		2755	#TODO: version 1, remove
		2756	unshift @msg, msgtype => "reply", msgid => $id;
		2757	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2758	}
2447	}	2759	}
2448		2760
2449	=item $success = $client->query ($flags, "text", \&cb)	2761	=item $success = $client->query ($flags, "text", \&cb)
2450		2762
2451	Queues a query to the client, calling the given callback with	2763	Queues a query to the client, calling the given callback with
…		…
2506	my ($ns, $buf) = @_;	2818	my ($ns, $buf) = @_;
2507		2819
2508	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2820	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2509		2821
2510	if (ref $msg) {	2822	if (ref $msg) {
		2823	my ($type, $reply, @payload) =
		2824	"ARRAY" eq ref $msg
		2825	? @$msg
		2826	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2827
		2828	my @reply;
		2829
2511	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2830	if (my $cb = $EXTICMD{$type}) {
2512	if (my %reply = $cb->($ns, $msg)) {	2831	@reply = $cb->($ns, @payload);
2513	$reply{msgid} = $msg->{msgid};
2514	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2515	}
2516	}	2832	}
		2833
		2834	$ns->ext_reply ($reply, @reply)
		2835	if $reply;
		2836
2517	} else {	2837	} else {
2518	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2838	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2519	}	2839	}
2520		2840
2521	cf::override;	2841	cf::override;
…		…
2568	our $safe = new Safe "safe";	2888	our $safe = new Safe "safe";
2569	our $safe_hole = new Safe::Hole;	2889	our $safe_hole = new Safe::Hole;
2570		2890
2571	$SIG{FPE} = 'IGNORE';	2891	$SIG{FPE} = 'IGNORE';
2572		2892
2573	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2893	$safe->permit_only (Opcode::opset qw(
		2894	:base_core :base_mem :base_orig :base_math
		2895	grepstart grepwhile mapstart mapwhile
		2896	sort time
		2897	));
2574		2898
2575	# here we export the classes and methods available to script code	2899	# here we export the classes and methods available to script code
2576		2900
2577	=pod	2901	=pod
2578		2902
2579	The following functions and methods are available within a safe environment:	2903	The following functions and methods are available within a safe environment:
2580		2904
2581	cf::object contr pay_amount pay_player map	2905	cf::object
		2906	contr pay_amount pay_player map x y force_find force_add destroy
		2907	insert remove name archname title slaying race decrease_ob_nr
		2908
2582	cf::object::player player	2909	cf::object::player
2583	cf::player peaceful	2910	player
2584	cf::map trigger	2911
		2912	cf::player
		2913	peaceful
		2914
		2915	cf::map
		2916	trigger
2585		2917
2586	=cut	2918	=cut
2587		2919
2588	for (	2920	for (
2589	["cf::object" => qw(contr pay_amount pay_player map)],	2921	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2922	insert remove inv name archname title slaying race
		2923	decrease_ob_nr destroy)],
2590	["cf::object::player" => qw(player)],	2924	["cf::object::player" => qw(player)],
2591	["cf::player" => qw(peaceful)],	2925	["cf::player" => qw(peaceful)],
2592	["cf::map" => qw(trigger)],	2926	["cf::map" => qw(trigger)],
2593	) {	2927	) {
2594	no strict 'refs';	2928	no strict 'refs';
…		…
2670	# the server's init and main functions	3004	# the server's init and main functions
2671		3005
2672	sub load_facedata($) {	3006	sub load_facedata($) {
2673	my ($path) = @_;	3007	my ($path) = @_;
2674		3008
		3009	# HACK to clear player env face cache, we need some signal framework
		3010	# for this (global event?)
		3011	%ext::player_env::MUSIC_FACE_CACHE = ();
		3012
		3013	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3014
2675	warn "loading facedata from $path\n";	3015	warn "loading facedata from $path\n";
2676		3016
2677	my $facedata;	3017	my $facedata;
2678	0 < aio_load $path, $facedata	3018	0 < aio_load $path, $facedata
2679	or die "$path: $!";	3019	or die "$path: $!";
…		…
2681	$facedata = Coro::Storable::thaw $facedata;	3021	$facedata = Coro::Storable::thaw $facedata;
2682		3022
2683	$facedata->{version} == 2	3023	$facedata->{version} == 2
2684	or cf::cleanup "$path: version mismatch, cannot proceed.";	3024	or cf::cleanup "$path: version mismatch, cannot proceed.";
2685		3025
		3026	# patch in the exptable
		3027	$facedata->{resource}{"res/exp_table"} = {
		3028	type => FT_RSRC,
		3029	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3030	};
		3031	cf::cede_to_tick;
		3032
2686	{	3033	{
2687	my $faces = $facedata->{faceinfo};	3034	my $faces = $facedata->{faceinfo};
2688		3035
2689	while (my ($face, $info) = each %$faces) {	3036	while (my ($face, $info) = each %$faces) {
2690	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3037	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2691	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3038	cf::face::set_visibility $idx, $info->{visibility};
		3039	cf::face::set_magicmap $idx, $info->{magicmap};
2692	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3040	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2693	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3041	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2694	Coro::cede;	3042
		3043	cf::cede_to_tick;
2695	}	3044	}
2696		3045
2697	while (my ($face, $info) = each %$faces) {	3046	while (my ($face, $info) = each %$faces) {
2698	next unless $info->{smooth};	3047	next unless $info->{smooth};
2699	my $idx = cf::face::find $face	3048	my $idx = cf::face::find $face
2700	or next;	3049	or next;
2701	if (my $smooth = cf::face::find $info->{smooth}) {	3050	if (my $smooth = cf::face::find $info->{smooth}) {
		3051	cf::face::set_smooth $idx, $smooth;
2702	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3052	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2703	} else {	3053	} else {
2704	warn "smooth face '$info->{smooth}' not found for face '$face'";	3054	warn "smooth face '$info->{smooth}' not found for face '$face'";
2705	}	3055	}
2706	Coro::cede;	3056
		3057	cf::cede_to_tick;
2707	}	3058	}
2708	}	3059	}
2709		3060
2710	{	3061	{
2711	my $anims = $facedata->{animinfo};	3062	my $anims = $facedata->{animinfo};
2712		3063
2713	while (my ($anim, $info) = each %$anims) {	3064	while (my ($anim, $info) = each %$anims) {
2714	cf::anim::set $anim, $info->{frames}, $info->{facings};	3065	cf::anim::set $anim, $info->{frames}, $info->{facings};
2715	Coro::cede;	3066	cf::cede_to_tick;
2716	}	3067	}
2717		3068
2718	cf::anim::invalidate_all; # d'oh	3069	cf::anim::invalidate_all; # d'oh
2719	}	3070	}
2720		3071
		3072	{
		3073	# TODO: for gcfclient pleasure, we should give resources
		3074	# that gcfclient doesn't grok a >10000 face index.
		3075	my $res = $facedata->{resource};
		3076
		3077	my $soundconf = delete $res->{"res/sound.conf"};
		3078
		3079	while (my ($name, $info) = each %$res) {
		3080	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3081	my $data;
		3082
		3083	if ($info->{type} & 1) {
		3084	# prepend meta info
		3085
		3086	my $meta = $enc->encode ({
		3087	name => $name,
		3088	%{ $info->{meta} || {} },
		3089	});
		3090
		3091	$data = pack "(w/a*)*", $meta, $info->{data};
		3092	} else {
		3093	$data = $info->{data};
		3094	}
		3095
		3096	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3097	cf::face::set_type $idx, $info->{type};
		3098
		3099	cf::cede_to_tick;
		3100	}
		3101
		3102	if ($soundconf) {
		3103	$soundconf = $enc->decode (delete $soundconf->{data});
		3104
		3105	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3106	my $sound = $soundconf->{compat}[$_]
		3107	or next;
		3108
		3109	my $face = cf::face::find "sound/$sound->[1]";
		3110	cf::sound::set $sound->[0] => $face;
		3111	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3112	}
		3113
		3114	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3115	my $face = cf::face::find "sound/$v";
		3116	cf::sound::set $k => $face;
		3117	}
		3118	}
		3119	}
		3120
2721	1	3121	1
2722	}	3122	}
2723		3123
		3124	register_exticmd fx_want => sub {
		3125	my ($ns, $want) = @_;
		3126
		3127	while (my ($k, $v) = each %$want) {
		3128	$ns->fx_want ($k, $v);
		3129	}
		3130	};
		3131
2724	sub reload_regions {	3132	sub reload_regions {
		3133	# HACK to clear player env face cache, we need some signal framework
		3134	# for this (global event?)
		3135	%ext::player_env::MUSIC_FACE_CACHE = ();
		3136
2725	load_resource_file "$MAPDIR/regions"	3137	load_resource_file "$MAPDIR/regions"
2726	or die "unable to load regions file\n";	3138	or die "unable to load regions file\n";
		3139
		3140	for (cf::region::list) {
		3141	$_->{match} = qr/$_->{match}/
		3142	if exists $_->{match};
		3143	}
2727	}	3144	}
2728		3145
2729	sub reload_facedata {	3146	sub reload_facedata {
2730	load_facedata "$DATADIR/facedata"	3147	load_facedata "$DATADIR/facedata"
2731	or die "unable to load facedata\n";	3148	or die "unable to load facedata\n";
…		…
2760		3177
2761	sub init {	3178	sub init {
2762	reload_resources;	3179	reload_resources;
2763	}	3180	}
2764		3181
2765	sub cfg_load {	3182	sub reload_config {
2766	open my $fh, "<:utf8", "$CONFDIR/config"	3183	open my $fh, "<:utf8", "$CONFDIR/config"
2767	or return;	3184	or return;
2768		3185
2769	local $/;	3186	local $/;
2770	*CFG = YAML::Syck::Load <$fh>;	3187	*CFG = YAML::Syck::Load <$fh>;
…		…
2786	sub main {	3203	sub main {
2787	# we must not ever block the main coroutine	3204	# we must not ever block the main coroutine
2788	local $Coro::idle = sub {	3205	local $Coro::idle = sub {
2789	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3206	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2790	(async {	3207	(async {
		3208	$Coro::current->{desc} = "IDLE BUG HANDLER";
2791	Event::one_event;	3209	Event::one_event;
2792	})->prio (Coro::PRIO_MAX);	3210	})->prio (Coro::PRIO_MAX);
2793	};	3211	};
2794		3212
2795	cfg_load;	3213	reload_config;
2796	db_init;	3214	db_init;
2797	load_extensions;	3215	load_extensions;
2798		3216
2799	$TICK_WATCHER->start;	3217	$TICK_WATCHER->start;
2800	Event::loop;	3218	Event::loop;
…		…
2867	# and maps saved/destroyed asynchronously.	3285	# and maps saved/destroyed asynchronously.
2868	warn "begin emergency player save\n";	3286	warn "begin emergency player save\n";
2869	for my $login (keys %cf::PLAYER) {	3287	for my $login (keys %cf::PLAYER) {
2870	my $pl = $cf::PLAYER{$login} or next;	3288	my $pl = $cf::PLAYER{$login} or next;
2871	$pl->valid or next;	3289	$pl->valid or next;
		3290	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2872	$pl->save;	3291	$pl->save;
2873	}	3292	}
2874	warn "end emergency player save\n";	3293	warn "end emergency player save\n";
2875		3294
2876	warn "begin emergency map save\n";	3295	warn "begin emergency map save\n";
…		…
2993	warn "reloading cf.pm";	3412	warn "reloading cf.pm";
2994	require cf;	3413	require cf;
2995	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3414	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2996		3415
2997	warn "loading config and database again";	3416	warn "loading config and database again";
2998	cf::cfg_load;	3417	cf::reload_config;
2999		3418
3000	warn "loading extensions";	3419	warn "loading extensions";
3001	cf::load_extensions;	3420	cf::load_extensions;
3002		3421
3003	warn "reattaching attachments to objects/players";	3422	warn "reattaching attachments to objects/players";
…		…
3039	register_command "reload" => sub {	3458	register_command "reload" => sub {
3040	my ($who, $arg) = @_;	3459	my ($who, $arg) = @_;
3041		3460
3042	if ($who->flag (FLAG_WIZ)) {	3461	if ($who->flag (FLAG_WIZ)) {
3043	$who->message ("reloading server.");	3462	$who->message ("reloading server.");
		3463	async {
		3464	$Coro::current->{desc} = "perl_reload";
3044	async { reload_perl };	3465	reload_perl;
		3466	};
3045	}	3467	}
3046	};	3468	};
3047		3469
3048	unshift @INC, $LIBDIR;	3470	unshift @INC, $LIBDIR;
3049		3471
…		…
3068	my $signal = new Coro::Signal;	3490	my $signal = new Coro::Signal;
3069	push @WAIT_FOR_TICK_BEGIN, $signal;	3491	push @WAIT_FOR_TICK_BEGIN, $signal;
3070	$signal->wait;	3492	$signal->wait;
3071	}	3493	}
3072		3494
3073	my $min = 1e6;#d#
3074	my $avg = 10;
3075	$TICK_WATCHER = Event->timer (	3495	$TICK_WATCHER = Event->timer (
3076	reentrant => 0,	3496	reentrant => 0,
3077	parked => 1,	3497	parked => 1,
3078	prio => 0,	3498	prio => 0,
3079	at => $NEXT_TICK || $TICK,	3499	at => $NEXT_TICK || $TICK,
…		…
3087		3507
3088	$NOW = $tick_start = Event::time;	3508	$NOW = $tick_start = Event::time;
3089		3509
3090	cf::server_tick; # one server iteration	3510	cf::server_tick; # one server iteration
3091		3511
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;	3512	$RUNTIME += $TICK;
3116	$NEXT_TICK += $TICK;	3513	$NEXT_TICK += $TICK;
3117		3514
3118	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3515	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3119	$NEXT_RUNTIME_WRITE = $NOW + 10;	3516	$NEXT_RUNTIME_WRITE = $NOW + 10;
3120	Coro::async_pool {	3517	Coro::async_pool {
		3518	$Coro::current->{desc} = "runtime saver";
3121	write_runtime	3519	write_runtime
3122	or warn "ERROR: unable to write runtime file: $!";	3520	or warn "ERROR: unable to write runtime file: $!";
3123	};	3521	};
3124	}	3522	}
3125		3523
3126	# my $AFTER = Event::time;
3127	# warn $AFTER - $NOW;#d#
3128
3129	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3524	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3130	$sig->send;	3525	$sig->send;
3131	}	3526	}
3132	while (my $sig = shift @WAIT_FOR_TICK) {	3527	while (my $sig = shift @WAIT_FOR_TICK) {
3133	$sig->send;	3528	$sig->send;
…		…
3143		3538
3144	$LOAD = ($NOW - $tick_start) / $TICK;	3539	$LOAD = ($NOW - $tick_start) / $TICK;
3145	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3540	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3146		3541
3147	_post_tick;	3542	_post_tick;
3148
3149
3150	},	3543	},
3151	);	3544	);
3152		3545
3153	{	3546	{
		3547	BDB::min_parallel 8;
3154	BDB::max_poll_time $TICK * 0.1;	3548	BDB::max_poll_time $TICK * 0.1;
3155	$BDB_POLL_WATCHER = Event->io (	3549	$BDB_POLL_WATCHER = Event->io (
3156	reentrant => 0,	3550	reentrant => 0,
3157	fd => BDB::poll_fileno,	3551	fd => BDB::poll_fileno,
3158	poll => 'r',	3552	poll => 'r',
3159	prio => 0,	3553	prio => 0,
3160	data => WF_AUTOCANCEL,	3554	data => WF_AUTOCANCEL,
3161	cb => \&BDB::poll_cb,	3555	cb => \&BDB::poll_cb,
3162	);	3556	);
3163	BDB::min_parallel 8;
3164		3557
3165	BDB::set_sync_prepare {	3558	BDB::set_sync_prepare {
3166	my $status;	3559	my $status;
3167	my $current = $Coro::current;	3560	my $current = $Coro::current;
3168	(	3561	(
…		…
3177	)	3570	)
3178	};	3571	};
3179		3572
3180	unless ($DB_ENV) {	3573	unless ($DB_ENV) {
3181	$DB_ENV = BDB::db_env_create;	3574	$DB_ENV = BDB::db_env_create;
		3575	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3576	| BDB::LOG_AUTOREMOVE, 1);
		3577	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3578	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3182		3579
3183	cf::sync_job {	3580	cf::sync_job {
3184	eval {	3581	eval {
3185	BDB::db_env_open	3582	BDB::db_env_open
3186	$DB_ENV,	3583	$DB_ENV,
…		…
3188	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3585	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3189	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3586	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3190	0666;	3587	0666;
3191		3588
3192	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3589	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	};	3590	};
3197		3591
3198	cf::cleanup "db_env_open(db): $@" if $@;	3592	cf::cleanup "db_env_open(db): $@" if $@;
3199	};	3593	};
3200	}	3594	}
		3595
		3596	$BDB_DEADLOCK_WATCHER = Event->timer (
		3597	after => 3,
		3598	interval => 1,
		3599	hard => 1,
		3600	prio => 0,
		3601	data => WF_AUTOCANCEL,
		3602	cb => sub {
		3603	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3604	},
		3605	);
		3606	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3607	after => 11,
		3608	interval => 60,
		3609	hard => 1,
		3610	prio => 0,
		3611	data => WF_AUTOCANCEL,
		3612	cb => sub {
		3613	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3614	},
		3615	);
		3616	$BDB_TRICKLE_WATCHER = Event->timer (
		3617	after => 5,
		3618	interval => 10,
		3619	hard => 1,
		3620	prio => 0,
		3621	data => WF_AUTOCANCEL,
		3622	cb => sub {
		3623	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3624	},
		3625	);
3201	}	3626	}
3202		3627
3203	{	3628	{
3204	IO::AIO::min_parallel 8;	3629	IO::AIO::min_parallel 8;
3205		3630
…		…
3208	$AIO_POLL_WATCHER = Event->io (	3633	$AIO_POLL_WATCHER = Event->io (
3209	reentrant => 0,	3634	reentrant => 0,
3210	data => WF_AUTOCANCEL,	3635	data => WF_AUTOCANCEL,
3211	fd => IO::AIO::poll_fileno,	3636	fd => IO::AIO::poll_fileno,
3212	poll => 'r',	3637	poll => 'r',
3213	prio => 6,	3638	prio => 0,
3214	cb => \&IO::AIO::poll_cb,	3639	cb => \&IO::AIO::poll_cb,
3215	);	3640	);
3216	}	3641	}
3217		3642
3218	my $_log_backtrace;	3643	my $_log_backtrace;
…		…
3224		3649
3225	# limit the # of concurrent backtraces	3650	# limit the # of concurrent backtraces
3226	if ($_log_backtrace < 2) {	3651	if ($_log_backtrace < 2) {
3227	++$_log_backtrace;	3652	++$_log_backtrace;
3228	async {	3653	async {
		3654	$Coro::current->{desc} = "abt $msg";
		3655
3229	my @bt = fork_call {	3656	my @bt = fork_call {
3230	@addr = map { sprintf "%x", $_ } @addr;	3657	@addr = map { sprintf "%x", $_ } @addr;
3231	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3658	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3232	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	3659	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3233	or die "addr2line: $!";	3660	or die "addr2line: $!";

Diff Legend

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