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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.291 by root, Tue Jul 3 00:54:44 2007 UTC vs.
Revision 1.381 by root, Mon Oct 8 18:19:39 2007 UTC

…		…
10	use Event;	10	use Event;
11	use Opcode;	11	use Opcode;
12	use Safe;	12	use Safe;
13	use Safe::Hole;	13	use Safe::Hole;
14		14
15	use Coro 3.61 ();	15	use Coro 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 \| logBacktrace, 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	local $Storable::canonical = 1;
		977	my $fob1 = Storable::freeze $ob1;
		978	my $fob2 = Storable::freeze $ob2;
		979
		980	$fob1 eq $fob2
		981	}
898		982
899	sub reattach {	983	sub reattach {
900	# basically do the same as instantiate, without calling instantiate	984	# basically do the same as instantiate, without calling instantiate
901	my ($obj) = @_;	985	my ($obj) = @_;
902		986
…		…
949	sub object_freezer_save {	1033	sub object_freezer_save {
950	my ($filename, $rdata, $objs) = @_;	1034	my ($filename, $rdata, $objs) = @_;
951		1035
952	sync_job {	1036	sync_job {
953	if (length $$rdata) {	1037	if (length $$rdata) {
		1038	utf8::decode (my $decname = $filename);
954	warn sprintf "saving %s (%d,%d)\n",	1039	warn sprintf "saving %s (%d,%d)\n",
955	$filename, length $$rdata, scalar @$objs;	1040	$decname, length $$rdata, scalar @$objs;
956		1041
957	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1042	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
958	chmod SAVE_MODE, $fh;	1043	chmod SAVE_MODE, $fh;
959	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1044	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960	aio_fsync $fh if $cf::USE_FSYNC;	1045	aio_fsync $fh if $cf::USE_FSYNC;
961	close $fh;	1046	close $fh;
962		1047
963	if (@$objs) {	1048	if (@$objs) {
964	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {	1049	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {
965	chmod SAVE_MODE, $fh;	1050	chmod SAVE_MODE, $fh;
966	my $data = Storable::nfreeze { version => 1, objs => $objs };	1051	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
967	aio_write $fh, 0, (length $data), $data, 0;	1052	aio_write $fh, 0, (length $data), $data, 0;
968	aio_fsync $fh if $cf::USE_FSYNC;	1053	aio_fsync $fh if $cf::USE_FSYNC;
969	close $fh;	1054	close $fh;
970	aio_rename "$filename.pst~", "$filename.pst";	1055	aio_rename "$filename.pst~", "$filename.pst";
971	}	1056	}
…		…
979	}	1064	}
980	} else {	1065	} else {
981	aio_unlink $filename;	1066	aio_unlink $filename;
982	aio_unlink "$filename.pst";	1067	aio_unlink "$filename.pst";
983	}	1068	}
984	}	1069	};
985	}	1070	}
986		1071
987	sub object_freezer_as_string {	1072	sub object_freezer_as_string {
988	my ($rdata, $objs) = @_;	1073	my ($rdata, $objs) = @_;
989		1074
…		…
1001	or return;	1086	or return;
1002		1087
1003	unless (aio_stat "$filename.pst") {	1088	unless (aio_stat "$filename.pst") {
1004	(aio_load "$filename.pst", $av) >= 0	1089	(aio_load "$filename.pst", $av) >= 0
1005	or return;	1090	or return;
1006	$av = eval { (Storable::thaw $av)->{objs} };
1007	}
1008		1091
		1092	my $st = eval { Coro::Storable::thaw $av }
		1093	\|\| eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
		1094	$av = $st->{objs};
		1095	}
		1096
		1097	utf8::decode (my $decname = $filename);
1009	warn sprintf "loading %s (%d)\n",	1098	warn sprintf "loading %s (%d,%d)\n",
1010	$filename, length $data, scalar @{$av \|\| []};	1099	$decname, length $data, scalar @{$av \|\| []};
		1100
1011	return ($data, $av);	1101	($data, $av)
1012	}	1102	}
1013		1103
1014	=head2 COMMAND CALLBACKS	1104	=head2 COMMAND CALLBACKS
1015		1105
1016	=over 4	1106	=over 4
…		…
1089	my ($pl, $buf) = @_;	1179	my ($pl, $buf) = @_;
1090		1180
1091	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1181	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092		1182
1093	if (ref $msg) {	1183	if (ref $msg) {
		1184	my ($type, $reply, @payload) =
		1185	"ARRAY" eq ref $msg
		1186	? @$msg
		1187	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1188
		1189	my @reply;
		1190
1094	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1191	if (my $cb = $EXTCMD{$type}) {
1095	if (my %reply = $cb->($pl, $msg)) {	1192	@reply = $cb->($pl, @payload);
1096	$pl->ext_reply ($msg->{msgid}, %reply);
1097	}
1098	}	1193	}
		1194
		1195	$pl->ext_reply ($reply, @reply)
		1196	if $reply;
		1197
1099	} else {	1198	} else {
1100	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1199	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101	}	1200	}
1102		1201
1103	cf::override;	1202	cf::override;
…		…
1193		1292
1194	=head3 cf::player	1293	=head3 cf::player
1195		1294
1196	=over 4	1295	=over 4
1197		1296
		1297	=item cf::player::num_playing
		1298
		1299	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1300
		1301	=cut
		1302
		1303	sub num_playing {
		1304	scalar grep
		1305	$_->ob->map
		1306	&& !$_->hidden
		1307	&& !$_->ob->flag (cf::FLAG_WIZ),
		1308	cf::player::list
		1309	}
		1310
1198	=item cf::player::find $login	1311	=item cf::player::find $login
1199		1312
1200	Returns the given player object, loading it if necessary (might block).	1313	Returns the given player object, loading it if necessary (might block).
1201		1314
1202	=cut	1315	=cut
…		…
1237	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1350	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1351	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1352	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240	aio_unlink +(playerdir $login) . "/$login.pl";	1353	aio_unlink +(playerdir $login) . "/$login.pl";
1241		1354
1242	my $pl = load_pl path $login	1355	my $f = new_from_file cf::object::thawer path $login
1243	or return;	1356	or return;
		1357
		1358	my $pl = cf::player::load_pl $f
		1359	or return;
		1360	local $cf::PLAYER_LOADING{$login} = $pl;
		1361	$f->resolve_delayed_derefs;
1244	$cf::PLAYER{$login} = $pl	1362	$cf::PLAYER{$login} = $pl
1245	}	1363	}
1246	}	1364	}
1247	}	1365	}
1248		1366
…		…
1258		1376
1259	aio_mkdir playerdir $pl, 0770;	1377	aio_mkdir playerdir $pl, 0770;
1260	$pl->{last_save} = $cf::RUNTIME;	1378	$pl->{last_save} = $cf::RUNTIME;
1261		1379
1262	$pl->save_pl ($path);	1380	$pl->save_pl ($path);
1263	Coro::cede;	1381	cf::cede_to_tick;
1264	}	1382	}
1265		1383
1266	sub new($) {	1384	sub new($) {
1267	my ($login) = @_;	1385	my ($login) = @_;
1268		1386
…		…
1272	$self->{deny_save} = 1;	1390	$self->{deny_save} = 1;
1273		1391
1274	$cf::PLAYER{$login} = $self;	1392	$cf::PLAYER{$login} = $self;
1275		1393
1276	$self	1394	$self
		1395	}
		1396
		1397	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1398
		1399	=cut
		1400
		1401	sub send_msg {
		1402	my $ns = shift->ns
		1403	or return;
		1404	$ns->send_msg (@_);
1277	}	1405	}
1278		1406
1279	=item $pl->quit_character	1407	=item $pl->quit_character
1280		1408
1281	Nukes the player without looking back. If logged in, the connection will	1409	Nukes the player without looking back. If logged in, the connection will
…		…
1336	or return [];	1464	or return [];
1337		1465
1338	my @logins;	1466	my @logins;
1339		1467
1340	for my $login (@$dirs) {	1468	for my $login (@$dirs) {
		1469	my $path = path $login;
		1470
		1471	# a .pst is a dead give-away for a valid player
		1472	unless (-e "$path.pst") {
1341	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1473	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342	aio_read $fh, 0, 512, my $buf, 0 or next;	1474	aio_read $fh, 0, 512, my $buf, 0 or next;
1343	$buf !~ /^password -------------$/m or next; # official not-valid tag	1475	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1476	}
1344		1477
1345	utf8::decode $login;	1478	utf8::decode $login;
1346	push @logins, $login;	1479	push @logins, $login;
1347	}	1480	}
1348		1481
…		…
1386	sub expand_cfpod {	1519	sub expand_cfpod {
1387	((my $self), (local $_)) = @_;	1520	((my $self), (local $_)) = @_;
1388		1521
1389	# escape & and <	1522	# escape & and <
1390	s/&/&/g;	1523	s/&/&/g;
1391	s/(?<![BIUGH])</</g;	1524	s/(?<![BIUGHT])</</g;
1392		1525
1393	# this is buggy, it needs to properly take care of nested <'s	1526	# this is buggy, it needs to properly take care of nested <'s
1394		1527
1395	1 while	1528	1 while
1396	# replace B<>, I<>, U<> etc.	1529	# replace B<>, I<>, U<> etc.
1397	s/B<([^\>]*)>/<b>$1<\/b>/	1530	s/B<([^\>]*)>/<b>$1<\/b>/
1398	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1531	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1399	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1532	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1533	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1400	# replace G<male\|female> tags	1534	# replace G<male\|female> tags
1401	\|\| s{G<([^>\|])\\|([^>])>}{	1535	\|\| s{G<([^>\|])\\|([^>])>}{
1402	$self->gender ? $2 : $1	1536	$self->gender ? $2 : $1
1403	}ge	1537	}ge
1404	# replace H<hint text>	1538	# replace H<hint text>
…		…
1412		1546
1413	# create single paragraphs (very hackish)	1547	# create single paragraphs (very hackish)
1414	s/(?<=\S)\n(?=\w)/ /g;	1548	s/(?<=\S)\n(?=\w)/ /g;
1415		1549
1416	# compress some whitespace	1550	# compress some whitespace
1417	1 while s/\s\n\s\n\s*/\n/;	1551	s/\s+\n/\n/g; # ws line-ends
		1552	s/\n\n+/\n/g; # double lines
		1553	s/^\n+//; # beginning lines
		1554	s/\n+$//; # ending lines
1418		1555
1419	$_	1556	$_
1420	}	1557	}
1421		1558
1422	sub hintmode {	1559	sub hintmode {
1423	warn "hm<$_[0] $_[1]>\n";#d#
1424	$_[0]{hintmode} = $_[1] if @_ > 1;	1560	$_[0]{hintmode} = $_[1] if @_ > 1;
1425	$_[0]{hintmode}	1561	$_[0]{hintmode}
1426	}	1562	}
1427		1563
1428	=item $player->ext_reply ($msgid, %msg)	1564	=item $player->ext_reply ($msgid, @msg)
1429		1565
1430	Sends an ext reply to the player.	1566	Sends an ext reply to the player.
1431		1567
1432	=cut	1568	=cut
1433		1569
1434	sub ext_reply($$%) {	1570	sub ext_reply($$@) {
1435	my ($self, $id, %msg) = @_;	1571	my ($self, $id, @msg) = @_;
1436		1572
1437	$msg{msgid} = $id;	1573	$self->ns->ext_reply ($id, @msg)
1438	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1439	}	1574	}
1440		1575
1441	=item $player->ext_event ($type, %msg)	1576	=item $player->ext_msg ($type, @msg)
1442		1577
1443	Sends an ext event to the client.	1578	Sends an ext event to the client.
1444		1579
1445	=cut	1580	=cut
1446		1581
1447	sub ext_event($$%) {	1582	sub ext_msg($$@) {
1448	my ($self, $type, %msg) = @_;	1583	my ($self, $type, @msg) = @_;
1449		1584
1450	$self->ns->ext_event ($type, %msg);	1585	$self->ns->ext_msg ($type, @msg);
1451	}	1586	}
1452		1587
1453	=head3 cf::region	1588	=head3 cf::region
1454		1589
1455	=over 4	1590	=over 4
…		…
1468	my ($path) = @_;	1603	my ($path) = @_;
1469		1604
1470	my ($match, $specificity);	1605	my ($match, $specificity);
1471		1606
1472	for my $region (list) {	1607	for my $region (list) {
1473	if ($region->match && $path =~ $region->match) {	1608	if ($region->{match} && $path =~ $region->{match}) {
1474	($match, $specificity) = ($region, $region->specificity)	1609	($match, $specificity) = ($region, $region->specificity)
1475	if $region->specificity > $specificity;	1610	if $region->specificity > $specificity;
1476	}	1611	}
1477	}	1612	}
1478		1613
…		…
1598	$self->init; # pass $1 etc.	1733	$self->init; # pass $1 etc.
1599	return $self;	1734	return $self;
1600	}	1735	}
1601	}	1736	}
1602		1737
1603	Carp::carp "unable to resolve path '$path' (base '$base').";	1738	Carp::cluck "unable to resolve path '$path' (base '$base').";
1604	()	1739	()
1605	}	1740	}
1606		1741
1607	sub init {	1742	sub init {
1608	my ($self) = @_;	1743	my ($self) = @_;
…		…
1671		1806
1672	sub load_header_from($) {	1807	sub load_header_from($) {
1673	my ($self, $path) = @_;	1808	my ($self, $path) = @_;
1674		1809
1675	utf8::encode $path;	1810	utf8::encode $path;
1676	#aio_open $path, O_RDONLY, 0	1811	my $f = new_from_file cf::object::thawer $path
1677	# or return;
1678
1679	$self->_load_header ($path)
1680	or return;	1812	or return;
		1813
		1814	$self->_load_header ($f)
		1815	or return;
		1816
		1817	local $MAP_LOADING{$self->{path}} = $self;
		1818	$f->resolve_delayed_derefs;
1681		1819
1682	$self->{load_path} = $path;	1820	$self->{load_path} = $path;
1683		1821
1684	1	1822	1
1685	}	1823	}
…		…
1739	sub find {	1877	sub find {
1740	my ($path, $origin) = @_;	1878	my ($path, $origin) = @_;
1741		1879
1742	$path = normalise $path, $origin && $origin->path;	1880	$path = normalise $path, $origin && $origin->path;
1743		1881
		1882	cf::lock_wait "map_data:$path";#d#remove
1744	cf::lock_wait "map_find:$path";	1883	cf::lock_wait "map_find:$path";
1745		1884
1746	$cf::MAP{$path} \|\| do {	1885	$cf::MAP{$path} \|\| do {
1747	my $guard = cf::lock_acquire "map_find:$path";	1886	my $guard1 = cf::lock_acquire "map_find:$path";
		1887	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1888
1748	my $map = new_from_path cf::map $path	1889	my $map = new_from_path cf::map $path
1749	or return;	1890	or return;
1750		1891
1751	$map->{last_save} = $cf::RUNTIME;	1892	$map->{last_save} = $cf::RUNTIME;
1752		1893
…		…
1754	or return;	1895	or return;
1755		1896
1756	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1897	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1757	# doing this can freeze the server in a sync job, obviously	1898	# doing this can freeze the server in a sync job, obviously
1758	#$cf::WAIT_FOR_TICK->wait;	1899	#$cf::WAIT_FOR_TICK->wait;
		1900	undef $guard1;
		1901	undef $guard2;
1759	$map->reset;	1902	$map->reset;
1760	undef $guard;
1761	return find $path;	1903	return find $path;
1762	}	1904	}
1763		1905
1764	$cf::MAP{$path} = $map	1906	$cf::MAP{$path} = $map
1765	}	1907	}
…		…
1774	local $self->{deny_reset} = 1; # loading can take a long time	1916	local $self->{deny_reset} = 1; # loading can take a long time
1775		1917
1776	my $path = $self->{path};	1918	my $path = $self->{path};
1777		1919
1778	{	1920	{
1779	my $guard = cf::lock_acquire "map_load:$path";	1921	my $guard = cf::lock_acquire "map_data:$path";
1780		1922
		1923	return unless $self->valid;
1781	return if $self->in_memory != cf::MAP_SWAPPED;	1924	return unless $self->in_memory == cf::MAP_SWAPPED;
1782		1925
1783	$self->in_memory (cf::MAP_LOADING);	1926	$self->in_memory (cf::MAP_LOADING);
1784		1927
1785	$self->alloc;	1928	$self->alloc;
1786		1929
1787	$self->pre_load;	1930	$self->pre_load;
1788	Coro::cede;	1931	cf::cede_to_tick;
1789		1932
		1933	my $f = new_from_file cf::object::thawer $self->{load_path};
		1934	$f->skip_block;
1790	$self->_load_objects ($self->{load_path}, 1)	1935	$self->_load_objects ($f)
1791	or return;	1936	or return;
1792		1937
1793	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1938	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1794	if delete $self->{load_original};	1939	if delete $self->{load_original};
1795		1940
1796	if (my $uniq = $self->uniq_path) {	1941	if (my $uniq = $self->uniq_path) {
1797	utf8::encode $uniq;	1942	utf8::encode $uniq;
1798	if (aio_open $uniq, O_RDONLY, 0) {	1943	unless (aio_stat $uniq) {
		1944	if (my $f = new_from_file cf::object::thawer $uniq) {
1799	$self->clear_unique_items;	1945	$self->clear_unique_items;
1800	$self->_load_objects ($uniq, 0);	1946	$self->_load_objects ($f);
		1947	$f->resolve_delayed_derefs;
		1948	}
1801	}	1949	}
1802	}	1950	}
1803		1951
1804	Coro::cede;	1952	$f->resolve_delayed_derefs;
		1953
		1954	cf::cede_to_tick;
1805	# now do the right thing for maps	1955	# now do the right thing for maps
1806	$self->link_multipart_objects;	1956	$self->link_multipart_objects;
1807	$self->difficulty ($self->estimate_difficulty)	1957	$self->difficulty ($self->estimate_difficulty)
1808	unless $self->difficulty;	1958	unless $self->difficulty;
1809	Coro::cede;	1959	cf::cede_to_tick;
1810		1960
1811	unless ($self->{deny_activate}) {	1961	unless ($self->{deny_activate}) {
1812	$self->decay_objects;	1962	$self->decay_objects;
1813	$self->fix_auto_apply;	1963	$self->fix_auto_apply;
1814	$self->update_buttons;	1964	$self->update_buttons;
1815	Coro::cede;	1965	cf::cede_to_tick;
1816	$self->set_darkness_map;	1966	$self->set_darkness_map;
1817	Coro::cede;	1967	cf::cede_to_tick;
1818	$self->activate;	1968	$self->activate;
1819	}	1969	}
		1970
		1971	$self->{last_save} = $cf::RUNTIME;
		1972	$self->last_access ($cf::RUNTIME);
1820		1973
1821	$self->in_memory (cf::MAP_IN_MEMORY);	1974	$self->in_memory (cf::MAP_IN_MEMORY);
1822	}	1975	}
1823		1976
1824	$self->post_load;	1977	$self->post_load;
…		…
1835		1988
1836	$self	1989	$self
1837	}	1990	}
1838		1991
1839	# find and load all maps in the 3x3 area around a map	1992	# find and load all maps in the 3x3 area around a map
1840	sub load_diag {	1993	sub load_neighbours {
1841	my ($map) = @_;	1994	my ($map) = @_;
1842		1995
1843	my @diag; # diagonal neighbours	1996	my @neigh; # diagonal neighbours
1844		1997
1845	for (0 .. 3) {	1998	for (0 .. 3) {
1846	my $neigh = $map->tile_path ($_)	1999	my $neigh = $map->tile_path ($_)
1847	or next;	2000	or next;
1848	$neigh = find $neigh, $map	2001	$neigh = find $neigh, $map
1849	or next;	2002	or next;
1850	$neigh->load;	2003	$neigh->load;
1851		2004
		2005	push @neigh,
1852	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2006	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1853	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2007	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1854	}	2008	}
1855		2009
1856	for (@diag) {	2010	for (grep defined $_->[0], @neigh) {
		2011	my ($path, $origin) = @$_;
1857	my $neigh = find @$_	2012	my $neigh = find $path, $origin
1858	or next;	2013	or next;
1859	$neigh->load;	2014	$neigh->load;
1860	}	2015	}
1861	}	2016	}
1862		2017
…		…
1867	}	2022	}
1868		2023
1869	sub do_load_sync {	2024	sub do_load_sync {
1870	my ($map) = @_;	2025	my ($map) = @_;
1871		2026
		2027	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2028	if $Coro::current == $Coro::main;
		2029
1872	cf::sync_job { $map->load };	2030	cf::sync_job { $map->load };
1873	}	2031	}
1874		2032
1875	our %MAP_PREFETCH;	2033	our %MAP_PREFETCH;
1876	our $MAP_PREFETCHER = undef;	2034	our $MAP_PREFETCHER = undef;
1877		2035
1878	sub find_async {	2036	sub find_async {
1879	my ($path, $origin) = @_;	2037	my ($path, $origin, $load) = @_;
1880		2038
1881	$path = normalise $path, $origin && $origin->{path};	2039	$path = normalise $path, $origin && $origin->{path};
1882		2040
1883	if (my $map = $cf::MAP{$path}) {	2041	if (my $map = $cf::MAP{$path}) {
1884	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2042	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1885	}	2043	}
1886		2044
1887	undef $MAP_PREFETCH{$path};	2045	$MAP_PREFETCH{$path} \|= $load;
		2046
1888	$MAP_PREFETCHER \|\|= cf::async {	2047	$MAP_PREFETCHER \|\|= cf::async {
		2048	$Coro::current->{desc} = "map prefetcher";
		2049
1889	while (%MAP_PREFETCH) {	2050	while (%MAP_PREFETCH) {
1890	for my $path (keys %MAP_PREFETCH) {	2051	while (my ($k, $v) = each %MAP_PREFETCH) {
1891	my $map = find $path	2052	if (my $map = find $k) {
1892	or next;
1893	$map->load;	2053	$map->load if $v;
		2054	}
1894		2055
1895	delete $MAP_PREFETCH{$path};	2056	delete $MAP_PREFETCH{$k};
1896	}	2057	}
1897	}	2058	}
1898	undef $MAP_PREFETCHER;	2059	undef $MAP_PREFETCHER;
1899	};	2060	};
1900	$MAP_PREFETCHER->prio (6);	2061	$MAP_PREFETCHER->prio (6);
…		…
1903	}	2064	}
1904		2065
1905	sub save {	2066	sub save {
1906	my ($self) = @_;	2067	my ($self) = @_;
1907		2068
1908	my $lock = cf::lock_acquire "map_data:" . $self->path;	2069	my $lock = cf::lock_acquire "map_data:$self->{path}";
1909		2070
1910	$self->{last_save} = $cf::RUNTIME;	2071	$self->{last_save} = $cf::RUNTIME;
1911		2072
1912	return unless $self->dirty;	2073	return unless $self->dirty;
1913		2074
…		…
1919	return if $self->{deny_save};	2080	return if $self->{deny_save};
1920		2081
1921	local $self->{last_access} = $self->last_access;#d#	2082	local $self->{last_access} = $self->last_access;#d#
1922		2083
1923	cf::async {	2084	cf::async {
		2085	$Coro::current->{desc} = "map player save";
1924	$_->contr->save for $self->players;	2086	$_->contr->save for $self->players;
1925	};	2087	};
1926		2088
1927	if ($uniq) {	2089	if ($uniq) {
1928	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	2090	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
…		…
1936	my ($self) = @_;	2098	my ($self) = @_;
1937		2099
1938	# save first because save cedes	2100	# save first because save cedes
1939	$self->save;	2101	$self->save;
1940		2102
1941	my $lock = cf::lock_acquire "map_data:" . $self->path;	2103	my $lock = cf::lock_acquire "map_data:$self->{path}";
1942		2104
1943	return if $self->players;	2105	return if $self->players;
1944	return if $self->in_memory != cf::MAP_IN_MEMORY;	2106	return if $self->in_memory != cf::MAP_IN_MEMORY;
1945	return if $self->{deny_save};	2107	return if $self->{deny_save};
1946		2108
		2109	$self->in_memory (cf::MAP_SWAPPED);
		2110
		2111	$self->deactivate;
		2112	$_->clear_links_to ($self) for values %cf::MAP;
1947	$self->clear;	2113	$self->clear;
1948	$self->in_memory (cf::MAP_SWAPPED);
1949	}	2114	}
1950		2115
1951	sub reset_at {	2116	sub reset_at {
1952	my ($self) = @_;	2117	my ($self) = @_;
1953		2118
…		…
1985	if $uniq;	2150	if $uniq;
1986	}	2151	}
1987		2152
1988	delete $cf::MAP{$self->path};	2153	delete $cf::MAP{$self->path};
1989		2154
		2155	$self->deactivate;
		2156	$_->clear_links_to ($self) for values %cf::MAP;
1990	$self->clear;	2157	$self->clear;
1991
1992	$_->clear_links_to ($self) for values %cf::MAP;
1993		2158
1994	$self->unlink_save;	2159	$self->unlink_save;
1995	$self->destroy;	2160	$self->destroy;
1996	}	2161	}
1997		2162
1998	my $nuke_counter = "aaaa";	2163	my $nuke_counter = "aaaa";
1999		2164
2000	sub nuke {	2165	sub nuke {
2001	my ($self) = @_;	2166	my ($self) = @_;
2002		2167
		2168	{
		2169	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2170
2003	delete $cf::MAP{$self->path};	2171	delete $cf::MAP{$self->path};
2004		2172
2005	$self->unlink_save;	2173	$self->unlink_save;
2006		2174
2007	bless $self, "cf::map";	2175	bless $self, "cf::map";
2008	delete $self->{deny_reset};	2176	delete $self->{deny_reset};
2009	$self->{deny_save} = 1;	2177	$self->{deny_save} = 1;
2010	$self->reset_timeout (1);	2178	$self->reset_timeout (1);
2011	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2179	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2012		2180
2013	$cf::MAP{$self->path} = $self;	2181	$cf::MAP{$self->path} = $self;
		2182	}
2014		2183
2015	$self->reset; # polite request, might not happen	2184	$self->reset; # polite request, might not happen
2016	}	2185	}
2017		2186
2018	=item $maps = cf::map::tmp_maps	2187	=item $maps = cf::map::tmp_maps
…		…
2094		2263
2095	sub inv_recursive {	2264	sub inv_recursive {
2096	inv_recursive_ inv $_[0]	2265	inv_recursive_ inv $_[0]
2097	}	2266	}
2098		2267
		2268	=item $ref = $ob->ref
		2269
		2270	creates and returns a persistent reference to an objetc that can be stored as a string.
		2271
		2272	=item $ob = cf::object::deref ($refstring)
		2273
		2274	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2275	even if the object actually exists. May block.
		2276
		2277	=cut
		2278
		2279	sub deref {
		2280	my ($ref) = @_;
		2281
		2282	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2283	my ($uuid, $name) = ($1, $2);
		2284	my $pl = $cf::PLAYER_LOADING{$name} \|\| cf::player::find $name
		2285	or return;
		2286	$pl->ob->uuid eq $uuid
		2287	or return;
		2288
		2289	$pl->ob
		2290	} else {
		2291	warn "$ref: cannot resolve object reference\n";
		2292	undef
		2293	}
		2294	}
		2295
