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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.301 by root, Tue Jul 10 07:01:51 2007 UTC vs.
Revision 1.386 by root, Mon Oct 15 17:50:27 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
…		…
409	Coro::Storable. May, of course, block. Note that the executed sub may	491	Coro::Storable. May, of course, block. Note that the executed sub may
410	never block itself or use any form of Event handling.	492	never block itself or use any form of Event handling.
411		493
412	=cut	494	=cut
413		495
414	sub _store_scalar {
415	open my $fh, ">", \my $buf
416	or die "fork_call: cannot open fh-to-buf in child : $!";
417	Storable::store_fd $_[0], $fh;
418	close $fh;
419
420	$buf
421	}
422
423	sub fork_call(&@) {	496	sub fork_call(&@) {
424	my ($cb, @args) = @_;	497	my ($cb, @args) = @_;
425		498
426	# 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,
427	# or die "socketpair: $!";	500	# otherwise perl prematurely frees the stuff :/
428	pipe my $fh1, my $fh2	501	# TODO: investigate and fix (likely this will be rather laborious)
429	or die "pipe: $!";
430		502
431	if (my $pid = fork) {	503	my @res = Coro::Util::fork_eval {
432	close $fh2;
433
434	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
435	warn "pst<$res>" unless $res =~ /^pst/;
436	$res = Coro::Storable::thaw $res;
437
438	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
439
440	Carp::confess $$res unless "ARRAY" eq ref $res;
441
442	return wantarray ? @$res : $res->[-1];
443	} else {
444	reset_signals;	504	reset_signals;
445	local $SIG{__WARN__};	505	&$cb
446	local $SIG{__DIE__};	506	}, @args;
447	# just in case, this hack effectively disables event
448	# in the child. cleaner and slower would be canceling all watchers,
449	# but this works for the time being.
450	local $Coro::idle;
451	$Coro::current->prio (Coro::PRIO_MAX);
452		507
453	eval {	508	wantarray ? @res : $res[-1]
454	close $fh1;
455
456	my @res = eval { $cb->(@args) };
457
458	syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
459	close $fh2;
460	};
461
462	warn $@ if $@;
463	_exit 0;
464	}
465	}	509	}
466		510
467	=item $value = cf::db_get $family => $key	511	=item $value = cf::db_get $family => $key
468		512
469	Returns a single value from the environment database.	513	Returns a single value from the environment database.
…		…
471	=item cf::db_put $family => $key => $value	515	=item cf::db_put $family => $key => $value
472		516
473	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
474	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).
475		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
476	=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	}
477		543
478	our $DB;	544	our $DB;
479		545
480	sub db_init {	546	sub db_init {
481	unless ($DB) {
482	$DB = BDB::db_create $DB_ENV;
483
484	cf::sync_job {	547	cf::sync_job {
485	eval {	548	$DB \|\|= db_table "db";
486	$DB->set_flags (BDB::CHKSUM);
487
488	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
489	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
490	cf::cleanup "db_open(db): $!" if $!;
491	};
492	cf::cleanup "db_open(db): $@" if $@;
493	};
494	}	549	};
495	}	550	}
496		551
497	sub db_get($$) {	552	sub db_get($$) {
498	my $key = "$_[0]/$_[1]";	553	my $key = "$_[0]/$_[1]";
499		554
…		…
549	if (1) {	604	if (1) {
550	$md5 =	605	$md5 =
551	join "\x00",	606	join "\x00",
552	$processversion,	607	$processversion,
553	map {	608	map {
554	Coro::cede;	609	cf::cede_to_tick;
555	($src->[$_], Digest::MD5::md5_hex $data[$_])	610	($src->[$_], Digest::MD5::md5_hex $data[$_])
556	} 0.. $#$src;	611	} 0.. $#$src;
557		612
558		613
559	my $dbmd5 = db_get cache => "$id/md5";	614	my $dbmd5 = db_get cache => "$id/md5";
…		…
865	";	920	";
866	die if $@;	921	die if $@;
867	}	922	}
868		923
869	our $override;	924	our $override;
870	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?
871		926
872	sub override {	927	sub override {
873	$override = 1;	928	$override = 1;
874	@invoke_results = ();	929	@INVOKE_RESULTS = (@_);
875	}	930	}
876		931
877	sub do_invoke {	932	sub do_invoke {
878	my $event = shift;	933	my $event = shift;
879	my $callbacks = shift;	934	my $callbacks = shift;
880		935
881	@invoke_results = ();	936	@INVOKE_RESULTS = ();
882		937
883	local $override;	938	local $override;
884		939
885	for (@$callbacks) {	940	for (@$callbacks) {
886	eval { &{$_->[1]} };	941	eval { &{$_->[1]} };
…		…
903		958
904	Generate an object-specific event with the given arguments.	959	Generate an object-specific event with the given arguments.
905		960
906	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
907	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
908	results (if you must, access C<@cf::invoke_results> directly).	963	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
909		964
910	=back	965	=back
911		966
912	=cut	967	=cut
913		968
914	#############################################################################	969	#############################################################################
915	# object support	970	# object support
		971
		972	sub _object_equal($$);
		973	sub _object_equal($$) {
		974	my ($a, $b) = @_;
		975
		976	return 0 unless (ref $a) eq (ref $b);
		977
		978	if ("HASH" eq ref $a) {
		979	my @ka = keys %$a;
		980	my @kb = keys %$b;
		981
		982	return 0 if @ka != @kb;
		983
		984	for (0 .. $#ka) {
		985	return 0 unless $ka[$_] eq $kb[$_];
		986	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		987	}
		988
		989	} elsif ("ARRAY" eq ref $a) {
		990
		991	return 0 if @$a != @$b;
		992
		993	for (0 .. $#$a) {
		994	return 0 unless _object_equal $a->[$_], $b->[$_];
		995	}
		996
		997	} elsif ($a ne $b) {
		998	return 0;
		999	}
		1000
		1001	1
		1002	}
		1003
		1004	our $SLOW_MERGES;#d#
		1005	sub _can_merge {
		1006	my ($ob1, $ob2) = @_;
		1007
		1008	++$SLOW_MERGES;#d#
		1009
		1010	# we do the slow way here
		1011	return _object_equal $ob1, $ob2
		1012	}
916		1013
917	sub reattach {	1014	sub reattach {
918	# basically do the same as instantiate, without calling instantiate	1015	# basically do the same as instantiate, without calling instantiate
919	my ($obj) = @_;	1016	my ($obj) = @_;
920		1017
…		…
967	sub object_freezer_save {	1064	sub object_freezer_save {
968	my ($filename, $rdata, $objs) = @_;	1065	my ($filename, $rdata, $objs) = @_;
969		1066
970	sync_job {	1067	sync_job {
971	if (length $$rdata) {	1068	if (length $$rdata) {
		1069	utf8::decode (my $decname = $filename);
972	warn sprintf "saving %s (%d,%d)\n",	1070	warn sprintf "saving %s (%d,%d)\n",
973	$filename, length $$rdata, scalar @$objs;	1071	$decname, length $$rdata, scalar @$objs;
974		1072
975	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1073	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
976	chmod SAVE_MODE, $fh;	1074	chmod SAVE_MODE, $fh;
977	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1075	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
978	aio_fsync $fh if $cf::USE_FSYNC;	1076	aio_fsync $fh if $cf::USE_FSYNC;
979	close $fh;	1077	close $fh;
980		1078
981	if (@$objs) {	1079	if (@$objs) {
982	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {	1080	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {
983	chmod SAVE_MODE, $fh;	1081	chmod SAVE_MODE, $fh;
984	my $data = Storable::nfreeze { version => 1, objs => $objs };	1082	my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
985	aio_write $fh, 0, (length $data), $data, 0;	1083	aio_write $fh, 0, (length $data), $data, 0;
986	aio_fsync $fh if $cf::USE_FSYNC;	1084	aio_fsync $fh if $cf::USE_FSYNC;
987	close $fh;	1085	close $fh;
988	aio_rename "$filename.pst~", "$filename.pst";	1086	aio_rename "$filename.pst~", "$filename.pst";
989	}	1087	}
…		…
997	}	1095	}
998	} else {	1096	} else {
999	aio_unlink $filename;	1097	aio_unlink $filename;
1000	aio_unlink "$filename.pst";	1098	aio_unlink "$filename.pst";
1001	}	1099	}
1002	}	1100	};
1003	}	1101	}
1004		1102
1005	sub object_freezer_as_string {	1103	sub object_freezer_as_string {
1006	my ($rdata, $objs) = @_;	1104	my ($rdata, $objs) = @_;
1007		1105
…		…
1019	or return;	1117	or return;
1020		1118
1021	unless (aio_stat "$filename.pst") {	1119	unless (aio_stat "$filename.pst") {
1022	(aio_load "$filename.pst", $av) >= 0	1120	(aio_load "$filename.pst", $av) >= 0
1023	or return;	1121	or return;
1024	$av = eval { (Storable::thaw $av)->{objs} };
1025	}
1026		1122
		1123	my $st = eval { Coro::Storable::thaw $av }
		1124	\|\| eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
		1125	$av = $st->{objs};
		1126	}
		1127
		1128	utf8::decode (my $decname = $filename);
1027	warn sprintf "loading %s (%d)\n",	1129	warn sprintf "loading %s (%d,%d)\n",
1028	$filename, length $data, scalar @{$av \|\| []};	1130	$decname, length $data, scalar @{$av \|\| []};
		1131
1029	return ($data, $av);	1132	($data, $av)
1030	}	1133	}
1031		1134
1032	=head2 COMMAND CALLBACKS	1135	=head2 COMMAND CALLBACKS
1033		1136
1034	=over 4	1137	=over 4
…		…
1107	my ($pl, $buf) = @_;	1210	my ($pl, $buf) = @_;
1108		1211
1109	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1212	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1110		1213
1111	if (ref $msg) {	1214	if (ref $msg) {
		1215	my ($type, $reply, @payload) =
		1216	"ARRAY" eq ref $msg
		1217	? @$msg
		1218	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1219
		1220	my @reply;
		1221
1112	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1222	if (my $cb = $EXTCMD{$type}) {
1113	if (my %reply = $cb->($pl, $msg)) {	1223	@reply = $cb->($pl, @payload);
1114	$pl->ext_reply ($msg->{msgid}, %reply);
1115	}
1116	}	1224	}
		1225
		1226	$pl->ext_reply ($reply, @reply)
		1227	if $reply;
		1228
1117	} else {	1229	} else {
1118	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1230	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1119	}	1231	}
1120		1232
1121	cf::override;	1233	cf::override;
…		…
1211		1323
1212	=head3 cf::player	1324	=head3 cf::player
1213		1325
1214	=over 4	1326	=over 4
1215		1327
		1328	=item cf::player::num_playing
		1329
		1330	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1331
		1332	=cut
		1333
		1334	sub num_playing {
		1335	scalar grep
		1336	$_->ob->map
		1337	&& !$_->hidden
		1338	&& !$_->ob->flag (cf::FLAG_WIZ),
		1339	cf::player::list
		1340	}
		1341
1216	=item cf::player::find $login	1342	=item cf::player::find $login
1217		1343
1218	Returns the given player object, loading it if necessary (might block).	1344	Returns the given player object, loading it if necessary (might block).
1219		1345
1220	=cut	1346	=cut
…		…
1255	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1381	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1256	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1382	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1257	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1383	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1258	aio_unlink +(playerdir $login) . "/$login.pl";	1384	aio_unlink +(playerdir $login) . "/$login.pl";
1259		1385
1260	my $pl = load_pl path $login	1386	my $f = new_from_file cf::object::thawer path $login
1261	or return;	1387	or return;
		1388
		1389	my $pl = cf::player::load_pl $f
		1390	or return;
		1391	local $cf::PLAYER_LOADING{$login} = $pl;
		1392	$f->resolve_delayed_derefs;
1262	$cf::PLAYER{$login} = $pl	1393	$cf::PLAYER{$login} = $pl
1263	}	1394	}
1264	}	1395	}
1265	}	1396	}
1266		1397
…		…
1276		1407
1277	aio_mkdir playerdir $pl, 0770;	1408	aio_mkdir playerdir $pl, 0770;
1278	$pl->{last_save} = $cf::RUNTIME;	1409	$pl->{last_save} = $cf::RUNTIME;
1279		1410
1280	$pl->save_pl ($path);	1411	$pl->save_pl ($path);
1281	Coro::cede;	1412	cf::cede_to_tick;
1282	}	1413	}
1283		1414
1284	sub new($) {	1415	sub new($) {
1285	my ($login) = @_;	1416	my ($login) = @_;
1286		1417
…		…
1290	$self->{deny_save} = 1;	1421	$self->{deny_save} = 1;
1291		1422
1292	$cf::PLAYER{$login} = $self;	1423	$cf::PLAYER{$login} = $self;
1293		1424
1294	$self	1425	$self
		1426	}
		1427
		1428	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1429
		1430	=cut
		1431
		1432	sub send_msg {
		1433	my $ns = shift->ns
		1434	or return;
		1435	$ns->send_msg (@_);
1295	}	1436	}
1296		1437
1297	=item $pl->quit_character	1438	=item $pl->quit_character
1298		1439
1299	Nukes the player without looking back. If logged in, the connection will	1440	Nukes the player without looking back. If logged in, the connection will
…		…
1354	or return [];	1495	or return [];
1355		1496
1356	my @logins;	1497	my @logins;
1357		1498
1358	for my $login (@$dirs) {	1499	for my $login (@$dirs) {
		1500	my $path = path $login;
		1501
		1502	# a .pst is a dead give-away for a valid player
		1503	unless (-e "$path.pst") {
1359	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1504	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1360	aio_read $fh, 0, 512, my $buf, 0 or next;	1505	aio_read $fh, 0, 512, my $buf, 0 or next;
1361	$buf !~ /^password -------------$/m or next; # official not-valid tag	1506	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1507	}
1362		1508
1363	utf8::decode $login;	1509	utf8::decode $login;
1364	push @logins, $login;	1510	push @logins, $login;
1365	}	1511	}
1366		1512
…		…
1404	sub expand_cfpod {	1550	sub expand_cfpod {
1405	((my $self), (local $_)) = @_;	1551	((my $self), (local $_)) = @_;
1406		1552
1407	# escape & and <	1553	# escape & and <
1408	s/&/&/g;	1554	s/&/&/g;
1409	s/(?<![BIUGH])</</g;	1555	s/(?<![BIUGHT])</</g;
1410		1556
1411	# this is buggy, it needs to properly take care of nested <'s	1557	# this is buggy, it needs to properly take care of nested <'s
1412		1558
1413	1 while	1559	1 while
1414	# replace B<>, I<>, U<> etc.	1560	# replace B<>, I<>, U<> etc.
1415	s/B<([^\>]*)>/<b>$1<\/b>/	1561	s/B<([^\>]*)>/<b>$1<\/b>/
1416	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1562	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1417	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1563	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1564	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1418	# replace G<male\|female> tags	1565	# replace G<male\|female> tags
1419	\|\| s{G<([^>\|])\\|([^>])>}{	1566	\|\| s{G<([^>\|])\\|([^>])>}{
1420	$self->gender ? $2 : $1	1567	$self->gender ? $2 : $1
1421	}ge	1568	}ge
1422	# replace H<hint text>	1569	# replace H<hint text>
…		…
1443	sub hintmode {	1590	sub hintmode {
1444	$_[0]{hintmode} = $_[1] if @_ > 1;	1591	$_[0]{hintmode} = $_[1] if @_ > 1;
1445	$_[0]{hintmode}	1592	$_[0]{hintmode}
1446	}	1593	}
1447		1594
1448	=item $player->ext_reply ($msgid, %msg)	1595	=item $player->ext_reply ($msgid, @msg)
1449		1596
1450	Sends an ext reply to the player.	1597	Sends an ext reply to the player.
1451		1598
1452	=cut	1599	=cut
1453		1600
1454	sub ext_reply($$%) {	1601	sub ext_reply($$@) {
1455	my ($self, $id, %msg) = @_;	1602	my ($self, $id, @msg) = @_;
1456		1603
1457	$msg{msgid} = $id;	1604	$self->ns->ext_reply ($id, @msg)
1458	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1459	}	1605	}
1460		1606
1461	=item $player->ext_event ($type, %msg)	1607	=item $player->ext_msg ($type, @msg)
1462		1608
1463	Sends an ext event to the client.	1609	Sends an ext event to the client.
1464		1610
1465	=cut	1611	=cut
1466		1612
1467	sub ext_event($$%) {	1613	sub ext_msg($$@) {
1468	my ($self, $type, %msg) = @_;	1614	my ($self, $type, @msg) = @_;
1469		1615
1470	$self->ns->ext_event ($type, %msg);	1616	$self->ns->ext_msg ($type, @msg);
1471	}	1617	}
1472		1618
1473	=head3 cf::region	1619	=head3 cf::region
1474		1620
1475	=over 4	1621	=over 4
…		…
1488	my ($path) = @_;	1634	my ($path) = @_;
1489		1635
1490	my ($match, $specificity);	1636	my ($match, $specificity);
1491		1637
1492	for my $region (list) {	1638	for my $region (list) {
1493	if ($region->match && $path =~ $region->match) {	1639	if ($region->{match} && $path =~ $region->{match}) {
1494	($match, $specificity) = ($region, $region->specificity)	1640	($match, $specificity) = ($region, $region->specificity)
1495	if $region->specificity > $specificity;	1641	if $region->specificity > $specificity;
1496	}	1642	}
1497	}	1643	}
1498		1644
…		…
1618	$self->init; # pass $1 etc.	1764	$self->init; # pass $1 etc.
1619	return $self;	1765	return $self;
1620	}	1766	}
1621	}	1767	}
1622		1768
1623	Carp::carp "unable to resolve path '$path' (base '$base').";	1769	Carp::cluck "unable to resolve path '$path' (base '$base').";
1624	()	1770	()
1625	}	1771	}
1626		1772
1627	sub init {	1773	sub init {
1628	my ($self) = @_;	1774	my ($self) = @_;
…		…
1691		1837
1692	sub load_header_from($) {	1838	sub load_header_from($) {
1693	my ($self, $path) = @_;	1839	my ($self, $path) = @_;
1694		1840
1695	utf8::encode $path;	1841	utf8::encode $path;
1696	#aio_open $path, O_RDONLY, 0	1842	my $f = new_from_file cf::object::thawer $path
1697	# or return;
1698
1699	$self->_load_header ($path)
1700	or return;	1843	or return;
		1844
		1845	$self->_load_header ($f)
		1846	or return;
		1847
		1848	local $MAP_LOADING{$self->{path}} = $self;
		1849	$f->resolve_delayed_derefs;
1701		1850
1702	$self->{load_path} = $path;	1851	$self->{load_path} = $path;
1703		1852
1704	1	1853	1
1705	}	1854	}
…		…
1759	sub find {	1908	sub find {
1760	my ($path, $origin) = @_;	1909	my ($path, $origin) = @_;
1761		1910
1762	$path = normalise $path, $origin && $origin->path;	1911	$path = normalise $path, $origin && $origin->path;
1763		1912
		1913	cf::lock_wait "map_data:$path";#d#remove
1764	cf::lock_wait "map_find:$path";	1914	cf::lock_wait "map_find:$path";
1765		1915
1766	$cf::MAP{$path} \|\| do {	1916	$cf::MAP{$path} \|\| do {
1767	my $guard = cf::lock_acquire "map_find:$path";	1917	my $guard1 = cf::lock_acquire "map_find:$path";
		1918	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1919
1768	my $map = new_from_path cf::map $path	1920	my $map = new_from_path cf::map $path
1769	or return;	1921	or return;
1770		1922
1771	$map->{last_save} = $cf::RUNTIME;	1923	$map->{last_save} = $cf::RUNTIME;
1772		1924
…		…
1774	or return;	1926	or return;
1775		1927
1776	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1928	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1777	# doing this can freeze the server in a sync job, obviously	1929	# doing this can freeze the server in a sync job, obviously
1778	#$cf::WAIT_FOR_TICK->wait;	1930	#$cf::WAIT_FOR_TICK->wait;
		1931	undef $guard1;
		1932	undef $guard2;
1779	$map->reset;	1933	$map->reset;
1780	undef $guard;
1781	return find $path;	1934	return find $path;
1782	}	1935	}
1783		1936
1784	$cf::MAP{$path} = $map	1937	$cf::MAP{$path} = $map
1785	}	1938	}
…		…
1794	local $self->{deny_reset} = 1; # loading can take a long time	1947	local $self->{deny_reset} = 1; # loading can take a long time
1795		1948
1796	my $path = $self->{path};	1949	my $path = $self->{path};
1797		1950
1798	{	1951	{
1799	my $guard = cf::lock_acquire "map_load:$path";	1952	my $guard = cf::lock_acquire "map_data:$path";
1800		1953
		1954	return unless $self->valid;
1801	return if $self->in_memory != cf::MAP_SWAPPED;	1955	return unless $self->in_memory == cf::MAP_SWAPPED;
1802		1956
1803	$self->in_memory (cf::MAP_LOADING);	1957	$self->in_memory (cf::MAP_LOADING);
1804		1958
1805	$self->alloc;	1959	$self->alloc;
1806		1960
1807	$self->pre_load;	1961	$self->pre_load;
1808	Coro::cede;	1962	cf::cede_to_tick;
1809		1963
		1964	my $f = new_from_file cf::object::thawer $self->{load_path};
		1965	$f->skip_block;
1810	$self->_load_objects ($self->{load_path}, 1)	1966	$self->_load_objects ($f)
1811	or return;	1967	or return;
1812		1968
1813	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1969	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1814	if delete $self->{load_original};	1970	if delete $self->{load_original};
1815		1971
1816	if (my $uniq = $self->uniq_path) {	1972	if (my $uniq = $self->uniq_path) {
1817	utf8::encode $uniq;	1973	utf8::encode $uniq;
1818	if (aio_open $uniq, O_RDONLY, 0) {	1974	unless (aio_stat $uniq) {
		1975	if (my $f = new_from_file cf::object::thawer $uniq) {
1819	$self->clear_unique_items;	1976	$self->clear_unique_items;
1820	$self->_load_objects ($uniq, 0);	1977	$self->_load_objects ($f);
		1978	$f->resolve_delayed_derefs;
		1979	}
1821	}	1980	}
1822	}	1981	}
1823		1982
1824	Coro::cede;	1983	$f->resolve_delayed_derefs;
		1984
		1985	cf::cede_to_tick;
1825	# now do the right thing for maps	1986	# now do the right thing for maps
1826	$self->link_multipart_objects;	1987	$self->link_multipart_objects;
1827	$self->difficulty ($self->estimate_difficulty)	1988	$self->difficulty ($self->estimate_difficulty)
1828	unless $self->difficulty;	1989	unless $self->difficulty;
1829	Coro::cede;	1990	cf::cede_to_tick;
1830		1991
1831	unless ($self->{deny_activate}) {	1992	unless ($self->{deny_activate}) {
1832	$self->decay_objects;	1993	$self->decay_objects;
1833	$self->fix_auto_apply;	1994	$self->fix_auto_apply;
1834	$self->update_buttons;	1995	$self->update_buttons;
1835	Coro::cede;	1996	cf::cede_to_tick;
1836	$self->set_darkness_map;	1997	$self->set_darkness_map;
1837	Coro::cede;	1998	cf::cede_to_tick;
1838	$self->activate;	1999	$self->activate;
1839	}	2000	}
		2001
		2002	$self->{last_save} = $cf::RUNTIME;
		2003	$self->last_access ($cf::RUNTIME);
1840		2004
1841	$self->in_memory (cf::MAP_IN_MEMORY);	2005	$self->in_memory (cf::MAP_IN_MEMORY);
1842	}	2006	}
1843		2007
1844	$self->post_load;	2008	$self->post_load;
…		…
1855		2019
1856	$self	2020	$self
1857	}	2021	}
1858		2022
1859	# find and load all maps in the 3x3 area around a map	2023	# find and load all maps in the 3x3 area around a map
1860	sub load_diag {	2024	sub load_neighbours {
1861	my ($map) = @_;	2025	my ($map) = @_;
1862		2026
1863	my @diag; # diagonal neighbours	2027	my @neigh; # diagonal neighbours
1864		2028
1865	for (0 .. 3) {	2029	for (0 .. 3) {
1866	my $neigh = $map->tile_path ($_)	2030	my $neigh = $map->tile_path ($_)
1867	or next;	2031	or next;
1868	$neigh = find $neigh, $map	2032	$neigh = find $neigh, $map
1869	or next;	2033	or next;
1870	$neigh->load;	2034	$neigh->load;
1871		2035
		2036	push @neigh,
1872	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2037	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1873	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2038	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1874	}	2039	}
1875		2040
1876	for (@diag) {	2041	for (grep defined $_->[0], @neigh) {
		2042	my ($path, $origin) = @$_;
1877	my $neigh = find @$_	2043	my $neigh = find $path, $origin
1878	or next;	2044	or next;
1879	$neigh->load;	2045	$neigh->load;
1880	}	2046	}
1881	}	2047	}
1882		2048
…		…
1887	}	2053	}
1888		2054
1889	sub do_load_sync {	2055	sub do_load_sync {
1890	my ($map) = @_;	2056	my ($map) = @_;
1891		2057
		2058	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2059	if $Coro::current == $Coro::main;
		2060
1892	cf::sync_job { $map->load };	2061	cf::sync_job { $map->load };
1893	}	2062	}
1894		2063
1895	our %MAP_PREFETCH;	2064	our %MAP_PREFETCH;
1896	our $MAP_PREFETCHER = undef;	2065	our $MAP_PREFETCHER = undef;
1897		2066
1898	sub find_async {	2067	sub find_async {
1899	my ($path, $origin) = @_;	2068	my ($path, $origin, $load) = @_;
1900		2069
1901	$path = normalise $path, $origin && $origin->{path};	2070	$path = normalise $path, $origin && $origin->{path};
1902		2071
1903	if (my $map = $cf::MAP{$path}) {	2072	if (my $map = $cf::MAP{$path}) {
1904	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2073	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1905	}	2074	}
1906		2075
1907	undef $MAP_PREFETCH{$path};	2076	$MAP_PREFETCH{$path} \|= $load;
		2077
1908	$MAP_PREFETCHER \|\|= cf::async {	2078	$MAP_PREFETCHER \|\|= cf::async {
		2079	$Coro::current->{desc} = "map prefetcher";
		2080
1909	while (%MAP_PREFETCH) {	2081	while (%MAP_PREFETCH) {
1910	for my $path (keys %MAP_PREFETCH) {	2082	while (my ($k, $v) = each %MAP_PREFETCH) {
1911	my $map = find $path	2083	if (my $map = find $k) {
1912	or next;
1913	$map->load;	2084	$map->load if $v;
		2085	}
1914		2086
1915	delete $MAP_PREFETCH{$path};	2087	delete $MAP_PREFETCH{$k};
1916	}	2088	}
1917	}	2089	}
1918	undef $MAP_PREFETCHER;	2090	undef $MAP_PREFETCHER;
1919	};	2091	};
1920	$MAP_PREFETCHER->prio (6);	2092	$MAP_PREFETCHER->prio (6);
…		…
1923	}	2095	}
1924		2096
1925	sub save {	2097	sub save {
1926	my ($self) = @_;	2098	my ($self) = @_;
1927		2099
1928	my $lock = cf::lock_acquire "map_data:" . $self->path;	2100	my $lock = cf::lock_acquire "map_data:$self->{path}";
1929		2101
1930	$self->{last_save} = $cf::RUNTIME;	2102	$self->{last_save} = $cf::RUNTIME;
1931		2103
1932	return unless $self->dirty;	2104	return unless $self->dirty;
1933		2105
…		…
1939	return if $self->{deny_save};	2111	return if $self->{deny_save};
1940		2112
1941	local $self->{last_access} = $self->last_access;#d#	2113	local $self->{last_access} = $self->last_access;#d#
1942		2114
1943	cf::async {	2115	cf::async {
		2116	$Coro::current->{desc} = "map player save";
1944	$_->contr->save for $self->players;	2117	$_->contr->save for $self->players;
1945	};	2118	};
1946		2119
1947	if ($uniq) {	2120	if ($uniq) {
1948	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	2121	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
…		…
1956	my ($self) = @_;	2129	my ($self) = @_;
1957		2130
1958	# save first because save cedes	2131	# save first because save cedes
1959	$self->save;	2132	$self->save;
1960		2133
1961	my $lock = cf::lock_acquire "map_data:" . $self->path;	2134	my $lock = cf::lock_acquire "map_data:$self->{path}";
1962		2135
1963	return if $self->players;	2136	return if $self->players;
1964	return if $self->in_memory != cf::MAP_IN_MEMORY;	2137	return if $self->in_memory != cf::MAP_IN_MEMORY;
1965	return if $self->{deny_save};	2138	return if $self->{deny_save};
1966		2139
		2140	$self->in_memory (cf::MAP_SWAPPED);
		2141
		2142	$self->deactivate;
		2143	$_->clear_links_to ($self) for values %cf::MAP;
1967	$self->clear;	2144	$self->clear;
1968	$self->in_memory (cf::MAP_SWAPPED);
1969	}	2145	}
1970		2146
1971	sub reset_at {	2147	sub reset_at {
1972	my ($self) = @_;	2148	my ($self) = @_;
1973		2149
…		…
2005	if $uniq;	2181	if $uniq;
2006	}	2182	}
2007		2183
2008	delete $cf::MAP{$self->path};	2184	delete $cf::MAP{$self->path};
2009		2185
		2186	$self->deactivate;
		2187	$_->clear_links_to ($self) for values %cf::MAP;
2010	$self->clear;	2188	$self->clear;
2011
2012	$_->clear_links_to ($self) for values %cf::MAP;
2013		2189
2014	$self->unlink_save;	2190	$self->unlink_save;
2015	$self->destroy;	2191	$self->destroy;
2016	}	2192	}
2017		2193
2018	my $nuke_counter = "aaaa";	2194	my $nuke_counter = "aaaa";
2019		2195
2020	sub nuke {	2196	sub nuke {
2021	my ($self) = @_;	2197	my ($self) = @_;
2022		2198
		2199	{
		2200	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2201
2023	delete $cf::MAP{$self->path};	2202	delete $cf::MAP{$self->path};
2024		2203
2025	$self->unlink_save;	2204	$self->unlink_save;
2026		2205
2027	bless $self, "cf::map";	2206	bless $self, "cf::map";
2028	delete $self->{deny_reset};	2207	delete $self->{deny_reset};
2029	$self->{deny_save} = 1;	2208	$self->{deny_save} = 1;
2030	$self->reset_timeout (1);	2209	$self->reset_timeout (1);
2031	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2210	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2032		2211
2033	$cf::MAP{$self->path} = $self;	2212	$cf::MAP{$self->path} = $self;
		2213	}
2034		2214
2035	$self->reset; # polite request, might not happen	2215	$self->reset; # polite request, might not happen
2036	}	2216	}
2037		2217
2038	=item $maps = cf::map::tmp_maps	2218	=item $maps = cf::map::tmp_maps
…		…
2114		2294
2115	sub inv_recursive {	2295	sub inv_recursive {
2116	inv_recursive_ inv $_[0]	2296	inv_recursive_ inv $_[0]
2117	}	2297	}
2118		2298
		2299	=item $ref = $ob->ref
		2300
		2301	creates and returns a persistent reference to an objetc that can be stored as a string.
		2302
		2303	=item $ob = cf::object::deref ($refstring)
		2304
		2305	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2306	even if the object actually exists. May block.
		2307
		2308	=cut
		2309
		2310	sub deref {
		2311	my ($ref) = @_;
		2312
		2313	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2314	my ($uuid, $name) = ($1, $2);
		2315	my $pl = $cf::PLAYER_LOADING{$name} \|\| cf::player::find $name
		2316	or return;
		2317	$pl->ob->uuid eq $uuid
		2318	or return;
		2319
		2320	$pl->ob
		2321	} else {
		2322	warn "$ref: cannot resolve object reference\n";
		2323	undef
		2324	}
		2325	}
		2326
