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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.296 by root, Wed Jul 4 07:09:06 2007 UTC vs.
Revision 1.382 by root, Thu Oct 11 00:34:31 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>
…		…
1425	sub hintmode {	1559	sub hintmode {
1426	$_[0]{hintmode} = $_[1] if @_ > 1;	1560	$_[0]{hintmode} = $_[1] if @_ > 1;
1427	$_[0]{hintmode}	1561	$_[0]{hintmode}
1428	}	1562	}
1429		1563
1430	=item $player->ext_reply ($msgid, %msg)	1564	=item $player->ext_reply ($msgid, @msg)
1431		1565
1432	Sends an ext reply to the player.	1566	Sends an ext reply to the player.
1433		1567
1434	=cut	1568	=cut
1435		1569
1436	sub ext_reply($$%) {	1570	sub ext_reply($$@) {
1437	my ($self, $id, %msg) = @_;	1571	my ($self, $id, @msg) = @_;
1438		1572
1439	$msg{msgid} = $id;	1573	$self->ns->ext_reply ($id, @msg)
1440	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1441	}	1574	}
1442		1575
1443	=item $player->ext_event ($type, %msg)	1576	=item $player->ext_msg ($type, @msg)
1444		1577
1445	Sends an ext event to the client.	1578	Sends an ext event to the client.
1446		1579
1447	=cut	1580	=cut
1448		1581
1449	sub ext_event($$%) {	1582	sub ext_msg($$@) {
1450	my ($self, $type, %msg) = @_;	1583	my ($self, $type, @msg) = @_;
1451		1584
1452	$self->ns->ext_event ($type, %msg);	1585	$self->ns->ext_msg ($type, @msg);
1453	}	1586	}
1454		1587
1455	=head3 cf::region	1588	=head3 cf::region
1456		1589
1457	=over 4	1590	=over 4
…		…
1470	my ($path) = @_;	1603	my ($path) = @_;
1471		1604
1472	my ($match, $specificity);	1605	my ($match, $specificity);
1473		1606
1474	for my $region (list) {	1607	for my $region (list) {
1475	if ($region->match && $path =~ $region->match) {	1608	if ($region->{match} && $path =~ $region->{match}) {
1476	($match, $specificity) = ($region, $region->specificity)	1609	($match, $specificity) = ($region, $region->specificity)
1477	if $region->specificity > $specificity;	1610	if $region->specificity > $specificity;
1478	}	1611	}
1479	}	1612	}
1480		1613
…		…
1600	$self->init; # pass $1 etc.	1733	$self->init; # pass $1 etc.
1601	return $self;	1734	return $self;
1602	}	1735	}
1603	}	1736	}
1604		1737
1605	Carp::carp "unable to resolve path '$path' (base '$base').";	1738	Carp::cluck "unable to resolve path '$path' (base '$base').";
1606	()	1739	()
1607	}	1740	}
1608		1741
1609	sub init {	1742	sub init {
1610	my ($self) = @_;	1743	my ($self) = @_;
…		…
1673		1806
1674	sub load_header_from($) {	1807	sub load_header_from($) {
1675	my ($self, $path) = @_;	1808	my ($self, $path) = @_;
1676		1809
1677	utf8::encode $path;	1810	utf8::encode $path;
1678	#aio_open $path, O_RDONLY, 0	1811	my $f = new_from_file cf::object::thawer $path
1679	# or return;
1680
1681	$self->_load_header ($path)
1682	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;
1683		1819
1684	$self->{load_path} = $path;	1820	$self->{load_path} = $path;
1685		1821
1686	1	1822	1
1687	}	1823	}
…		…
1741	sub find {	1877	sub find {
1742	my ($path, $origin) = @_;	1878	my ($path, $origin) = @_;
1743		1879
1744	$path = normalise $path, $origin && $origin->path;	1880	$path = normalise $path, $origin && $origin->path;
1745		1881
		1882	cf::lock_wait "map_data:$path";#d#remove
1746	cf::lock_wait "map_find:$path";	1883	cf::lock_wait "map_find:$path";
1747		1884
1748	$cf::MAP{$path} \|\| do {	1885	$cf::MAP{$path} \|\| do {
1749	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
1750	my $map = new_from_path cf::map $path	1889	my $map = new_from_path cf::map $path
1751	or return;	1890	or return;
1752		1891
1753	$map->{last_save} = $cf::RUNTIME;	1892	$map->{last_save} = $cf::RUNTIME;
1754		1893
…		…
1756	or return;	1895	or return;
1757		1896
1758	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1897	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1759	# doing this can freeze the server in a sync job, obviously	1898	# doing this can freeze the server in a sync job, obviously
1760	#$cf::WAIT_FOR_TICK->wait;	1899	#$cf::WAIT_FOR_TICK->wait;
		1900	undef $guard1;
		1901	undef $guard2;
1761	$map->reset;	1902	$map->reset;
1762	undef $guard;
1763	return find $path;	1903	return find $path;
1764	}	1904	}
1765		1905
1766	$cf::MAP{$path} = $map	1906	$cf::MAP{$path} = $map
1767	}	1907	}
…		…
1776	local $self->{deny_reset} = 1; # loading can take a long time	1916	local $self->{deny_reset} = 1; # loading can take a long time
1777		1917
1778	my $path = $self->{path};	1918	my $path = $self->{path};
1779		1919
1780	{	1920	{
1781	my $guard = cf::lock_acquire "map_load:$path";	1921	my $guard = cf::lock_acquire "map_data:$path";
1782		1922
		1923	return unless $self->valid;
1783	return if $self->in_memory != cf::MAP_SWAPPED;	1924	return unless $self->in_memory == cf::MAP_SWAPPED;
1784		1925
1785	$self->in_memory (cf::MAP_LOADING);	1926	$self->in_memory (cf::MAP_LOADING);
1786		1927
1787	$self->alloc;	1928	$self->alloc;
1788		1929
1789	$self->pre_load;	1930	$self->pre_load;
1790	Coro::cede;	1931	cf::cede_to_tick;
1791		1932
		1933	my $f = new_from_file cf::object::thawer $self->{load_path};
		1934	$f->skip_block;
1792	$self->_load_objects ($self->{load_path}, 1)	1935	$self->_load_objects ($f)
1793	or return;	1936	or return;
1794		1937
1795	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1938	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1796	if delete $self->{load_original};	1939	if delete $self->{load_original};
1797		1940
1798	if (my $uniq = $self->uniq_path) {	1941	if (my $uniq = $self->uniq_path) {
1799	utf8::encode $uniq;	1942	utf8::encode $uniq;
1800	if (aio_open $uniq, O_RDONLY, 0) {	1943	unless (aio_stat $uniq) {
		1944	if (my $f = new_from_file cf::object::thawer $uniq) {
1801	$self->clear_unique_items;	1945	$self->clear_unique_items;
1802	$self->_load_objects ($uniq, 0);	1946	$self->_load_objects ($f);
		1947	$f->resolve_delayed_derefs;
		1948	}
1803	}	1949	}
1804	}	1950	}
1805		1951
1806	Coro::cede;	1952	$f->resolve_delayed_derefs;
		1953
		1954	cf::cede_to_tick;
1807	# now do the right thing for maps	1955	# now do the right thing for maps
1808	$self->link_multipart_objects;	1956	$self->link_multipart_objects;
1809	$self->difficulty ($self->estimate_difficulty)	1957	$self->difficulty ($self->estimate_difficulty)
1810	unless $self->difficulty;	1958	unless $self->difficulty;
1811	Coro::cede;	1959	cf::cede_to_tick;
1812		1960
1813	unless ($self->{deny_activate}) {	1961	unless ($self->{deny_activate}) {
1814	$self->decay_objects;	1962	$self->decay_objects;
1815	$self->fix_auto_apply;	1963	$self->fix_auto_apply;
1816	$self->update_buttons;	1964	$self->update_buttons;
1817	Coro::cede;	1965	cf::cede_to_tick;
1818	$self->set_darkness_map;	1966	$self->set_darkness_map;
1819	Coro::cede;	1967	cf::cede_to_tick;
1820	$self->activate;	1968	$self->activate;
1821	}	1969	}
		1970
		1971	$self->{last_save} = $cf::RUNTIME;
		1972	$self->last_access ($cf::RUNTIME);
1822		1973
1823	$self->in_memory (cf::MAP_IN_MEMORY);	1974	$self->in_memory (cf::MAP_IN_MEMORY);
1824	}	1975	}
1825		1976
1826	$self->post_load;	1977	$self->post_load;
…		…
1837		1988
1838	$self	1989	$self
1839	}	1990	}
1840		1991
1841	# 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
1842	sub load_diag {	1993	sub load_neighbours {
1843	my ($map) = @_;	1994	my ($map) = @_;
1844		1995
1845	my @diag; # diagonal neighbours	1996	my @neigh; # diagonal neighbours
1846		1997
1847	for (0 .. 3) {	1998	for (0 .. 3) {
1848	my $neigh = $map->tile_path ($_)	1999	my $neigh = $map->tile_path ($_)
1849	or next;	2000	or next;
1850	$neigh = find $neigh, $map	2001	$neigh = find $neigh, $map
1851	or next;	2002	or next;
1852	$neigh->load;	2003	$neigh->load;
1853		2004
		2005	push @neigh,
1854	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2006	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1855	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2007	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1856	}	2008	}
1857		2009
1858	for (@diag) {	2010	for (grep defined $_->[0], @neigh) {
		2011	my ($path, $origin) = @$_;
1859	my $neigh = find @$_	2012	my $neigh = find $path, $origin
1860	or next;	2013	or next;
1861	$neigh->load;	2014	$neigh->load;
1862	}	2015	}
1863	}	2016	}
1864		2017
…		…
1869	}	2022	}
1870		2023
1871	sub do_load_sync {	2024	sub do_load_sync {
1872	my ($map) = @_;	2025	my ($map) = @_;
1873		2026
		2027	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2028	if $Coro::current == $Coro::main;
		2029
1874	cf::sync_job { $map->load };	2030	cf::sync_job { $map->load };
1875	}	2031	}
1876		2032
1877	our %MAP_PREFETCH;	2033	our %MAP_PREFETCH;
1878	our $MAP_PREFETCHER = undef;	2034	our $MAP_PREFETCHER = undef;
1879		2035
1880	sub find_async {	2036	sub find_async {
1881	my ($path, $origin) = @_;	2037	my ($path, $origin, $load) = @_;
1882		2038
1883	$path = normalise $path, $origin && $origin->{path};	2039	$path = normalise $path, $origin && $origin->{path};
1884		2040
1885	if (my $map = $cf::MAP{$path}) {	2041	if (my $map = $cf::MAP{$path}) {
1886	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2042	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1887	}	2043	}
1888		2044
1889	undef $MAP_PREFETCH{$path};	2045	$MAP_PREFETCH{$path} \|= $load;
		2046
1890	$MAP_PREFETCHER \|\|= cf::async {	2047	$MAP_PREFETCHER \|\|= cf::async {
		2048	$Coro::current->{desc} = "map prefetcher";
		2049
1891	while (%MAP_PREFETCH) {	2050	while (%MAP_PREFETCH) {
1892	for my $path (keys %MAP_PREFETCH) {	2051	while (my ($k, $v) = each %MAP_PREFETCH) {
1893	my $map = find $path	2052	if (my $map = find $k) {
1894	or next;
1895	$map->load;	2053	$map->load if $v;
		2054	}
1896		2055
1897	delete $MAP_PREFETCH{$path};	2056	delete $MAP_PREFETCH{$k};
1898	}	2057	}
1899	}	2058	}
1900	undef $MAP_PREFETCHER;	2059	undef $MAP_PREFETCHER;
1901	};	2060	};
1902	$MAP_PREFETCHER->prio (6);	2061	$MAP_PREFETCHER->prio (6);
…		…
1905	}	2064	}
1906		2065
1907	sub save {	2066	sub save {
1908	my ($self) = @_;	2067	my ($self) = @_;
1909		2068
1910	my $lock = cf::lock_acquire "map_data:" . $self->path;	2069	my $lock = cf::lock_acquire "map_data:$self->{path}";
1911		2070
1912	$self->{last_save} = $cf::RUNTIME;	2071	$self->{last_save} = $cf::RUNTIME;
1913		2072
1914	return unless $self->dirty;	2073	return unless $self->dirty;
1915		2074
…		…
1921	return if $self->{deny_save};	2080	return if $self->{deny_save};
1922		2081
1923	local $self->{last_access} = $self->last_access;#d#	2082	local $self->{last_access} = $self->last_access;#d#
1924		2083
1925	cf::async {	2084	cf::async {
		2085	$Coro::current->{desc} = "map player save";
1926	$_->contr->save for $self->players;	2086	$_->contr->save for $self->players;
1927	};	2087	};
1928		2088
1929	if ($uniq) {	2089	if ($uniq) {
1930	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	2090	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
…		…
1938	my ($self) = @_;	2098	my ($self) = @_;
1939		2099
1940	# save first because save cedes	2100	# save first because save cedes
1941	$self->save;	2101	$self->save;
1942		2102
1943	my $lock = cf::lock_acquire "map_data:" . $self->path;	2103	my $lock = cf::lock_acquire "map_data:$self->{path}";
1944		2104
1945	return if $self->players;	2105	return if $self->players;
1946	return if $self->in_memory != cf::MAP_IN_MEMORY;	2106	return if $self->in_memory != cf::MAP_IN_MEMORY;
1947	return if $self->{deny_save};	2107	return if $self->{deny_save};
1948		2108
		2109	$self->in_memory (cf::MAP_SWAPPED);
		2110
		2111	$self->deactivate;
		2112	$_->clear_links_to ($self) for values %cf::MAP;
1949	$self->clear;	2113	$self->clear;
1950	$self->in_memory (cf::MAP_SWAPPED);
1951	}	2114	}
1952		2115
1953	sub reset_at {	2116	sub reset_at {
1954	my ($self) = @_;	2117	my ($self) = @_;
1955		2118
…		…
1987	if $uniq;	2150	if $uniq;
1988	}	2151	}
1989		2152
1990	delete $cf::MAP{$self->path};	2153	delete $cf::MAP{$self->path};
1991		2154
		2155	$self->deactivate;
		2156	$_->clear_links_to ($self) for values %cf::MAP;
1992	$self->clear;	2157	$self->clear;
1993
1994	$_->clear_links_to ($self) for values %cf::MAP;
1995		2158
1996	$self->unlink_save;	2159	$self->unlink_save;
1997	$self->destroy;	2160	$self->destroy;
1998	}	2161	}
1999		2162
2000	my $nuke_counter = "aaaa";	2163	my $nuke_counter = "aaaa";
2001		2164
2002	sub nuke {	2165	sub nuke {
2003	my ($self) = @_;	2166	my ($self) = @_;
2004		2167
		2168	{
		2169	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2170
2005	delete $cf::MAP{$self->path};	2171	delete $cf::MAP{$self->path};
2006		2172
2007	$self->unlink_save;	2173	$self->unlink_save;
2008		2174
2009	bless $self, "cf::map";	2175	bless $self, "cf::map";
2010	delete $self->{deny_reset};	2176	delete $self->{deny_reset};
2011	$self->{deny_save} = 1;	2177	$self->{deny_save} = 1;
2012	$self->reset_timeout (1);	2178	$self->reset_timeout (1);
2013	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2179	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2014		2180
2015	$cf::MAP{$self->path} = $self;	2181	$cf::MAP{$self->path} = $self;
		2182	}
2016		2183
2017	$self->reset; # polite request, might not happen	2184	$self->reset; # polite request, might not happen
2018	}	2185	}
2019		2186
2020	=item $maps = cf::map::tmp_maps	2187	=item $maps = cf::map::tmp_maps
…		…
2096		2263
2097	sub inv_recursive {	2264	sub inv_recursive {
2098	inv_recursive_ inv $_[0]	2265	inv_recursive_ inv $_[0]
2099	}	2266	}
2100		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
2101	package cf;	2296	package cf;
2102		2297
2103	=back	2298	=back
2104		2299
2105	=head3 cf::object::player	2300	=head3 cf::object::player
…		…
2127		2322
2128	} else {	2323	} else {
2129	my $pl = $self->contr;	2324	my $pl = $self->contr;
2130		2325
2131	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2326	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2132	my $diag = $pl->{npc_dialog};	2327	my $dialog = $pl->{npc_dialog};
2133	$diag->{pl}->ext_reply (	2328	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2134	$diag->{id},
2135	msgtype => "reply",
2136	msg => $diag->{pl}->expand_cfpod ($msg),
2137	add_topics => []
2138	);
2139		2329
2140	} else {	2330	} else {
2141	$msg = $npc->name . " says: $msg" if $npc;	2331	$msg = $npc->name . " says: $msg" if $npc;
2142	$self->message ($msg, $flags);	2332	$self->message ($msg, $flags);
2143	}	2333	}
2144	}	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 (@_);
2145	}	2345	}
2146		2346
2147	=item $player_object->may ("access")	2347	=item $player_object->may ("access")
2148		2348
2149	Returns wether the given player is authorized to access resource "access"	2349	Returns wether the given player is authorized to access resource "access"
…		…
2228	# use -1 or undef as default coordinates, not 0, 0	2428	# use -1 or undef as default coordinates, not 0, 0
2229	($x, $y) = ($map->enter_x, $map->enter_y)	2429	($x, $y) = ($map->enter_x, $map->enter_y)
2230	if $x <=0 && $y <= 0;	2430	if $x <=0 && $y <= 0;
2231		2431
2232	$map->load;	2432	$map->load;
2233	$map->load_diag;	2433	$map->load_neighbours;
2234		2434
2235	return unless $self->contr->active;	2435	return unless $self->contr->active;
2236	$self->activate_recursive;	2436	$self->activate_recursive;
2237		2437
2238	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2438	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2239	$self->enter_map ($map, $x, $y);	2439	$self->enter_map ($map, $x, $y);
2240	}	2440	}
2241		2441
2242	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2442	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2243		2443
2244	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
2245	her, loading and preparing them map, calling the provided $check callback	2445	her, loading and preparing them map, calling the provided $check callback
2246	that has to return the map if sucecssful, and then unfreezes the player on	2446	that has to return the map if sucecssful, and then unfreezes the player on
2247	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.
2248		2449
2249	=cut	2450	=cut
2250		2451
2251	our $GOTOGEN;	2452	our $GOTOGEN;
2252		2453
2253	sub cf::object::player::goto {	2454	sub cf::object::player::goto {
2254	my ($self, $path, $x, $y, $check) = @_;	2455	my ($self, $path, $x, $y, $check, $done) = @_;
2255		2456
2256	# 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
2257	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2458	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2258		2459
2259	$self->enter_link;	2460	$self->enter_link;
2260		2461
2261	(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
2262	my $map = eval {	2484	my $map = eval {
2263	my $map = cf::map::find $path;	2485	my $map = defined $path ? cf::map::find $path : undef;
2264		2486
2265	if ($map) {	2487	if ($map) {
2266	$map = $map->customise_for ($self);	2488	$map = $map->customise_for ($self);
2267	$map = $check->($map) if $check && $map;	2489	$map = $check->($map) if $check && $map;
2268	} else {	2490	} else {
2269	$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);
2270	}	2492	}
2271		2493
2272	$map	2494	$map
2273	};	2495	};
2274		2496
…		…
2279		2501
2280	if ($gen == $self->{_goto_generation}) {	2502	if ($gen == $self->{_goto_generation}) {
2281	delete $self->{_goto_generation};	2503	delete $self->{_goto_generation};
2282	$self->leave_link ($map, $x, $y);	2504	$self->leave_link ($map, $x, $y);
2283	}	2505	}
		2506
		2507	$done->() if $done;
2284	})->prio (1);	2508	})->prio (1);
2285	}	2509	}
2286		2510
2287	=item $player_object->enter_exit ($exit_object)	2511	=item $player_object->enter_exit ($exit_object)
2288		2512
…		…
2362	# if exit is damned, update players death & WoR home-position	2586	# if exit is damned, update players death & WoR home-position
2363	$self->contr->savebed ($slaying, $hp, $sp)	2587	$self->contr->savebed ($slaying, $hp, $sp)
2364	if $exit->flag (FLAG_DAMNED);	2588	if $exit->flag (FLAG_DAMNED);
2365		2589
2366	(async {	2590	(async {
		2591	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2592
2367	$self->deactivate_recursive; # just to be sure	2593	$self->deactivate_recursive; # just to be sure
2368	unless (eval {	2594	unless (eval {
2369	$self->goto ($slaying, $hp, $sp);	2595	$self->goto ($slaying, $hp, $sp);
2370		2596
2371	1;	2597	1;
…		…
2397		2623
2398	utf8::encode $text;	2624	utf8::encode $text;
2399	$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);
2400	}	2626	}
2401		2627
2402	=item $client->send_msg ($color, $type, $msg, [extra...])	2628	=item $client->send_msg ($channel, $msg, $color, [extra...])
2403		2629
2404	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
2405	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
2406	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
2407	the message unless the client supports the msg packet.	2633	the message unless the client supports the msg packet.
2408		2634
2409	=cut	2635	=cut
2410		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
2411	sub cf::client::send_msg {	2658	sub cf::client::send_msg {
2412	my ($self, $color, $type, $msg, @extra) = @_;	2659	my ($self, $channel, $msg, $color, @extra) = @_;
2413		2660
2414	$msg = $self->pl->expand_cfpod ($msg);	2661	$msg = $self->pl->expand_cfpod ($msg);
2415		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
2416	return unless @extra \|\| length $msg;	2685	return unless @extra \|\| length $msg;
2417		2686
2418	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
2419	$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]));
2420	} else {	2694	} else {
2421	# replace some tags by gcfclient-compatible ones
2422	for ($msg) {
2423	1 while
2424	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2425	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2426	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2427	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2428	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2429	}
2430
2431	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
2432	if (0 && $msg =~ /\[/) {	2710	if (0 && $msg =~ /\[/) {
		2711	# COMMAND/INFO
2433	$self->send_packet ("drawextinfo $color 4 0 $msg")	2712	$self->send_packet ("drawextinfo $color 10 8 $msg")
2434	} else {	2713	} else {
2435	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2714	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2436	$self->send_packet ("drawinfo $color $msg")	2715	$self->send_packet ("drawinfo $color $msg")
2437	}	2716	}
2438	}	2717	}
2439	}	2718	}
2440	}	2719	}
2441		2720
2442	=item $client->ext_event ($type, %msg)	2721	=item $client->ext_msg ($type, @msg)
2443		2722
2444	Sends an ext event to the client.	2723	Sends an ext event to the client.
2445		2724
2446	=cut	2725	=cut
2447		2726
2448	sub cf::client::ext_event($$%) {	2727	sub cf::client::ext_msg($$@) {
2449	my ($self, $type, %msg) = @_;	2728	my ($self, $type, @msg) = @_;
2450		2729
		2730	if ($self->extcmd == 2) {
		2731	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2732	} elsif ($self->extcmd == 1) { # TODO: remove
2451	$msg{msgtype} = "event_$type";	2733	push @msg, msgtype => "event_$type";
2452	$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	}
2453	}	2754	}
2454		2755
2455	=item $success = $client->query ($flags, "text", \&cb)	2756	=item $success = $client->query ($flags, "text", \&cb)
2456		2757
2457	Queues a query to the client, calling the given callback with	2758	Queues a query to the client, calling the given callback with
…		…
2512	my ($ns, $buf) = @_;	2813	my ($ns, $buf) = @_;
2513		2814
2514	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2815	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2515		2816
2516	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
2517	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2825	if (my $cb = $EXTICMD{$type}) {
2518	if (my %reply = $cb->($ns, $msg)) {	2826	@reply = $cb->($ns, @payload);
2519	$reply{msgid} = $msg->{msgid};
2520	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2521	}
2522	}	2827	}
		2828
		2829	$ns->ext_reply ($reply, @reply)
		2830	if $reply;
		2831