2099	package cf;	2296	package cf;
2100		2297
2101	=back	2298	=back
2102		2299
2103	=head3 cf::object::player	2300	=head3 cf::object::player
…		…
2125		2322
2126	} else {	2323	} else {
2127	my $pl = $self->contr;	2324	my $pl = $self->contr;
2128		2325
2129	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2326	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2130	my $diag = $pl->{npc_dialog};	2327	my $dialog = $pl->{npc_dialog};
2131	$diag->{pl}->ext_reply (	2328	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2132	$diag->{id},
2133	msgtype => "reply",
2134	msg => $diag->{pl}->expand_cfpod ($msg),
2135	add_topics => []
2136	);
2137		2329
2138	} else {	2330	} else {
2139	$msg = $npc->name . " says: $msg" if $npc;	2331	$msg = $npc->name . " says: $msg" if $npc;
2140	$self->message ($msg, $flags);	2332	$self->message ($msg, $flags);
2141	}	2333	}
2142	}	2334	}
		2335	}
		2336
		2337	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2338
		2339	=cut
		2340
		2341	sub cf::object::send_msg {
		2342	my $pl = shift->contr
		2343	or return;
		2344	$pl->send_msg (@_);
2143	}	2345	}
2144		2346
2145	=item $player_object->may ("access")	2347	=item $player_object->may ("access")
2146		2348
2147	Returns wether the given player is authorized to access resource "access"	2349	Returns wether the given player is authorized to access resource "access"
…		…
2226	# use -1 or undef as default coordinates, not 0, 0	2428	# use -1 or undef as default coordinates, not 0, 0
2227	($x, $y) = ($map->enter_x, $map->enter_y)	2429	($x, $y) = ($map->enter_x, $map->enter_y)
2228	if $x <=0 && $y <= 0;	2430	if $x <=0 && $y <= 0;
2229		2431
2230	$map->load;	2432	$map->load;
2231	$map->load_diag;	2433	$map->load_neighbours;
2232		2434
2233	return unless $self->contr->active;	2435	return unless $self->contr->active;
2234	$self->activate_recursive;	2436	$self->activate_recursive;
2235		2437
2236	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2438	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2237	$self->enter_map ($map, $x, $y);	2439	$self->enter_map ($map, $x, $y);
2238	}	2440	}
2239		2441
2240	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2442	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2241		2443
2242	Moves the player to the given map-path and coordinates by first freezing	2444	Moves the player to the given map-path and coordinates by first freezing
2243	her, loading and preparing them map, calling the provided $check callback	2445	her, loading and preparing them map, calling the provided $check callback
2244	that has to return the map if sucecssful, and then unfreezes the player on	2446	that has to return the map if sucecssful, and then unfreezes the player on
2245	the new (success) or old (failed) map position.	2447	the new (success) or old (failed) map position. In either case, $done will
		2448	be called at the end of this process.