2119	package cf;	2327	package cf;
2120		2328
2121	=back	2329	=back
2122		2330
2123	=head3 cf::object::player	2331	=head3 cf::object::player
…		…
2145		2353
2146	} else {	2354	} else {
2147	my $pl = $self->contr;	2355	my $pl = $self->contr;
2148		2356
2149	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2357	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2150	my $diag = $pl->{npc_dialog};	2358	my $dialog = $pl->{npc_dialog};
2151	$diag->{pl}->ext_reply (	2359	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2152	$diag->{id},
2153	msgtype => "reply",
2154	msg => $diag->{pl}->expand_cfpod ($msg),
2155	add_topics => []
2156	);
2157		2360
2158	} else {	2361	} else {
2159	$msg = $npc->name . " says: $msg" if $npc;	2362	$msg = $npc->name . " says: $msg" if $npc;
2160	$self->message ($msg, $flags);	2363	$self->message ($msg, $flags);
2161	}	2364	}
2162	}	2365	}
		2366	}
		2367
		2368	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2369
		2370	=cut
		2371
		2372	sub cf::object::send_msg {
		2373	my $pl = shift->contr
		2374	or return;
		2375	$pl->send_msg (@_);
2163	}	2376	}
2164		2377
2165	=item $player_object->may ("access")	2378	=item $player_object->may ("access")
2166		2379
2167	Returns wether the given player is authorized to access resource "access"	2380	Returns wether the given player is authorized to access resource "access"
…		…
2246	# use -1 or undef as default coordinates, not 0, 0	2459	# use -1 or undef as default coordinates, not 0, 0
2247	($x, $y) = ($map->enter_x, $map->enter_y)	2460	($x, $y) = ($map->enter_x, $map->enter_y)
2248	if $x <=0 && $y <= 0;	2461	if $x <=0 && $y <= 0;
2249		2462
2250	$map->load;	2463	$map->load;
2251	$map->load_diag;	2464	$map->load_neighbours;
2252		2465
2253	return unless $self->contr->active;	2466	return unless $self->contr->active;
2254	$self->activate_recursive;	2467	$self->activate_recursive;
2255		2468
2256	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2469	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2257	$self->enter_map ($map, $x, $y);	2470	$self->enter_map ($map, $x, $y);
2258	}	2471	}
2259		2472
2260	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2473	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2261		2474
2262	Moves the player to the given map-path and coordinates by first freezing	2475	Moves the player to the given map-path and coordinates by first freezing
2263	her, loading and preparing them map, calling the provided $check callback	2476	her, loading and preparing them map, calling the provided $check callback
2264	that has to return the map if sucecssful, and then unfreezes the player on	2477	that has to return the map if sucecssful, and then unfreezes the player on
2265	the new (success) or old (failed) map position.	2478	the new (success) or old (failed) map position. In either case, $done will
		2479	be called at the end of this process.