2523	} else {	2832	} else {
2524	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";
2525	}	2834	}
2526		2835
2527	cf::override;	2836	cf::override;
…		…
2574	our $safe = new Safe "safe";	2883	our $safe = new Safe "safe";
2575	our $safe_hole = new Safe::Hole;	2884	our $safe_hole = new Safe::Hole;
2576		2885
2577	$SIG{FPE} = 'IGNORE';	2886	$SIG{FPE} = 'IGNORE';
2578		2887
2579	$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	));
2580		2893
2581	# here we export the classes and methods available to script code	2894	# here we export the classes and methods available to script code
2582		2895
2583	=pod	2896	=pod
2584		2897
2585	The following functions and methods are available within a safe environment:	2898	The following functions and methods are available within a safe environment:
2586		2899
2587	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
2588	cf::object::player player	2904	cf::object::player
2589	cf::player peaceful	2905	player
2590	cf::map trigger	2906
		2907	cf::player
		2908	peaceful
		2909
		2910	cf::map
		2911	trigger
2591		2912
2592	=cut	2913	=cut
2593		2914
2594	for (	2915	for (
2595	["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)],
2596	["cf::object::player" => qw(player)],	2919	["cf::object::player" => qw(player)],
2597	["cf::player" => qw(peaceful)],	2920	["cf::player" => qw(peaceful)],
2598	["cf::map" => qw(trigger)],	2921	["cf::map" => qw(trigger)],
2599	) {	2922	) {
2600	no strict 'refs';	2923	no strict 'refs';
…		…
2676	# the server's init and main functions	2999	# the server's init and main functions
2677		3000
2678	sub load_facedata($) {	3001	sub load_facedata($) {
2679	my ($path) = @_;	3002	my ($path) = @_;
2680		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
2681	warn "loading facedata from $path\n";	3010	warn "loading facedata from $path\n";
2682		3011
2683	my $facedata;	3012	my $facedata;
2684	0 < aio_load $path, $facedata	3013	0 < aio_load $path, $facedata
2685	or die "$path: $!";	3014	or die "$path: $!";
…		…
2687	$facedata = Coro::Storable::thaw $facedata;	3016	$facedata = Coro::Storable::thaw $facedata;
2688		3017
2689	$facedata->{version} == 2	3018	$facedata->{version} == 2
2690	or cf::cleanup "$path: version mismatch, cannot proceed.";	3019	or cf::cleanup "$path: version mismatch, cannot proceed.";
2691		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
2692	{	3028	{
2693	my $faces = $facedata->{faceinfo};	3029	my $faces = $facedata->{faceinfo};
2694		3030
2695	while (my ($face, $info) = each %$faces) {	3031	while (my ($face, $info) = each %$faces) {
2696	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3032	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2697	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3033	cf::face::set_visibility $idx, $info->{visibility};
		3034	cf::face::set_magicmap $idx, $info->{magicmap};
2698	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3035	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2699	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3036	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2700	Coro::cede;	3037
		3038	cf::cede_to_tick;
2701	}	3039	}
2702		3040
2703	while (my ($face, $info) = each %$faces) {	3041	while (my ($face, $info) = each %$faces) {
2704	next unless $info->{smooth};	3042	next unless $info->{smooth};
2705	my $idx = cf::face::find $face	3043	my $idx = cf::face::find $face
2706	or next;	3044	or next;
2707	if (my $smooth = cf::face::find $info->{smooth}) {	3045	if (my $smooth = cf::face::find $info->{smooth}) {
		3046	cf::face::set_smooth $idx, $smooth;
2708	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3047	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2709	} else {	3048	} else {
2710	warn "smooth face '$info->{smooth}' not found for face '$face'";	3049	warn "smooth face '$info->{smooth}' not found for face '$face'";
2711	}	3050	}
2712	Coro::cede;	3051
		3052	cf::cede_to_tick;
2713	}	3053	}
2714	}	3054	}
2715		3055
2716	{	3056	{
2717	my $anims = $facedata->{animinfo};	3057	my $anims = $facedata->{animinfo};
2718		3058
2719	while (my ($anim, $info) = each %$anims) {	3059	while (my ($anim, $info) = each %$anims) {
2720	cf::anim::set $anim, $info->{frames}, $info->{facings};	3060	cf::anim::set $anim, $info->{frames}, $info->{facings};
2721	Coro::cede;	3061	cf::cede_to_tick;
2722	}	3062	}
2723		3063
2724	cf::anim::invalidate_all; # d'oh	3064	cf::anim::invalidate_all; # d'oh
2725	}	3065	}
2726		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
2727	1	3116	1
2728	}	3117	}
2729		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
2730	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
2731	load_resource_file "$MAPDIR/regions"	3132	load_resource_file "$MAPDIR/regions"
2732	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	}
2733	}	3139	}
2734		3140
2735	sub reload_facedata {	3141	sub reload_facedata {
2736	load_facedata "$DATADIR/facedata"	3142	load_facedata "$DATADIR/facedata"
2737	or die "unable to load facedata\n";	3143	or die "unable to load facedata\n";
…		…
2766		3172
2767	sub init {	3173	sub init {
2768	reload_resources;	3174	reload_resources;
2769	}	3175	}
2770		3176
2771	sub cfg_load {	3177	sub reload_config {
2772	open my $fh, "<:utf8", "$CONFDIR/config"	3178	open my $fh, "<:utf8", "$CONFDIR/config"
2773	or return;	3179	or return;
2774		3180
2775	local $/;	3181	local $/;
2776	*CFG = YAML::Syck::Load <$fh>;	3182	*CFG = YAML::Syck::Load <$fh>;
…		…
2792	sub main {	3198	sub main {
2793	# we must not ever block the main coroutine	3199	# we must not ever block the main coroutine
2794	local $Coro::idle = sub {	3200	local $Coro::idle = sub {
2795	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#
2796	(async {	3202	(async {
		3203	$Coro::current->{desc} = "IDLE BUG HANDLER";
2797	Event::one_event;	3204	Event::one_event;
2798	})->prio (Coro::PRIO_MAX);	3205	})->prio (Coro::PRIO_MAX);
2799	};	3206	};
2800		3207
2801	cfg_load;	3208	reload_config;
2802	db_init;	3209	db_init;
2803	load_extensions;	3210	load_extensions;
2804		3211
2805	$TICK_WATCHER->start;	3212	$TICK_WATCHER->start;
2806	Event::loop;	3213	Event::loop;
…		…
2873	# and maps saved/destroyed asynchronously.	3280	# and maps saved/destroyed asynchronously.
2874	warn "begin emergency player save\n";	3281	warn "begin emergency player save\n";
2875	for my $login (keys %cf::PLAYER) {	3282	for my $login (keys %cf::PLAYER) {
2876	my $pl = $cf::PLAYER{$login} or next;	3283	my $pl = $cf::PLAYER{$login} or next;
2877	$pl->valid or next;	3284	$pl->valid or next;
		3285	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2878	$pl->save;	3286	$pl->save;
2879	}	3287	}
2880	warn "end emergency player save\n";	3288	warn "end emergency player save\n";
2881		3289
2882	warn "begin emergency map save\n";	3290	warn "begin emergency map save\n";
…		…
2999	warn "reloading cf.pm";	3407	warn "reloading cf.pm";
3000	require cf;	3408	require cf;
3001	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3409	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3002		3410
3003	warn "loading config and database again";	3411	warn "loading config and database again";
3004	cf::cfg_load;	3412	cf::reload_config;
3005		3413
3006	warn "loading extensions";	3414	warn "loading extensions";
3007	cf::load_extensions;	3415	cf::load_extensions;
3008		3416
3009	warn "reattaching attachments to objects/players";	3417	warn "reattaching attachments to objects/players";
…		…
3045	register_command "reload" => sub {	3453	register_command "reload" => sub {
3046	my ($who, $arg) = @_;	3454	my ($who, $arg) = @_;
3047		3455
3048	if ($who->flag (FLAG_WIZ)) {	3456	if ($who->flag (FLAG_WIZ)) {
3049	$who->message ("reloading server.");	3457	$who->message ("reloading server.");
		3458	async {
		3459	$Coro::current->{desc} = "perl_reload";
3050	async { reload_perl };	3460	reload_perl;
		3461	};
3051	}	3462	}
3052	};	3463	};
3053		3464
3054	unshift @INC, $LIBDIR;	3465	unshift @INC, $LIBDIR;
3055		3466
…		…
3074	my $signal = new Coro::Signal;	3485	my $signal = new Coro::Signal;
3075	push @WAIT_FOR_TICK_BEGIN, $signal;	3486	push @WAIT_FOR_TICK_BEGIN, $signal;
3076	$signal->wait;	3487	$signal->wait;
3077	}	3488	}
3078		3489
3079	my $min = 1e6;#d#
3080	my $avg = 10;
3081	$TICK_WATCHER = Event->timer (	3490	$TICK_WATCHER = Event->timer (
3082	reentrant => 0,	3491	reentrant => 0,
3083	parked => 1,	3492	parked => 1,
3084	prio => 0,	3493	prio => 0,
3085	at => $NEXT_TICK \|\| $TICK,	3494	at => $NEXT_TICK \|\| $TICK,
…		…
3093		3502
3094	$NOW = $tick_start = Event::time;	3503	$NOW = $tick_start = Event::time;
3095		3504
3096	cf::server_tick; # one server iteration	3505	cf::server_tick; # one server iteration
3097		3506
3098	0 && sync_job {#d#
3099	for(1..10) {
3100	my $t = Event::time;
3101	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3102	or die;
3103
3104	$map->width (50);
3105	$map->height (50);
3106	$map->alloc;
3107	$map->_load_objects ("/tmp/x.map", 1);
3108	my $t = Event::time - $t;
3109
3110	#next unless $t < 0.0013;#d#
3111	if ($t < $min) {
3112	$min = $t;
3113	}
3114	$avg = $avg * 0.99 + $t * 0.01;
3115	}
3116	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3117	exit 0;
3118	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3119	};
3120
3121	$RUNTIME += $TICK;	3507	$RUNTIME += $TICK;
3122	$NEXT_TICK += $TICK;	3508	$NEXT_TICK += $TICK;
3123		3509
3124	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3510	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3125	$NEXT_RUNTIME_WRITE = $NOW + 10;	3511	$NEXT_RUNTIME_WRITE = $NOW + 10;
3126	Coro::async_pool {	3512	Coro::async_pool {
		3513	$Coro::current->{desc} = "runtime saver";
3127	write_runtime	3514	write_runtime
3128	or warn "ERROR: unable to write runtime file: $!";	3515	or warn "ERROR: unable to write runtime file: $!";
3129	};	3516	};
3130	}	3517	}
3131		3518
3132	# my $AFTER = Event::time;
3133	# warn $AFTER - $NOW;#d#
3134
3135	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3519	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3136	$sig->send;	3520	$sig->send;
3137	}	3521	}
3138	while (my $sig = shift @WAIT_FOR_TICK) {	3522	while (my $sig = shift @WAIT_FOR_TICK) {
3139	$sig->send;	3523	$sig->send;
…		…
3149		3533
3150	$LOAD = ($NOW - $tick_start) / $TICK;	3534	$LOAD = ($NOW - $tick_start) / $TICK;
3151	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3535	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3152		3536
3153	_post_tick;	3537	_post_tick;
3154
3155
3156	},	3538	},
3157	);	3539	);
3158		3540
3159	{	3541	{
		3542	BDB::min_parallel 8;
3160	BDB::max_poll_time $TICK * 0.1;	3543	BDB::max_poll_time $TICK * 0.1;
3161	$BDB_POLL_WATCHER = Event->io (	3544	$BDB_POLL_WATCHER = Event->io (
3162	reentrant => 0,	3545	reentrant => 0,
3163	fd => BDB::poll_fileno,	3546	fd => BDB::poll_fileno,
3164	poll => 'r',	3547	poll => 'r',
3165	prio => 0,	3548	prio => 0,
3166	data => WF_AUTOCANCEL,	3549	data => WF_AUTOCANCEL,
3167	cb => \&BDB::poll_cb,	3550	cb => \&BDB::poll_cb,
3168	);	3551	);
3169	BDB::min_parallel 8;
3170		3552
3171	BDB::set_sync_prepare {	3553	BDB::set_sync_prepare {
3172	my $status;	3554	my $status;
3173	my $current = $Coro::current;	3555	my $current = $Coro::current;
3174	(	3556	(
…		…
3183	)	3565	)
3184	};	3566	};
3185		3567
3186	unless ($DB_ENV) {	3568	unless ($DB_ENV) {
3187	$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);
3188		3574
3189	cf::sync_job {	3575	cf::sync_job {
3190	eval {	3576	eval {
3191	BDB::db_env_open	3577	BDB::db_env_open
3192	$DB_ENV,	3578	$DB_ENV,
…		…
3194	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
3195	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3581	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3196	0666;	3582	0666;
3197		3583
3198	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3584	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3199
3200	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
3201	$DB_ENV->set_lk_detect;
3202	};	3585	};
3203		3586
3204	cf::cleanup "db_env_open(db): $@" if $@;	3587	cf::cleanup "db_env_open(db): $@" if $@;
3205	};	3588	};
3206	}	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	);
3207	}	3621	}
3208		3622
3209	{	3623	{
3210	IO::AIO::min_parallel 8;	3624	IO::AIO::min_parallel 8;
3211		3625
…		…
3214	$AIO_POLL_WATCHER = Event->io (	3628	$AIO_POLL_WATCHER = Event->io (
3215	reentrant => 0,	3629	reentrant => 0,
3216	data => WF_AUTOCANCEL,	3630	data => WF_AUTOCANCEL,
3217	fd => IO::AIO::poll_fileno,	3631	fd => IO::AIO::poll_fileno,
3218	poll => 'r',	3632	poll => 'r',
3219	prio => 6,	3633	prio => 0,
3220	cb => \&IO::AIO::poll_cb,	3634	cb => \&IO::AIO::poll_cb,
3221	);	3635	);
3222	}	3636	}
3223		3637
3224	my $_log_backtrace;	3638	my $_log_backtrace;
…		…
3230		3644
3231	# limit the # of concurrent backtraces	3645	# limit the # of concurrent backtraces
3232	if ($_log_backtrace < 2) {	3646	if ($_log_backtrace < 2) {
3233	++$_log_backtrace;	3647	++$_log_backtrace;
3234	async {	3648	async {
		3649	$Coro::current->{desc} = "abt $msg";
		3650
3235	my @bt = fork_call {	3651	my @bt = fork_call {
3236	@addr = map { sprintf "%x", $_ } @addr;	3652	@addr = map { sprintf "%x", $_ } @addr;
3237	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3653	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3238	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 \|"
3239	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.296 by root, Wed Jul 4 07:09:06 2007 UTC vs. Revision 1.382 by root, Thu Oct 11 00:34:31 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.296 by root, Wed Jul 4 07:09:06 2007 UTC vs.
Revision 1.382 by root, Thu Oct 11 00:34:31 2007 UTC