2246		2449
2247	=cut	2450	=cut
2248		2451
2249	our $GOTOGEN;	2452	our $GOTOGEN;
2250		2453
2251	sub cf::object::player::goto {	2454	sub cf::object::player::goto {
2252	my ($self, $path, $x, $y, $check) = @_;	2455	my ($self, $path, $x, $y, $check, $done) = @_;
2253		2456
2254	# do generation counting so two concurrent goto's will be executed in-order	2457	# do generation counting so two concurrent goto's will be executed in-order
2255	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2458	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2256		2459
2257	$self->enter_link;	2460	$self->enter_link;
2258		2461
2259	(async {	2462	(async {
		2463	$Coro::current->{desc} = "player::goto $path $x $y";
		2464
		2465	# *tag paths override both path and x\|y
		2466	if ($path =~ /^\(.)$/) {
		2467	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2468	my $ob = $obs[rand @obs];
		2469
		2470	# see if we actually can go there
		2471	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2472	$ob = $obs[rand @obs];
		2473	} else {
		2474	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE \| cf::NDI_RED);
		2475	}
		2476	# else put us there anyways for now #d#
		2477
		2478	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2479	} else {
		2480	($path, $x, $y) = (undef, undef, undef);
		2481	}
		2482	}
		2483
2260	my $map = eval {	2484	my $map = eval {
2261	my $map = cf::map::find $path;	2485	my $map = defined $path ? cf::map::find $path : undef;
2262		2486
2263	if ($map) {	2487	if ($map) {
2264	$map = $map->customise_for ($self);	2488	$map = $map->customise_for ($self);
2265	$map = $check->($map) if $check && $map;	2489	$map = $check->($map) if $check && $map;
2266	} else {	2490	} else {
2267	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);	2491	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE \| cf::NDI_RED);
2268	}	2492	}
2269		2493
2270	$map	2494	$map
2271	};	2495	};
2272		2496
…		…
2277		2501
2278	if ($gen == $self->{_goto_generation}) {	2502	if ($gen == $self->{_goto_generation}) {
2279	delete $self->{_goto_generation};	2503	delete $self->{_goto_generation};
2280	$self->leave_link ($map, $x, $y);	2504	$self->leave_link ($map, $x, $y);
2281	}	2505	}
		2506
		2507	$done->() if $done;
2282	})->prio (1);	2508	})->prio (1);
2283	}	2509	}
2284		2510
2285	=item $player_object->enter_exit ($exit_object)	2511	=item $player_object->enter_exit ($exit_object)
2286		2512
…		…
2355	my $hp = $exit->stats->hp;	2581	my $hp = $exit->stats->hp;
2356	my $sp = $exit->stats->sp;	2582	my $sp = $exit->stats->sp;
2357		2583
2358	$self->enter_link;	2584	$self->enter_link;
2359		2585
		2586	# if exit is damned, update players death & WoR home-position
		2587	$self->contr->savebed ($slaying, $hp, $sp)
		2588	if $exit->flag (FLAG_DAMNED);
		2589