2266		2480
2267	=cut	2481	=cut
2268		2482
2269	our $GOTOGEN;	2483	our $GOTOGEN;
2270		2484
2271	sub cf::object::player::goto {	2485	sub cf::object::player::goto {
2272	my ($self, $path, $x, $y, $check) = @_;	2486	my ($self, $path, $x, $y, $check, $done) = @_;
2273		2487
2274	# do generation counting so two concurrent goto's will be executed in-order	2488	# do generation counting so two concurrent goto's will be executed in-order
2275	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2489	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2276		2490
2277	$self->enter_link;	2491	$self->enter_link;
2278		2492
2279	(async {	2493	(async {
		2494	$Coro::current->{desc} = "player::goto $path $x $y";
		2495
		2496	# *tag paths override both path and x\|y
		2497	if ($path =~ /^\(.)$/) {
		2498	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2499	my $ob = $obs[rand @obs];
		2500
		2501	# see if we actually can go there
		2502	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2503	$ob = $obs[rand @obs];
		2504	} else {
		2505	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE \| cf::NDI_RED);
		2506	}
		2507	# else put us there anyways for now #d#
		2508
		2509	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2510	} else {
		2511	($path, $x, $y) = (undef, undef, undef);
		2512	}
		2513	}
		2514
2280	my $map = eval {	2515	my $map = eval {
2281	my $map = cf::map::find $path;	2516	my $map = defined $path ? cf::map::find $path : undef;
2282		2517
2283	if ($map) {	2518	if ($map) {
2284	$map = $map->customise_for ($self);	2519	$map = $map->customise_for ($self);
2285	$map = $check->($map) if $check && $map;	2520	$map = $check->($map) if $check && $map;
2286	} else {	2521	} else {
2287	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);	2522	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE \| cf::NDI_RED);
2288	}	2523	}
2289		2524
2290	$map	2525	$map
2291	};	2526	};
2292		2527
…		…
2297		2532
2298	if ($gen == $self->{_goto_generation}) {	2533	if ($gen == $self->{_goto_generation}) {
2299	delete $self->{_goto_generation};	2534	delete $self->{_goto_generation};
2300	$self->leave_link ($map, $x, $y);	2535	$self->leave_link ($map, $x, $y);
2301	}	2536	}
		2537
		2538	$done->() if $done;
2302	})->prio (1);	2539	})->prio (1);
2303	}	2540	}
2304		2541
2305	=item $player_object->enter_exit ($exit_object)	2542	=item $player_object->enter_exit ($exit_object)
2306		2543
…		…
2380	# if exit is damned, update players death & WoR home-position	2617	# if exit is damned, update players death & WoR home-position
2381	$self->contr->savebed ($slaying, $hp, $sp)	2618	$self->contr->savebed ($slaying, $hp, $sp)
2382	if $exit->flag (FLAG_DAMNED);	2619	if $exit->flag (FLAG_DAMNED);
2383		2620
2384	(async {	2621	(async {
		2622	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2623
2385	$self->deactivate_recursive; # just to be sure	2624	$self->deactivate_recursive; # just to be sure
2386	unless (eval {	2625	unless (eval {
2387	$self->goto ($slaying, $hp, $sp);	2626	$self->goto ($slaying, $hp, $sp);
2388		2627
2389	1;	2628	1;
…		…
2415		2654
2416	utf8::encode $text;	2655	utf8::encode $text;
2417	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2656	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2418	}	2657	}
2419		2658
2420	=item $client->send_msg ($color, $type, $msg, [extra...])	2659	=item $client->send_msg ($channel, $msg, $color, [extra...])
2421		2660
2422	Send a drawinfo or msg packet to the client, formatting the msg for the	2661	Send a drawinfo or msg packet to the client, formatting the msg for the
2423	client if neccessary. C<$type> should be a string identifying the type of	2662	client if neccessary. C<$type> should be a string identifying the type of
2424	the message, with C<log> being the default. If C<$color> is negative, suppress	2663	the message, with C<log> being the default. If C<$color> is negative, suppress
2425	the message unless the client supports the msg packet.	2664	the message unless the client supports the msg packet.
2426		2665
2427	=cut	2666	=cut
2428		2667
		2668	our %CHANNEL = (
		2669	"c/identify" => {
		2670	id => "infobox",
		2671	title => "Identify",
		2672	reply => undef,
		2673	tooltip => "Items recently identified",
		2674	},
		2675	"c/examine" => {
		2676	id => "infobox",
		2677	title => "Examine",
		2678	reply => undef,
		2679	tooltip => "Signs and other items you examined",
		2680	},
		2681	"c/lookat" => {
		2682	id => "infobox",
		2683	title => "Look",
		2684	reply => undef,
		2685	tooltip => "What you saw there",
		2686	},
		2687	);
		2688
2429	sub cf::client::send_msg {	2689	sub cf::client::send_msg {
2430	my ($self, $color, $type, $msg, @extra) = @_;	2690	my ($self, $channel, $msg, $color, @extra) = @_;
2431		2691
2432	$msg = $self->pl->expand_cfpod ($msg);	2692	$msg = $self->pl->expand_cfpod ($msg);
2433		2693
		2694	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2695
		2696	# check predefined channels, for the benefit of C
		2697	if ($CHANNEL{$channel}) {
		2698	$channel = $CHANNEL{$channel};
		2699
		2700	$self->ext_msg (channel_info => $channel)
		2701	if $self->can_msg;
		2702
		2703	$channel = $channel->{id};
		2704
		2705	} elsif (ref $channel) {
		2706	# send meta info to client, if not yet sent
		2707	unless (exists $self->{channel}{$channel->{id}}) {
		2708	$self->{channel}{$channel->{id}} = $channel;
		2709	$self->ext_msg (channel_info => $channel)
		2710	if $self->can_msg;
		2711	}
		2712
		2713	$channel = $channel->{id};
		2714	}
		2715
2434	return unless @extra \|\| length $msg;	2716	return unless @extra \|\| length $msg;
2435		2717
2436	if ($self->can_msg) {	2718	if ($self->can_msg) {
		2719	# default colour, mask it out
		2720	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2721	if $color & cf::NDI_DEF;
		2722
2437	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));	2723	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2724	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2438	} else {	2725	} else {
2439	# replace some tags by gcfclient-compatible ones
2440	for ($msg) {
2441	1 while
2442	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2443	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2444	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2445	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2446	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2447	}
2448
2449	if ($color >= 0) {	2726	if ($color >= 0) {
		2727	# replace some tags by gcfclient-compatible ones
		2728	for ($msg) {
		2729	1 while
		2730	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2731	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2732	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2733	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2734	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2735	}
		2736
		2737	$color &= cf::NDI_COLOR_MASK;
		2738
		2739	utf8::encode $msg;
		2740
2450	if (0 && $msg =~ /\[/) {	2741	if (0 && $msg =~ /\[/) {
		2742	# COMMAND/INFO
2451	$self->send_packet ("drawextinfo $color 4 0 $msg")	2743	$self->send_packet ("drawextinfo $color 10 8 $msg")
2452	} else {	2744	} else {
2453	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2745	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2454	$self->send_packet ("drawinfo $color $msg")	2746	$self->send_packet ("drawinfo $color $msg")
2455	}	2747	}
2456	}	2748	}
2457	}	2749	}
2458	}	2750	}
2459		2751
2460	=item $client->ext_event ($type, %msg)	2752	=item $client->ext_msg ($type, @msg)
2461		2753
2462	Sends an ext event to the client.	2754	Sends an ext event to the client.
2463		2755
2464	=cut	2756	=cut
2465		2757
2466	sub cf::client::ext_event($$%) {	2758	sub cf::client::ext_msg($$@) {
2467	my ($self, $type, %msg) = @_;	2759	my ($self, $type, @msg) = @_;
2468		2760
		2761	if ($self->extcmd == 2) {
		2762	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2763	} elsif ($self->extcmd == 1) { # TODO: remove
2469	$msg{msgtype} = "event_$type";	2764	push @msg, msgtype => "event_$type";
2470	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2765	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2766	}
		2767	}
		2768
		2769	=item $client->ext_reply ($msgid, @msg)
		2770
		2771	Sends an ext reply to the client.
		2772
		2773	=cut
		2774
		2775	sub cf::client::ext_reply($$@) {
		2776	my ($self, $id, @msg) = @_;
		2777
		2778	if ($self->extcmd == 2) {
		2779	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2780	} elsif ($self->extcmd == 1) {
		2781	#TODO: version 1, remove
		2782	unshift @msg, msgtype => "reply", msgid => $id;
		2783	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2784	}
2471	}	2785	}
2472		2786
2473	=item $success = $client->query ($flags, "text", \&cb)	2787	=item $success = $client->query ($flags, "text", \&cb)
2474		2788
2475	Queues a query to the client, calling the given callback with	2789	Queues a query to the client, calling the given callback with
…		…
2530	my ($ns, $buf) = @_;	2844	my ($ns, $buf) = @_;
2531		2845
2532	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2846	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2533		2847
2534	if (ref $msg) {	2848	if (ref $msg) {
		2849	my ($type, $reply, @payload) =
		2850	"ARRAY" eq ref $msg
		2851	? @$msg
		2852	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2853
		2854	my @reply;
		2855
2535	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2856	if (my $cb = $EXTICMD{$type}) {
2536	if (my %reply = $cb->($ns, $msg)) {	2857	@reply = $cb->($ns, @payload);
2537	$reply{msgid} = $msg->{msgid};
2538	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2539	}
2540	}	2858	}
		2859
		2860	$ns->ext_reply ($reply, @reply)
		2861	if $reply;
		2862
2541	} else {	2863	} else {
2542	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2864	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2543	}	2865	}
2544		2866
2545	cf::override;	2867	cf::override;
…		…
2592	our $safe = new Safe "safe";	2914	our $safe = new Safe "safe";
2593	our $safe_hole = new Safe::Hole;	2915	our $safe_hole = new Safe::Hole;
2594		2916
2595	$SIG{FPE} = 'IGNORE';	2917	$SIG{FPE} = 'IGNORE';
2596		2918
2597	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2919	$safe->permit_only (Opcode::opset qw(
		2920	:base_core :base_mem :base_orig :base_math
		2921	grepstart grepwhile mapstart mapwhile
		2922	sort time
		2923	));
2598		2924
2599	# here we export the classes and methods available to script code	2925	# here we export the classes and methods available to script code
2600		2926
2601	=pod	2927	=pod
2602		2928
2603	The following functions and methods are available within a safe environment:	2929	The following functions and methods are available within a safe environment:
2604		2930
2605	cf::object	2931	cf::object
2606	contr pay_amount pay_player map x y force_find force_add	2932	contr pay_amount pay_player map x y force_find force_add destroy
2607	insert remove	2933	insert remove name archname title slaying race decrease_ob_nr
2608		2934
2609	cf::object::player	2935	cf::object::player
2610	player	2936	player
2611		2937
2612	cf::player	2938	cf::player
…		…
2617		2943
2618	=cut	2944	=cut
2619		2945
2620	for (	2946	for (
2621	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	2947	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2948	insert remove inv name archname title slaying race
2622	insert remove)],	2949	decrease_ob_nr destroy)],
2623	["cf::object::player" => qw(player)],	2950	["cf::object::player" => qw(player)],
2624	["cf::player" => qw(peaceful)],	2951	["cf::player" => qw(peaceful)],
2625	["cf::map" => qw(trigger)],	2952	["cf::map" => qw(trigger)],
2626	) {	2953	) {
2627	no strict 'refs';	2954	no strict 'refs';
…		…
2703	# the server's init and main functions	3030	# the server's init and main functions
2704		3031
2705	sub load_facedata($) {	3032	sub load_facedata($) {
2706	my ($path) = @_;	3033	my ($path) = @_;
2707		3034
		3035	# HACK to clear player env face cache, we need some signal framework
		3036	# for this (global event?)
		3037	%ext::player_env::MUSIC_FACE_CACHE = ();
		3038
		3039	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3040
2708	warn "loading facedata from $path\n";	3041	warn "loading facedata from $path\n";
2709		3042
2710	my $facedata;	3043	my $facedata;
2711	0 < aio_load $path, $facedata	3044	0 < aio_load $path, $facedata
2712	or die "$path: $!";	3045	or die "$path: $!";
…		…
2714	$facedata = Coro::Storable::thaw $facedata;	3047	$facedata = Coro::Storable::thaw $facedata;
2715		3048
2716	$facedata->{version} == 2	3049	$facedata->{version} == 2
2717	or cf::cleanup "$path: version mismatch, cannot proceed.";	3050	or cf::cleanup "$path: version mismatch, cannot proceed.";
2718		3051
		3052	# patch in the exptable
		3053	$facedata->{resource}{"res/exp_table"} = {
		3054	type => FT_RSRC,
		3055	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3056	};
		3057	cf::cede_to_tick;
		3058
2719	{	3059	{
2720	my $faces = $facedata->{faceinfo};	3060	my $faces = $facedata->{faceinfo};
2721		3061
2722	while (my ($face, $info) = each %$faces) {	3062	while (my ($face, $info) = each %$faces) {
2723	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3063	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2724	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3064	cf::face::set_visibility $idx, $info->{visibility};
		3065	cf::face::set_magicmap $idx, $info->{magicmap};
2725	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3066	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2726	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3067	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2727	Coro::cede;	3068
		3069	cf::cede_to_tick;
2728	}	3070	}
2729		3071
2730	while (my ($face, $info) = each %$faces) {	3072	while (my ($face, $info) = each %$faces) {
2731	next unless $info->{smooth};	3073	next unless $info->{smooth};
2732	my $idx = cf::face::find $face	3074	my $idx = cf::face::find $face
2733	or next;	3075	or next;
2734	if (my $smooth = cf::face::find $info->{smooth}) {	3076	if (my $smooth = cf::face::find $info->{smooth}) {
		3077	cf::face::set_smooth $idx, $smooth;
2735	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3078	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2736	} else {	3079	} else {
2737	warn "smooth face '$info->{smooth}' not found for face '$face'";	3080	warn "smooth face '$info->{smooth}' not found for face '$face'";
2738	}	3081	}
2739	Coro::cede;	3082
		3083	cf::cede_to_tick;
2740	}	3084	}
2741	}	3085	}
2742		3086
2743	{	3087	{
2744	my $anims = $facedata->{animinfo};	3088	my $anims = $facedata->{animinfo};
2745		3089
2746	while (my ($anim, $info) = each %$anims) {	3090	while (my ($anim, $info) = each %$anims) {
2747	cf::anim::set $anim, $info->{frames}, $info->{facings};	3091	cf::anim::set $anim, $info->{frames}, $info->{facings};
2748	Coro::cede;	3092	cf::cede_to_tick;
2749	}	3093	}
2750		3094
2751	cf::anim::invalidate_all; # d'oh	3095	cf::anim::invalidate_all; # d'oh
2752	}	3096	}
2753		3097
		3098	{
		3099	# TODO: for gcfclient pleasure, we should give resources
		3100	# that gcfclient doesn't grok a >10000 face index.
		3101	my $res = $facedata->{resource};
		3102
		3103	my $soundconf = delete $res->{"res/sound.conf"};
		3104
		3105	while (my ($name, $info) = each %$res) {
		3106	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3107	my $data;
		3108
		3109	if ($info->{type} & 1) {
		3110	# prepend meta info
		3111
		3112	my $meta = $enc->encode ({
		3113	name => $name,
		3114	%{ $info->{meta} \|\| {} },
		3115	});
		3116
		3117	$data = pack "(w/a)", $meta, $info->{data};
		3118	} else {
		3119	$data = $info->{data};
		3120	}
		3121
		3122	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3123	cf::face::set_type $idx, $info->{type};
		3124
		3125	cf::cede_to_tick;
		3126	}
		3127
		3128	if ($soundconf) {
		3129	$soundconf = $enc->decode (delete $soundconf->{data});
		3130
		3131	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3132	my $sound = $soundconf->{compat}[$_]
		3133	or next;
		3134
		3135	my $face = cf::face::find "sound/$sound->[1]";
		3136	cf::sound::set $sound->[0] => $face;
		3137	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3138	}
		3139
		3140	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3141	my $face = cf::face::find "sound/$v";
		3142	cf::sound::set $k => $face;
		3143	}
		3144	}
		3145	}
		3146
2754	1	3147	1
2755	}	3148	}
2756		3149
		3150	register_exticmd fx_want => sub {
		3151	my ($ns, $want) = @_;
		3152
		3153	while (my ($k, $v) = each %$want) {
		3154	$ns->fx_want ($k, $v);
		3155	}
		3156	};
		3157
2757	sub reload_regions {	3158	sub reload_regions {
		3159	# HACK to clear player env face cache, we need some signal framework
		3160	# for this (global event?)
		3161	%ext::player_env::MUSIC_FACE_CACHE = ();
		3162
2758	load_resource_file "$MAPDIR/regions"	3163	load_resource_file "$MAPDIR/regions"
2759	or die "unable to load regions file\n";	3164	or die "unable to load regions file\n";
		3165
		3166	for (cf::region::list) {
		3167	$_->{match} = qr/$_->{match}/
		3168	if exists $_->{match};
		3169	}
2760	}	3170	}
2761		3171
2762	sub reload_facedata {	3172	sub reload_facedata {
2763	load_facedata "$DATADIR/facedata"	3173	load_facedata "$DATADIR/facedata"
2764	or die "unable to load facedata\n";	3174	or die "unable to load facedata\n";
…		…
2793		3203
2794	sub init {	3204	sub init {
2795	reload_resources;	3205	reload_resources;
2796	}	3206	}
2797		3207
2798	sub cfg_load {	3208	sub reload_config {
2799	open my $fh, "<:utf8", "$CONFDIR/config"	3209	open my $fh, "<:utf8", "$CONFDIR/config"
2800	or return;	3210	or return;
2801		3211
2802	local $/;	3212	local $/;
2803	*CFG = YAML::Syck::Load <$fh>;	3213	*CFG = YAML::Syck::Load <$fh>;
…		…
2819	sub main {	3229	sub main {
2820	# we must not ever block the main coroutine	3230	# we must not ever block the main coroutine
2821	local $Coro::idle = sub {	3231	local $Coro::idle = sub {
2822	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3232	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2823	(async {	3233	(async {
		3234	$Coro::current->{desc} = "IDLE BUG HANDLER";
2824	Event::one_event;	3235	Event::one_event;
2825	})->prio (Coro::PRIO_MAX);	3236	})->prio (Coro::PRIO_MAX);
2826	};	3237	};
2827		3238
2828	cfg_load;	3239	reload_config;
2829	db_init;	3240	db_init;
2830	load_extensions;	3241	load_extensions;
2831		3242
2832	$TICK_WATCHER->start;	3243	$TICK_WATCHER->start;
2833	Event::loop;	3244	Event::loop;
…		…
2900	# and maps saved/destroyed asynchronously.	3311	# and maps saved/destroyed asynchronously.
2901	warn "begin emergency player save\n";	3312	warn "begin emergency player save\n";
2902	for my $login (keys %cf::PLAYER) {	3313	for my $login (keys %cf::PLAYER) {
2903	my $pl = $cf::PLAYER{$login} or next;	3314	my $pl = $cf::PLAYER{$login} or next;
2904	$pl->valid or next;	3315	$pl->valid or next;
		3316	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2905	$pl->save;	3317	$pl->save;
2906	}	3318	}
2907	warn "end emergency player save\n";	3319	warn "end emergency player save\n";
2908		3320
2909	warn "begin emergency map save\n";	3321	warn "begin emergency map save\n";
…		…
3026	warn "reloading cf.pm";	3438	warn "reloading cf.pm";
3027	require cf;	3439	require cf;
3028	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3440	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3029		3441
3030	warn "loading config and database again";	3442	warn "loading config and database again";
3031	cf::cfg_load;	3443	cf::reload_config;
3032		3444
3033	warn "loading extensions";	3445	warn "loading extensions";
3034	cf::load_extensions;	3446	cf::load_extensions;
3035		3447
3036	warn "reattaching attachments to objects/players";	3448	warn "reattaching attachments to objects/players";
…		…
3072	register_command "reload" => sub {	3484	register_command "reload" => sub {
3073	my ($who, $arg) = @_;	3485	my ($who, $arg) = @_;
3074		3486
3075	if ($who->flag (FLAG_WIZ)) {	3487	if ($who->flag (FLAG_WIZ)) {
3076	$who->message ("reloading server.");	3488	$who->message ("reloading server.");
		3489	async {
		3490	$Coro::current->{desc} = "perl_reload";
3077	async { reload_perl };	3491	reload_perl;
		3492	};
3078	}	3493	}
3079	};	3494	};
3080		3495
3081	unshift @INC, $LIBDIR;	3496	unshift @INC, $LIBDIR;
3082		3497
…		…
3101	my $signal = new Coro::Signal;	3516	my $signal = new Coro::Signal;
3102	push @WAIT_FOR_TICK_BEGIN, $signal;	3517	push @WAIT_FOR_TICK_BEGIN, $signal;
3103	$signal->wait;	3518	$signal->wait;
3104	}	3519	}
3105		3520
3106	my $min = 1e6;#d#
3107	my $avg = 10;
3108	$TICK_WATCHER = Event->timer (	3521	$TICK_WATCHER = Event->timer (
3109	reentrant => 0,	3522	reentrant => 0,
3110	parked => 1,	3523	parked => 1,
3111	prio => 0,	3524	prio => 0,
3112	at => $NEXT_TICK \|\| $TICK,	3525	at => $NEXT_TICK \|\| $TICK,
…		…
3120		3533
3121	$NOW = $tick_start = Event::time;	3534	$NOW = $tick_start = Event::time;
3122		3535
3123	cf::server_tick; # one server iteration	3536	cf::server_tick; # one server iteration
3124		3537
3125	0 && sync_job {#d#
3126	for(1..10) {
3127	my $t = Event::time;
3128	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3129	or die;
3130
3131	$map->width (50);
3132	$map->height (50);
3133	$map->alloc;
3134	$map->_load_objects ("/tmp/x.map", 1);
3135	my $t = Event::time - $t;
3136
3137	#next unless $t < 0.0013;#d#
3138	if ($t < $min) {
3139	$min = $t;
3140	}
3141	$avg = $avg * 0.99 + $t * 0.01;
3142	}
3143	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3144	exit 0;
3145	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3146	};
3147
3148	$RUNTIME += $TICK;	3538	$RUNTIME += $TICK;
3149	$NEXT_TICK += $TICK;	3539	$NEXT_TICK += $TICK;
3150		3540
3151	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3541	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3152	$NEXT_RUNTIME_WRITE = $NOW + 10;	3542	$NEXT_RUNTIME_WRITE = $NOW + 10;
3153	Coro::async_pool {	3543	Coro::async_pool {
		3544	$Coro::current->{desc} = "runtime saver";
3154	write_runtime	3545	write_runtime
3155	or warn "ERROR: unable to write runtime file: $!";	3546	or warn "ERROR: unable to write runtime file: $!";
3156	};	3547	};
3157	}	3548	}
3158		3549
3159	# my $AFTER = Event::time;
3160	# warn $AFTER - $NOW;#d#
3161
3162	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3550	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3163	$sig->send;	3551	$sig->send;
3164	}	3552	}
3165	while (my $sig = shift @WAIT_FOR_TICK) {	3553	while (my $sig = shift @WAIT_FOR_TICK) {
3166	$sig->send;	3554	$sig->send;
…		…
3176		3564
3177	$LOAD = ($NOW - $tick_start) / $TICK;	3565	$LOAD = ($NOW - $tick_start) / $TICK;
3178	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3566	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3179		3567
3180	_post_tick;	3568	_post_tick;
3181
3182
3183	},	3569	},
3184	);	3570	);
3185		3571
3186	{	3572	{
		3573	BDB::min_parallel 8;
3187	BDB::max_poll_time $TICK * 0.1;	3574	BDB::max_poll_time $TICK * 0.1;
3188	$BDB_POLL_WATCHER = Event->io (	3575	$BDB_POLL_WATCHER = Event->io (
3189	reentrant => 0,	3576	reentrant => 0,
3190	fd => BDB::poll_fileno,	3577	fd => BDB::poll_fileno,
3191	poll => 'r',	3578	poll => 'r',
3192	prio => 0,	3579	prio => 0,
3193	data => WF_AUTOCANCEL,	3580	data => WF_AUTOCANCEL,
3194	cb => \&BDB::poll_cb,	3581	cb => \&BDB::poll_cb,
3195	);	3582	);
3196	BDB::min_parallel 8;
3197		3583
3198	BDB::set_sync_prepare {	3584	BDB::set_sync_prepare {
3199	my $status;	3585	my $status;
3200	my $current = $Coro::current;	3586	my $current = $Coro::current;
3201	(	3587	(
…		…
3210	)	3596	)
3211	};	3597	};
3212		3598
3213	unless ($DB_ENV) {	3599	unless ($DB_ENV) {
3214	$DB_ENV = BDB::db_env_create;	3600	$DB_ENV = BDB::db_env_create;
		3601	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC
		3602	\| BDB::LOG_AUTOREMOVE, 1);
		3603	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3604	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3215		3605
3216	cf::sync_job {	3606	cf::sync_job {
3217	eval {	3607	eval {
3218	BDB::db_env_open	3608	BDB::db_env_open
3219	$DB_ENV,	3609	$DB_ENV,
…		…
3221	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN	3611	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN
3222	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3612	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3223	0666;	3613	0666;
3224		3614
3225	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3615	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3226
3227	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
3228	$DB_ENV->set_lk_detect;
3229	};	3616	};
3230		3617
3231	cf::cleanup "db_env_open(db): $@" if $@;	3618	cf::cleanup "db_env_open(db): $@" if $@;
3232	};	3619	};
3233	}	3620	}
		3621
		3622	$BDB_DEADLOCK_WATCHER = Event->timer (
		3623	after => 3,
		3624	interval => 1,
		3625	hard => 1,
		3626	prio => 0,
		3627	data => WF_AUTOCANCEL,
		3628	cb => sub {
		3629	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3630	},
		3631	);
		3632	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3633	after => 11,
		3634	interval => 60,
		3635	hard => 1,
		3636	prio => 0,
		3637	data => WF_AUTOCANCEL,
		3638	cb => sub {
		3639	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3640	},
		3641	);
		3642	$BDB_TRICKLE_WATCHER = Event->timer (
		3643	after => 5,
		3644	interval => 10,
		3645	hard => 1,
		3646	prio => 0,
		3647	data => WF_AUTOCANCEL,
		3648	cb => sub {
		3649	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3650	},
		3651	);
3234	}	3652	}
3235		3653
3236	{	3654	{
3237	IO::AIO::min_parallel 8;	3655	IO::AIO::min_parallel 8;
3238		3656
…		…
3241	$AIO_POLL_WATCHER = Event->io (	3659	$AIO_POLL_WATCHER = Event->io (
3242	reentrant => 0,	3660	reentrant => 0,
3243	data => WF_AUTOCANCEL,	3661	data => WF_AUTOCANCEL,
3244	fd => IO::AIO::poll_fileno,	3662	fd => IO::AIO::poll_fileno,
3245	poll => 'r',	3663	poll => 'r',
3246	prio => 6,	3664	prio => 0,
3247	cb => \&IO::AIO::poll_cb,	3665	cb => \&IO::AIO::poll_cb,
3248	);	3666	);
3249	}	3667	}
3250		3668
3251	my $_log_backtrace;	3669	my $_log_backtrace;
…		…
3257		3675
3258	# limit the # of concurrent backtraces	3676	# limit the # of concurrent backtraces
3259	if ($_log_backtrace < 2) {	3677	if ($_log_backtrace < 2) {
3260	++$_log_backtrace;	3678	++$_log_backtrace;
3261	async {	3679	async {
		3680	$Coro::current->{desc} = "abt $msg";
		3681
3262	my @bt = fork_call {	3682	my @bt = fork_call {
3263	@addr = map { sprintf "%x", $_ } @addr;	3683	@addr = map { sprintf "%x", $_ } @addr;
3264	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3684	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3265	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"	3685	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"
3266	or die "addr2line: $!";	3686	or die "addr2line: $!";

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.301 by root, Tue Jul 10 07:01:51 2007 UTC vs. Revision 1.386 by root, Mon Oct 15 17:50:27 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.301 by root, Tue Jul 10 07:01:51 2007 UTC vs.
Revision 1.386 by root, Mon Oct 15 17:50:27 2007 UTC