2360	(async {	2590	(async {
		2591	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2592
2361	$self->deactivate_recursive; # just to be sure	2593	$self->deactivate_recursive; # just to be sure
2362	unless (eval {	2594	unless (eval {
2363	$self->goto ($slaying, $hp, $sp);	2595	$self->goto ($slaying, $hp, $sp);
2364		2596
2365	1;	2597	1;
…		…
2391		2623
2392	utf8::encode $text;	2624	utf8::encode $text;
2393	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2625	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2394	}	2626	}
2395		2627
2396	=item $client->send_msg ($color, $type, $msg, [extra...])	2628	=item $client->send_msg ($channel, $msg, $color, [extra...])
2397		2629
2398	Send a drawinfo or msg packet to the client, formatting the msg for the	2630	Send a drawinfo or msg packet to the client, formatting the msg for the
2399	client if neccessary. C<$type> should be a string identifying the type of	2631	client if neccessary. C<$type> should be a string identifying the type of
2400	the message, with C<log> being the default. If C<$color> is negative, suppress	2632	the message, with C<log> being the default. If C<$color> is negative, suppress
2401	the message unless the client supports the msg packet.	2633	the message unless the client supports the msg packet.
2402		2634
2403	=cut	2635	=cut
2404		2636
		2637	our %CHANNEL = (
		2638	"c/identify" => {
		2639	id => "infobox",
		2640	title => "Identify",
		2641	reply => undef,
		2642	tooltip => "Items recently identified",
		2643	},
		2644	"c/examine" => {
		2645	id => "infobox",
		2646	title => "Examine",
		2647	reply => undef,
		2648	tooltip => "Signs and other items you examined",
		2649	},
		2650	"c/lookat" => {
		2651	id => "infobox",
		2652	title => "Look",
		2653	reply => undef,
		2654	tooltip => "What you saw there",
		2655	},
		2656	);
		2657
2405	sub cf::client::send_msg {	2658	sub cf::client::send_msg {
2406	my ($self, $color, $type, $msg, @extra) = @_;	2659	my ($self, $channel, $msg, $color, @extra) = @_;
2407		2660
2408	$msg = $self->pl->expand_cfpod ($msg);	2661	$msg = $self->pl->expand_cfpod ($msg);
2409		2662
		2663	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2664
		2665	# check predefined channels, for the benefit of C
		2666	if ($CHANNEL{$channel}) {
		2667	$channel = $CHANNEL{$channel};
		2668
		2669	$self->ext_msg (channel_info => $channel)
		2670	if $self->can_msg;
		2671
		2672	$channel = $channel->{id};
		2673
		2674	} elsif (ref $channel) {
		2675	# send meta info to client, if not yet sent
		2676	unless (exists $self->{channel}{$channel->{id}}) {
		2677	$self->{channel}{$channel->{id}} = $channel;
		2678	$self->ext_msg (channel_info => $channel)
		2679	if $self->can_msg;
		2680	}
		2681
		2682	$channel = $channel->{id};
		2683	}
		2684
		2685	return unless @extra \|\| length $msg;
		2686
2410	if ($self->can_msg) {	2687	if ($self->can_msg) {
		2688	# default colour, mask it out
		2689	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2690	if $color & cf::NDI_DEF;
		2691
2411	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));	2692	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2693	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2412	} else {	2694	} else {
2413	# replace some tags by gcfclient-compatible ones
2414	for ($msg) {
2415	1 while
2416	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2417	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2418	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2419	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2420	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2421	}
2422
2423	if ($color >= 0) {	2695	if ($color >= 0) {
		2696	# replace some tags by gcfclient-compatible ones
		2697	for ($msg) {
		2698	1 while
		2699	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2700	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2701	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2702	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2703	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2704	}
		2705
		2706	$color &= cf::NDI_COLOR_MASK;
		2707
		2708	utf8::encode $msg;
		2709
2424	if (0 && $msg =~ /\[/) {	2710	if (0 && $msg =~ /\[/) {
		2711	# COMMAND/INFO
2425	$self->send_packet ("drawextinfo $color 4 0 $msg")	2712	$self->send_packet ("drawextinfo $color 10 8 $msg")
2426	} else {	2713	} else {
2427	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2714	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2428	$self->send_packet ("drawinfo $color $msg")	2715	$self->send_packet ("drawinfo $color $msg")
2429	}	2716	}
2430	}	2717	}
2431	}	2718	}
2432	}	2719	}
2433		2720
2434	=item $client->ext_event ($type, %msg)	2721	=item $client->ext_msg ($type, @msg)
2435		2722
2436	Sends an ext event to the client.	2723	Sends an ext event to the client.
2437		2724
2438	=cut	2725	=cut
2439		2726
2440	sub cf::client::ext_event($$%) {	2727	sub cf::client::ext_msg($$@) {
2441	my ($self, $type, %msg) = @_;	2728	my ($self, $type, @msg) = @_;
2442		2729
		2730	if ($self->extcmd == 2) {
		2731	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2732	} elsif ($self->extcmd == 1) { # TODO: remove
2443	$msg{msgtype} = "event_$type";	2733	push @msg, msgtype => "event_$type";
2444	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2734	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2735	}
		2736	}
		2737
		2738	=item $client->ext_reply ($msgid, @msg)
		2739
		2740	Sends an ext reply to the client.
		2741
		2742	=cut
		2743
		2744	sub cf::client::ext_reply($$@) {
		2745	my ($self, $id, @msg) = @_;
		2746
		2747	if ($self->extcmd == 2) {
		2748	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2749	} elsif ($self->extcmd == 1) {
		2750	#TODO: version 1, remove
		2751	unshift @msg, msgtype => "reply", msgid => $id;
		2752	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2753	}
2445	}	2754	}
2446		2755
2447	=item $success = $client->query ($flags, "text", \&cb)	2756	=item $success = $client->query ($flags, "text", \&cb)
2448		2757
2449	Queues a query to the client, calling the given callback with	2758	Queues a query to the client, calling the given callback with
…		…
2504	my ($ns, $buf) = @_;	2813	my ($ns, $buf) = @_;
2505		2814
2506	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2815	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2507		2816
2508	if (ref $msg) {	2817	if (ref $msg) {
		2818	my ($type, $reply, @payload) =
		2819	"ARRAY" eq ref $msg
		2820	? @$msg
		2821	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2822
		2823	my @reply;
		2824
2509	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2825	if (my $cb = $EXTICMD{$type}) {
2510	if (my %reply = $cb->($ns, $msg)) {	2826	@reply = $cb->($ns, @payload);
2511	$reply{msgid} = $msg->{msgid};
2512	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2513	}
2514	}	2827	}
		2828
		2829	$ns->ext_reply ($reply, @reply)
		2830	if $reply;
		2831
2515	} else {	2832	} else {
2516	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2833	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2517	}	2834	}
2518		2835
2519	cf::override;	2836	cf::override;
…		…
2566	our $safe = new Safe "safe";	2883	our $safe = new Safe "safe";
2567	our $safe_hole = new Safe::Hole;	2884	our $safe_hole = new Safe::Hole;
2568		2885
2569	$SIG{FPE} = 'IGNORE';	2886	$SIG{FPE} = 'IGNORE';
2570		2887
2571	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2888	$safe->permit_only (Opcode::opset qw(
		2889	:base_core :base_mem :base_orig :base_math
		2890	grepstart grepwhile mapstart mapwhile
		2891	sort time
		2892	));
2572		2893
2573	# here we export the classes and methods available to script code	2894	# here we export the classes and methods available to script code
2574		2895
2575	=pod	2896	=pod
2576		2897
2577	The following functions and methods are available within a safe environment:	2898	The following functions and methods are available within a safe environment:
2578		2899
2579	cf::object contr pay_amount pay_player map	2900	cf::object
		2901	contr pay_amount pay_player map x y force_find force_add
		2902	insert remove name archname title slaying race decrease_ob_nr
		2903
2580	cf::object::player player	2904	cf::object::player
2581	cf::player peaceful	2905	player
2582	cf::map trigger	2906
		2907	cf::player
		2908	peaceful
		2909
		2910	cf::map
		2911	trigger
2583		2912
2584	=cut	2913	=cut
2585		2914
2586	for (	2915	for (
2587	["cf::object" => qw(contr pay_amount pay_player map)],	2916	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2917	insert remove inv name archname title slaying race
		2918	decrease_ob_nr)],
2588	["cf::object::player" => qw(player)],	2919	["cf::object::player" => qw(player)],
2589	["cf::player" => qw(peaceful)],	2920	["cf::player" => qw(peaceful)],
2590	["cf::map" => qw(trigger)],	2921	["cf::map" => qw(trigger)],
2591	) {	2922	) {
2592	no strict 'refs';	2923	no strict 'refs';
…		…
2668	# the server's init and main functions	2999	# the server's init and main functions
2669		3000
2670	sub load_facedata($) {	3001	sub load_facedata($) {
2671	my ($path) = @_;	3002	my ($path) = @_;
2672		3003
		3004	# HACK to clear player env face cache, we need some signal framework
		3005	# for this (global event?)
		3006	%ext::player_env::MUSIC_FACE_CACHE = ();
		3007
		3008	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3009
2673	warn "loading facedata from $path\n";	3010	warn "loading facedata from $path\n";
2674		3011
2675	my $facedata;	3012	my $facedata;
2676	0 < aio_load $path, $facedata	3013	0 < aio_load $path, $facedata
2677	or die "$path: $!";	3014	or die "$path: $!";
…		…
2679	$facedata = Coro::Storable::thaw $facedata;	3016	$facedata = Coro::Storable::thaw $facedata;
2680		3017
2681	$facedata->{version} == 2	3018	$facedata->{version} == 2
2682	or cf::cleanup "$path: version mismatch, cannot proceed.";	3019	or cf::cleanup "$path: version mismatch, cannot proceed.";
2683		3020
		3021	# patch in the exptable
		3022	$facedata->{resource}{"res/exp_table"} = {
		3023	type => FT_RSRC,
		3024	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3025	};
		3026	cf::cede_to_tick;
		3027
2684	{	3028	{
2685	my $faces = $facedata->{faceinfo};	3029	my $faces = $facedata->{faceinfo};
2686		3030
2687	while (my ($face, $info) = each %$faces) {	3031	while (my ($face, $info) = each %$faces) {
2688	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3032	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2689	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3033	cf::face::set_visibility $idx, $info->{visibility};
		3034	cf::face::set_magicmap $idx, $info->{magicmap};
2690	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3035	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2691	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3036	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2692	Coro::cede;	3037
		3038	cf::cede_to_tick;
2693	}	3039	}
2694		3040
2695	while (my ($face, $info) = each %$faces) {	3041	while (my ($face, $info) = each %$faces) {
2696	next unless $info->{smooth};	3042	next unless $info->{smooth};
2697	my $idx = cf::face::find $face	3043	my $idx = cf::face::find $face
2698	or next;	3044	or next;
2699	if (my $smooth = cf::face::find $info->{smooth}) {	3045	if (my $smooth = cf::face::find $info->{smooth}) {
		3046	cf::face::set_smooth $idx, $smooth;
2700	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3047	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2701	} else {	3048	} else {
2702	warn "smooth face '$info->{smooth}' not found for face '$face'";	3049	warn "smooth face '$info->{smooth}' not found for face '$face'";
2703	}	3050	}
2704	Coro::cede;	3051
		3052	cf::cede_to_tick;
2705	}	3053	}
2706	}	3054	}
2707		3055
2708	{	3056	{
2709	my $anims = $facedata->{animinfo};	3057	my $anims = $facedata->{animinfo};
2710		3058
2711	while (my ($anim, $info) = each %$anims) {	3059	while (my ($anim, $info) = each %$anims) {
2712	cf::anim::set $anim, $info->{frames}, $info->{facings};	3060	cf::anim::set $anim, $info->{frames}, $info->{facings};
2713	Coro::cede;	3061	cf::cede_to_tick;
2714	}	3062	}
2715		3063
2716	cf::anim::invalidate_all; # d'oh	3064	cf::anim::invalidate_all; # d'oh
2717	}	3065	}
2718		3066
		3067	{
		3068	# TODO: for gcfclient pleasure, we should give resources
		3069	# that gcfclient doesn't grok a >10000 face index.
		3070	my $res = $facedata->{resource};
		3071
		3072	my $soundconf = delete $res->{"res/sound.conf"};
		3073
		3074	while (my ($name, $info) = each %$res) {
		3075	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3076	my $data;
		3077
		3078	if ($info->{type} & 1) {
		3079	# prepend meta info
		3080
		3081	my $meta = $enc->encode ({
		3082	name => $name,
		3083	%{ $info->{meta} \|\| {} },
		3084	});
		3085
		3086	$data = pack "(w/a)", $meta, $info->{data};
		3087	} else {
		3088	$data = $info->{data};
		3089	}
		3090
		3091	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3092	cf::face::set_type $idx, $info->{type};
		3093
		3094	cf::cede_to_tick;
		3095	}
		3096
		3097	if ($soundconf) {
		3098	$soundconf = $enc->decode (delete $soundconf->{data});
		3099
		3100	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3101	my $sound = $soundconf->{compat}[$_]
		3102	or next;
		3103
		3104	my $face = cf::face::find "sound/$sound->[1]";
		3105	cf::sound::set $sound->[0] => $face;
		3106	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3107	}
		3108
		3109	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3110	my $face = cf::face::find "sound/$v";
		3111	cf::sound::set $k => $face;
		3112	}
		3113	}
		3114	}
		3115
2719	1	3116	1
2720	}	3117	}
2721		3118
		3119	register_exticmd fx_want => sub {
		3120	my ($ns, $want) = @_;
		3121
		3122	while (my ($k, $v) = each %$want) {
		3123	$ns->fx_want ($k, $v);
		3124	}
		3125	};
		3126
2722	sub reload_regions {	3127	sub reload_regions {
		3128	# HACK to clear player env face cache, we need some signal framework
		3129	# for this (global event?)
		3130	%ext::player_env::MUSIC_FACE_CACHE = ();
		3131
2723	load_resource_file "$MAPDIR/regions"	3132	load_resource_file "$MAPDIR/regions"
2724	or die "unable to load regions file\n";	3133	or die "unable to load regions file\n";
		3134
		3135	for (cf::region::list) {
		3136	$_->{match} = qr/$_->{match}/
		3137	if exists $_->{match};
		3138	}
2725	}	3139	}
2726		3140
2727	sub reload_facedata {	3141	sub reload_facedata {
2728	load_facedata "$DATADIR/facedata"	3142	load_facedata "$DATADIR/facedata"
2729	or die "unable to load facedata\n";	3143	or die "unable to load facedata\n";
…		…
2758		3172
2759	sub init {	3173	sub init {
2760	reload_resources;	3174	reload_resources;
2761	}	3175	}
2762		3176
2763	sub cfg_load {	3177	sub reload_config {
2764	open my $fh, "<:utf8", "$CONFDIR/config"	3178	open my $fh, "<:utf8", "$CONFDIR/config"
2765	or return;	3179	or return;
2766		3180
2767	local $/;	3181	local $/;
2768	*CFG = YAML::Syck::Load <$fh>;	3182	*CFG = YAML::Syck::Load <$fh>;
…		…
2784	sub main {	3198	sub main {
2785	# we must not ever block the main coroutine	3199	# we must not ever block the main coroutine
2786	local $Coro::idle = sub {	3200	local $Coro::idle = sub {
2787	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3201	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2788	(async {	3202	(async {
		3203	$Coro::current->{desc} = "IDLE BUG HANDLER";
2789	Event::one_event;	3204	Event::one_event;
2790	})->prio (Coro::PRIO_MAX);	3205	})->prio (Coro::PRIO_MAX);
2791	};	3206	};
2792		3207
2793	cfg_load;	3208	reload_config;
2794	db_init;	3209	db_init;
2795	load_extensions;	3210	load_extensions;
2796		3211
2797	$TICK_WATCHER->start;	3212	$TICK_WATCHER->start;
2798	Event::loop;	3213	Event::loop;
…		…
2865	# and maps saved/destroyed asynchronously.	3280	# and maps saved/destroyed asynchronously.
2866	warn "begin emergency player save\n";	3281	warn "begin emergency player save\n";
2867	for my $login (keys %cf::PLAYER) {	3282	for my $login (keys %cf::PLAYER) {
2868	my $pl = $cf::PLAYER{$login} or next;	3283	my $pl = $cf::PLAYER{$login} or next;
2869	$pl->valid or next;	3284	$pl->valid or next;
		3285	delete $pl->{unclean_save};
2870	$pl->save;	3286	$pl->save;
2871	}	3287	}
2872	warn "end emergency player save\n";	3288	warn "end emergency player save\n";
2873		3289
2874	warn "begin emergency map save\n";	3290	warn "begin emergency map save\n";
…		…
2991	warn "reloading cf.pm";	3407	warn "reloading cf.pm";
2992	require cf;	3408	require cf;
2993	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3409	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2994		3410
2995	warn "loading config and database again";	3411	warn "loading config and database again";
2996	cf::cfg_load;	3412	cf::reload_config;
2997		3413
2998	warn "loading extensions";	3414	warn "loading extensions";
2999	cf::load_extensions;	3415	cf::load_extensions;
3000		3416
3001	warn "reattaching attachments to objects/players";	3417	warn "reattaching attachments to objects/players";
…		…
3037	register_command "reload" => sub {	3453	register_command "reload" => sub {
3038	my ($who, $arg) = @_;	3454	my ($who, $arg) = @_;
3039		3455
3040	if ($who->flag (FLAG_WIZ)) {	3456	if ($who->flag (FLAG_WIZ)) {
3041	$who->message ("reloading server.");	3457	$who->message ("reloading server.");
		3458	async {
		3459	$Coro::current->{desc} = "perl_reload";
3042	async { reload_perl };	3460	reload_perl;
		3461	};
3043	}	3462	}
3044	};	3463	};
3045		3464
3046	unshift @INC, $LIBDIR;	3465	unshift @INC, $LIBDIR;
3047		3466
…		…
3066	my $signal = new Coro::Signal;	3485	my $signal = new Coro::Signal;
3067	push @WAIT_FOR_TICK_BEGIN, $signal;	3486	push @WAIT_FOR_TICK_BEGIN, $signal;
3068	$signal->wait;	3487	$signal->wait;
3069	}	3488	}
3070		3489
3071	my $min = 1e6;#d#
3072	my $avg = 10;
3073	$TICK_WATCHER = Event->timer (	3490	$TICK_WATCHER = Event->timer (
3074	reentrant => 0,	3491	reentrant => 0,
3075	parked => 1,	3492	parked => 1,
3076	prio => 0,	3493	prio => 0,
3077	at => $NEXT_TICK \|\| $TICK,	3494	at => $NEXT_TICK \|\| $TICK,
…		…
3085		3502
3086	$NOW = $tick_start = Event::time;	3503	$NOW = $tick_start = Event::time;
3087		3504
3088	cf::server_tick; # one server iteration	3505	cf::server_tick; # one server iteration
3089		3506
3090	0 && sync_job {#d#
3091	for(1..10) {
3092	my $t = Event::time;
3093	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3094	or die;
3095
3096	$map->width (50);
3097	$map->height (50);
3098	$map->alloc;
3099	$map->_load_objects ("/tmp/x.map", 1);
3100	my $t = Event::time - $t;
3101
3102	#next unless $t < 0.0013;#d#
3103	if ($t < $min) {
3104	$min = $t;
3105	}
3106	$avg = $avg * 0.99 + $t * 0.01;
3107	}
3108	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3109	exit 0;
3110	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3111	};
3112
3113	$RUNTIME += $TICK;	3507	$RUNTIME += $TICK;
3114	$NEXT_TICK += $TICK;	3508	$NEXT_TICK += $TICK;
3115		3509
3116	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3510	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3117	$NEXT_RUNTIME_WRITE = $NOW + 10;	3511	$NEXT_RUNTIME_WRITE = $NOW + 10;
3118	Coro::async_pool {	3512	Coro::async_pool {
		3513	$Coro::current->{desc} = "runtime saver";
3119	write_runtime	3514	write_runtime
3120	or warn "ERROR: unable to write runtime file: $!";	3515	or warn "ERROR: unable to write runtime file: $!";
3121	};	3516	};
3122	}	3517	}
3123		3518
3124	# my $AFTER = Event::time;
3125	# warn $AFTER - $NOW;#d#
3126
3127	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3519	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3128	$sig->send;	3520	$sig->send;
3129	}	3521	}
3130	while (my $sig = shift @WAIT_FOR_TICK) {	3522	while (my $sig = shift @WAIT_FOR_TICK) {
3131	$sig->send;	3523	$sig->send;
…		…
3141		3533
3142	$LOAD = ($NOW - $tick_start) / $TICK;	3534	$LOAD = ($NOW - $tick_start) / $TICK;
3143	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3535	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3144		3536
3145	_post_tick;	3537	_post_tick;
3146
3147
3148	},	3538	},
3149	);	3539	);
3150		3540
3151	{	3541	{
		3542	BDB::min_parallel 8;
3152	BDB::max_poll_time $TICK * 0.1;	3543	BDB::max_poll_time $TICK * 0.1;
3153	$BDB_POLL_WATCHER = Event->io (	3544	$BDB_POLL_WATCHER = Event->io (
3154	reentrant => 0,	3545	reentrant => 0,
3155	fd => BDB::poll_fileno,	3546	fd => BDB::poll_fileno,
3156	poll => 'r',	3547	poll => 'r',
3157	prio => 0,	3548	prio => 0,
3158	data => WF_AUTOCANCEL,	3549	data => WF_AUTOCANCEL,
3159	cb => \&BDB::poll_cb,	3550	cb => \&BDB::poll_cb,
3160	);	3551	);
3161	BDB::min_parallel 8;
3162		3552
3163	BDB::set_sync_prepare {	3553	BDB::set_sync_prepare {
3164	my $status;	3554	my $status;
3165	my $current = $Coro::current;	3555	my $current = $Coro::current;
3166	(	3556	(
…		…
3175	)	3565	)
3176	};	3566	};
3177		3567
3178	unless ($DB_ENV) {	3568	unless ($DB_ENV) {
3179	$DB_ENV = BDB::db_env_create;	3569	$DB_ENV = BDB::db_env_create;
		3570	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC
		3571	\| BDB::LOG_AUTOREMOVE, 1);
		3572	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3573	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3180		3574
3181	cf::sync_job {	3575	cf::sync_job {
3182	eval {	3576	eval {
3183	BDB::db_env_open	3577	BDB::db_env_open
3184	$DB_ENV,	3578	$DB_ENV,
…		…
3186	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN	3580	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN
3187	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3581	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3188	0666;	3582	0666;
3189		3583
3190	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3584	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3191
3192	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
3193	$DB_ENV->set_lk_detect;
3194	};	3585	};
3195		3586
3196	cf::cleanup "db_env_open(db): $@" if $@;	3587	cf::cleanup "db_env_open(db): $@" if $@;
3197	};	3588	};
3198	}	3589	}
		3590
		3591	$BDB_DEADLOCK_WATCHER = Event->timer (
		3592	after => 3,
		3593	interval => 1,
		3594	hard => 1,
		3595	prio => 0,
		3596	data => WF_AUTOCANCEL,
		3597	cb => sub {
		3598	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3599	},
		3600	);
		3601	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3602	after => 11,
		3603	interval => 60,
		3604	hard => 1,
		3605	prio => 0,
		3606	data => WF_AUTOCANCEL,
		3607	cb => sub {
		3608	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3609	},
		3610	);
		3611	$BDB_TRICKLE_WATCHER = Event->timer (
		3612	after => 5,
		3613	interval => 10,
		3614	hard => 1,
		3615	prio => 0,
		3616	data => WF_AUTOCANCEL,
		3617	cb => sub {
		3618	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3619	},
		3620	);
3199	}	3621	}
3200		3622
3201	{	3623	{
3202	IO::AIO::min_parallel 8;	3624	IO::AIO::min_parallel 8;
3203		3625
…		…
3206	$AIO_POLL_WATCHER = Event->io (	3628	$AIO_POLL_WATCHER = Event->io (
3207	reentrant => 0,	3629	reentrant => 0,
3208	data => WF_AUTOCANCEL,	3630	data => WF_AUTOCANCEL,
3209	fd => IO::AIO::poll_fileno,	3631	fd => IO::AIO::poll_fileno,
3210	poll => 'r',	3632	poll => 'r',
3211	prio => 6,	3633	prio => 0,
3212	cb => \&IO::AIO::poll_cb,	3634	cb => \&IO::AIO::poll_cb,
3213	);	3635	);
3214	}	3636	}
3215		3637
3216	my $_log_backtrace;	3638	my $_log_backtrace;
…		…
3222		3644
3223	# limit the # of concurrent backtraces	3645	# limit the # of concurrent backtraces
3224	if ($_log_backtrace < 2) {	3646	if ($_log_backtrace < 2) {
3225	++$_log_backtrace;	3647	++$_log_backtrace;
3226	async {	3648	async {
		3649	$Coro::current->{desc} = "abt $msg";
		3650
3227	my @bt = fork_call {	3651	my @bt = fork_call {
3228	@addr = map { sprintf "%x", $_ } @addr;	3652	@addr = map { sprintf "%x", $_ } @addr;
3229	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3653	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3230	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"	3654	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"
3231	or die "addr2line: $!";	3655	or die "addr2line: $!";

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.291 by root, Tue Jul 3 00:54:44 2007 UTC vs. Revision 1.381 by root, Mon Oct 8 18:19:39 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.291 by root, Tue Jul 3 00:54:44 2007 UTC vs.
Revision 1.381 by root, Mon Oct 8 18:19:39 2007 UTC