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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.300 by root, Tue Jul 10 06:44:29 2007 UTC vs.
Revision 1.384 by root, Fri Oct 12 18:17:16 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
…		…
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
		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	}
916		982
917	sub reattach {	983	sub reattach {
918	# basically do the same as instantiate, without calling instantiate	984	# basically do the same as instantiate, without calling instantiate
919	my ($obj) = @_;	985	my ($obj) = @_;
920		986
…		…
967	sub object_freezer_save {	1033	sub object_freezer_save {
968	my ($filename, $rdata, $objs) = @_;	1034	my ($filename, $rdata, $objs) = @_;
969		1035
970	sync_job {	1036	sync_job {
971	if (length $$rdata) {	1037	if (length $$rdata) {
		1038	utf8::decode (my $decname = $filename);
972	warn sprintf "saving %s (%d,%d)\n",	1039	warn sprintf "saving %s (%d,%d)\n",
973	$filename, length $$rdata, scalar @$objs;	1040	$decname, length $$rdata, scalar @$objs;
974		1041
975	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1042	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
976	chmod SAVE_MODE, $fh;	1043	chmod SAVE_MODE, $fh;
977	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1044	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
978	aio_fsync $fh if $cf::USE_FSYNC;	1045	aio_fsync $fh if $cf::USE_FSYNC;
979	close $fh;	1046	close $fh;
980		1047
981	if (@$objs) {	1048	if (@$objs) {
982	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) {
983	chmod SAVE_MODE, $fh;	1050	chmod SAVE_MODE, $fh;
984	my $data = Storable::nfreeze { version => 1, objs => $objs };	1051	my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
985	aio_write $fh, 0, (length $data), $data, 0;	1052	aio_write $fh, 0, (length $data), $data, 0;
986	aio_fsync $fh if $cf::USE_FSYNC;	1053	aio_fsync $fh if $cf::USE_FSYNC;
987	close $fh;	1054	close $fh;
988	aio_rename "$filename.pst~", "$filename.pst";	1055	aio_rename "$filename.pst~", "$filename.pst";
989	}	1056	}
…		…
997	}	1064	}
998	} else {	1065	} else {
999	aio_unlink $filename;	1066	aio_unlink $filename;
1000	aio_unlink "$filename.pst";	1067	aio_unlink "$filename.pst";
1001	}	1068	}
1002	}	1069	};
1003	}	1070	}
1004		1071
1005	sub object_freezer_as_string {	1072	sub object_freezer_as_string {
1006	my ($rdata, $objs) = @_;	1073	my ($rdata, $objs) = @_;
1007		1074
…		…
1019	or return;	1086	or return;
1020		1087
1021	unless (aio_stat "$filename.pst") {	1088	unless (aio_stat "$filename.pst") {
1022	(aio_load "$filename.pst", $av) >= 0	1089	(aio_load "$filename.pst", $av) >= 0
1023	or return;	1090	or return;
1024	$av = eval { (Storable::thaw $av)->{objs} };
1025	}
1026		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);
1027	warn sprintf "loading %s (%d)\n",	1098	warn sprintf "loading %s (%d,%d)\n",
1028	$filename, length $data, scalar @{$av \|\| []};	1099	$decname, length $data, scalar @{$av \|\| []};
		1100
1029	return ($data, $av);	1101	($data, $av)
1030	}	1102	}
1031		1103
1032	=head2 COMMAND CALLBACKS	1104	=head2 COMMAND CALLBACKS
1033		1105
1034	=over 4	1106	=over 4
…		…
1107	my ($pl, $buf) = @_;	1179	my ($pl, $buf) = @_;
1108		1180
1109	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1181	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1110		1182
1111	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
1112	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1191	if (my $cb = $EXTCMD{$type}) {
1113	if (my %reply = $cb->($pl, $msg)) {	1192	@reply = $cb->($pl, @payload);
1114	$pl->ext_reply ($msg->{msgid}, %reply);
1115	}
1116	}	1193	}
		1194
		1195	$pl->ext_reply ($reply, @reply)
		1196	if $reply;
		1197
1117	} else {	1198	} else {
1118	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1199	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1119	}	1200	}
1120		1201
1121	cf::override;	1202	cf::override;
…		…
1211		1292
1212	=head3 cf::player	1293	=head3 cf::player
1213		1294
1214	=over 4	1295	=over 4
1215		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
1216	=item cf::player::find $login	1311	=item cf::player::find $login
1217		1312
1218	Returns the given player object, loading it if necessary (might block).	1313	Returns the given player object, loading it if necessary (might block).
1219		1314
1220	=cut	1315	=cut
…		…
1255	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1350	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1256	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1351	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1257	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1352	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1258	aio_unlink +(playerdir $login) . "/$login.pl";	1353	aio_unlink +(playerdir $login) . "/$login.pl";
1259		1354
1260	my $pl = load_pl path $login	1355	my $f = new_from_file cf::object::thawer path $login
1261	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;
1262	$cf::PLAYER{$login} = $pl	1362	$cf::PLAYER{$login} = $pl
1263	}	1363	}
1264	}	1364	}
1265	}	1365	}
1266		1366
…		…
1276		1376
1277	aio_mkdir playerdir $pl, 0770;	1377	aio_mkdir playerdir $pl, 0770;
1278	$pl->{last_save} = $cf::RUNTIME;	1378	$pl->{last_save} = $cf::RUNTIME;
1279		1379
1280	$pl->save_pl ($path);	1380	$pl->save_pl ($path);
1281	Coro::cede;	1381	cf::cede_to_tick;
1282	}	1382	}
1283		1383
1284	sub new($) {	1384	sub new($) {
1285	my ($login) = @_;	1385	my ($login) = @_;
1286		1386
…		…
1290	$self->{deny_save} = 1;	1390	$self->{deny_save} = 1;
1291		1391
1292	$cf::PLAYER{$login} = $self;	1392	$cf::PLAYER{$login} = $self;
1293		1393
1294	$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 (@_);
1295	}	1405	}
1296		1406
1297	=item $pl->quit_character	1407	=item $pl->quit_character
1298		1408
1299	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
…		…
1354	or return [];	1464	or return [];
1355		1465
1356	my @logins;	1466	my @logins;
1357		1467
1358	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") {
1359	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1473	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1360	aio_read $fh, 0, 512, my $buf, 0 or next;	1474	aio_read $fh, 0, 512, my $buf, 0 or next;
1361	$buf !~ /^password -------------$/m or next; # official not-valid tag	1475	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1476	}
1362		1477
1363	utf8::decode $login;	1478	utf8::decode $login;
1364	push @logins, $login;	1479	push @logins, $login;
1365	}	1480	}
1366		1481
…		…
1404	sub expand_cfpod {	1519	sub expand_cfpod {
1405	((my $self), (local $_)) = @_;	1520	((my $self), (local $_)) = @_;
1406		1521
1407	# escape & and <	1522	# escape & and <
1408	s/&/&/g;	1523	s/&/&/g;
1409	s/(?<![BIUGH])</</g;	1524	s/(?<![BIUGHT])</</g;
1410		1525
1411	# 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
1412		1527
1413	1 while	1528	1 while
1414	# replace B<>, I<>, U<> etc.	1529	# replace B<>, I<>, U<> etc.
1415	s/B<([^\>]*)>/<b>$1<\/b>/	1530	s/B<([^\>]*)>/<b>$1<\/b>/
1416	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1531	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1417	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1532	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1533	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1418	# replace G<male\|female> tags	1534	# replace G<male\|female> tags
1419	\|\| s{G<([^>\|])\\|([^>])>}{	1535	\|\| s{G<([^>\|])\\|([^>])>}{
1420	$self->gender ? $2 : $1	1536	$self->gender ? $2 : $1
1421	}ge	1537	}ge
1422	# replace H<hint text>	1538	# replace H<hint text>
…		…
1435	s/\s+\n/\n/g; # ws line-ends	1551	s/\s+\n/\n/g; # ws line-ends
1436	s/\n\n+/\n/g; # double lines	1552	s/\n\n+/\n/g; # double lines
1437	s/^\n+//; # beginning lines	1553	s/^\n+//; # beginning lines
1438	s/\n+$//; # ending lines	1554	s/\n+$//; # ending lines
1439		1555
1440	warn $_;#d#
1441	$_	1556	$_
1442	}	1557	}
1443		1558
1444	sub hintmode {	1559	sub hintmode {
1445	$_[0]{hintmode} = $_[1] if @_ > 1;	1560	$_[0]{hintmode} = $_[1] if @_ > 1;
1446	$_[0]{hintmode}	1561	$_[0]{hintmode}
1447	}	1562	}
1448		1563
1449	=item $player->ext_reply ($msgid, %msg)	1564	=item $player->ext_reply ($msgid, @msg)
1450		1565
1451	Sends an ext reply to the player.	1566	Sends an ext reply to the player.
1452		1567
1453	=cut	1568	=cut
1454		1569
1455	sub ext_reply($$%) {	1570	sub ext_reply($$@) {
1456	my ($self, $id, %msg) = @_;	1571	my ($self, $id, @msg) = @_;
1457		1572
1458	$msg{msgid} = $id;	1573	$self->ns->ext_reply ($id, @msg)
1459	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460	}	1574	}
1461		1575
1462	=item $player->ext_event ($type, %msg)	1576	=item $player->ext_msg ($type, @msg)
1463		1577
1464	Sends an ext event to the client.	1578	Sends an ext event to the client.
1465		1579
1466	=cut	1580	=cut
1467		1581
1468	sub ext_event($$%) {	1582	sub ext_msg($$@) {
1469	my ($self, $type, %msg) = @_;	1583	my ($self, $type, @msg) = @_;
1470		1584
1471	$self->ns->ext_event ($type, %msg);	1585	$self->ns->ext_msg ($type, @msg);
1472	}	1586	}
1473		1587
1474	=head3 cf::region	1588	=head3 cf::region
1475		1589
1476	=over 4	1590	=over 4
…		…
1489	my ($path) = @_;	1603	my ($path) = @_;
1490		1604
1491	my ($match, $specificity);	1605	my ($match, $specificity);
1492		1606
1493	for my $region (list) {	1607	for my $region (list) {
1494	if ($region->match && $path =~ $region->match) {	1608	if ($region->{match} && $path =~ $region->{match}) {
1495	($match, $specificity) = ($region, $region->specificity)	1609	($match, $specificity) = ($region, $region->specificity)
1496	if $region->specificity > $specificity;	1610	if $region->specificity > $specificity;
1497	}	1611	}
1498	}	1612	}
1499		1613
…		…
1619	$self->init; # pass $1 etc.	1733	$self->init; # pass $1 etc.
1620	return $self;	1734	return $self;
1621	}	1735	}
1622	}	1736	}
1623		1737
1624	Carp::carp "unable to resolve path '$path' (base '$base').";	1738	Carp::cluck "unable to resolve path '$path' (base '$base').";
1625	()	1739	()
1626	}	1740	}
1627		1741
1628	sub init {	1742	sub init {
1629	my ($self) = @_;	1743	my ($self) = @_;
…		…
1692		1806
1693	sub load_header_from($) {	1807	sub load_header_from($) {
1694	my ($self, $path) = @_;	1808	my ($self, $path) = @_;
1695		1809
1696	utf8::encode $path;	1810	utf8::encode $path;
1697	#aio_open $path, O_RDONLY, 0	1811	my $f = new_from_file cf::object::thawer $path
1698	# or return;
1699
1700	$self->_load_header ($path)
1701	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;
1702		1819
1703	$self->{load_path} = $path;	1820	$self->{load_path} = $path;
1704		1821
1705	1	1822	1
1706	}	1823	}
…		…
1760	sub find {	1877	sub find {
1761	my ($path, $origin) = @_;	1878	my ($path, $origin) = @_;
1762		1879
1763	$path = normalise $path, $origin && $origin->path;	1880	$path = normalise $path, $origin && $origin->path;
1764		1881
		1882	cf::lock_wait "map_data:$path";#d#remove
1765	cf::lock_wait "map_find:$path";	1883	cf::lock_wait "map_find:$path";
1766		1884
1767	$cf::MAP{$path} \|\| do {	1885	$cf::MAP{$path} \|\| do {
1768	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
1769	my $map = new_from_path cf::map $path	1889	my $map = new_from_path cf::map $path
1770	or return;	1890	or return;
1771		1891
1772	$map->{last_save} = $cf::RUNTIME;	1892	$map->{last_save} = $cf::RUNTIME;
1773		1893
…		…
1775	or return;	1895	or return;
1776		1896
1777	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1897	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778	# doing this can freeze the server in a sync job, obviously	1898	# doing this can freeze the server in a sync job, obviously
1779	#$cf::WAIT_FOR_TICK->wait;	1899	#$cf::WAIT_FOR_TICK->wait;
		1900	undef $guard1;
		1901	undef $guard2;
1780	$map->reset;	1902	$map->reset;
1781	undef $guard;
1782	return find $path;	1903	return find $path;
1783	}	1904	}
1784		1905
1785	$cf::MAP{$path} = $map	1906	$cf::MAP{$path} = $map
1786	}	1907	}
…		…
1795	local $self->{deny_reset} = 1; # loading can take a long time	1916	local $self->{deny_reset} = 1; # loading can take a long time
1796		1917
1797	my $path = $self->{path};	1918	my $path = $self->{path};
1798		1919
1799	{	1920	{
1800	my $guard = cf::lock_acquire "map_load:$path";	1921	my $guard = cf::lock_acquire "map_data:$path";
1801		1922
		1923	return unless $self->valid;
1802	return if $self->in_memory != cf::MAP_SWAPPED;	1924	return unless $self->in_memory == cf::MAP_SWAPPED;
1803		1925
1804	$self->in_memory (cf::MAP_LOADING);	1926	$self->in_memory (cf::MAP_LOADING);
1805		1927
1806	$self->alloc;	1928	$self->alloc;
1807		1929
1808	$self->pre_load;	1930	$self->pre_load;
1809	Coro::cede;	1931	cf::cede_to_tick;
1810		1932
		1933	my $f = new_from_file cf::object::thawer $self->{load_path};
		1934	$f->skip_block;
1811	$self->_load_objects ($self->{load_path}, 1)	1935	$self->_load_objects ($f)
1812	or return;	1936	or return;
1813		1937
1814	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1938	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1815	if delete $self->{load_original};	1939	if delete $self->{load_original};
1816		1940
1817	if (my $uniq = $self->uniq_path) {	1941	if (my $uniq = $self->uniq_path) {
1818	utf8::encode $uniq;	1942	utf8::encode $uniq;
1819	if (aio_open $uniq, O_RDONLY, 0) {	1943	unless (aio_stat $uniq) {
		1944	if (my $f = new_from_file cf::object::thawer $uniq) {
1820	$self->clear_unique_items;	1945	$self->clear_unique_items;
1821	$self->_load_objects ($uniq, 0);	1946	$self->_load_objects ($f);
		1947	$f->resolve_delayed_derefs;
		1948	}
1822	}	1949	}
1823	}	1950	}
1824		1951
1825	Coro::cede;	1952	$f->resolve_delayed_derefs;
		1953
		1954	cf::cede_to_tick;
1826	# now do the right thing for maps	1955	# now do the right thing for maps
1827	$self->link_multipart_objects;	1956	$self->link_multipart_objects;
1828	$self->difficulty ($self->estimate_difficulty)	1957	$self->difficulty ($self->estimate_difficulty)
1829	unless $self->difficulty;	1958	unless $self->difficulty;
1830	Coro::cede;	1959	cf::cede_to_tick;
1831		1960
1832	unless ($self->{deny_activate}) {	1961	unless ($self->{deny_activate}) {
1833	$self->decay_objects;	1962	$self->decay_objects;
1834	$self->fix_auto_apply;	1963	$self->fix_auto_apply;
1835	$self->update_buttons;	1964	$self->update_buttons;
1836	Coro::cede;	1965	cf::cede_to_tick;
1837	$self->set_darkness_map;	1966	$self->set_darkness_map;
1838	Coro::cede;	1967	cf::cede_to_tick;
1839	$self->activate;	1968	$self->activate;
1840	}	1969	}
		1970
		1971	$self->{last_save} = $cf::RUNTIME;
		1972	$self->last_access ($cf::RUNTIME);
1841		1973
1842	$self->in_memory (cf::MAP_IN_MEMORY);	1974	$self->in_memory (cf::MAP_IN_MEMORY);
1843	}	1975	}
1844		1976
1845	$self->post_load;	1977	$self->post_load;
…		…
1856		1988
1857	$self	1989	$self
1858	}	1990	}
1859		1991
1860	# 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
1861	sub load_diag {	1993	sub load_neighbours {
1862	my ($map) = @_;	1994	my ($map) = @_;
1863		1995
1864	my @diag; # diagonal neighbours	1996	my @neigh; # diagonal neighbours
1865		1997
1866	for (0 .. 3) {	1998	for (0 .. 3) {
1867	my $neigh = $map->tile_path ($_)	1999	my $neigh = $map->tile_path ($_)
1868	or next;	2000	or next;
1869	$neigh = find $neigh, $map	2001	$neigh = find $neigh, $map
1870	or next;	2002	or next;
1871	$neigh->load;	2003	$neigh->load;
1872		2004
		2005	push @neigh,
1873	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2006	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1874	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2007	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1875	}	2008	}
1876		2009
1877	for (@diag) {	2010	for (grep defined $_->[0], @neigh) {
		2011	my ($path, $origin) = @$_;
1878	my $neigh = find @$_	2012	my $neigh = find $path, $origin
1879	or next;	2013	or next;
1880	$neigh->load;	2014	$neigh->load;
1881	}	2015	}
1882	}	2016	}
1883		2017
…		…
1888	}	2022	}
1889		2023
1890	sub do_load_sync {	2024	sub do_load_sync {
1891	my ($map) = @_;	2025	my ($map) = @_;
1892		2026
		2027	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2028	if $Coro::current == $Coro::main;
		2029
1893	cf::sync_job { $map->load };	2030	cf::sync_job { $map->load };
1894	}	2031	}
1895		2032
1896	our %MAP_PREFETCH;	2033	our %MAP_PREFETCH;
1897	our $MAP_PREFETCHER = undef;	2034	our $MAP_PREFETCHER = undef;
1898		2035
1899	sub find_async {	2036	sub find_async {
1900	my ($path, $origin) = @_;	2037	my ($path, $origin, $load) = @_;
1901		2038
1902	$path = normalise $path, $origin && $origin->{path};	2039	$path = normalise $path, $origin && $origin->{path};
1903		2040
1904	if (my $map = $cf::MAP{$path}) {	2041	if (my $map = $cf::MAP{$path}) {
1905	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2042	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1906	}	2043	}
1907		2044
1908	undef $MAP_PREFETCH{$path};	2045	$MAP_PREFETCH{$path} \|= $load;
		2046
1909	$MAP_PREFETCHER \|\|= cf::async {	2047	$MAP_PREFETCHER \|\|= cf::async {
		2048	$Coro::current->{desc} = "map prefetcher";
		2049
1910	while (%MAP_PREFETCH) {	2050	while (%MAP_PREFETCH) {
1911	for my $path (keys %MAP_PREFETCH) {	2051	while (my ($k, $v) = each %MAP_PREFETCH) {
1912	my $map = find $path	2052	if (my $map = find $k) {
1913	or next;
1914	$map->load;	2053	$map->load if $v;
		2054	}
1915		2055
1916	delete $MAP_PREFETCH{$path};	2056	delete $MAP_PREFETCH{$k};
1917	}	2057	}
1918	}	2058	}
1919	undef $MAP_PREFETCHER;	2059	undef $MAP_PREFETCHER;
1920	};	2060	};
1921	$MAP_PREFETCHER->prio (6);	2061	$MAP_PREFETCHER->prio (6);
…		…
1924	}	2064	}
1925		2065
1926	sub save {	2066	sub save {
1927	my ($self) = @_;	2067	my ($self) = @_;
1928		2068
1929	my $lock = cf::lock_acquire "map_data:" . $self->path;	2069	my $lock = cf::lock_acquire "map_data:$self->{path}";
1930		2070
1931	$self->{last_save} = $cf::RUNTIME;	2071	$self->{last_save} = $cf::RUNTIME;
1932		2072
1933	return unless $self->dirty;	2073	return unless $self->dirty;
1934		2074
…		…
1940	return if $self->{deny_save};	2080	return if $self->{deny_save};
1941		2081
1942	local $self->{last_access} = $self->last_access;#d#	2082	local $self->{last_access} = $self->last_access;#d#
1943		2083
1944	cf::async {	2084	cf::async {
		2085	$Coro::current->{desc} = "map player save";
1945	$_->contr->save for $self->players;	2086	$_->contr->save for $self->players;
1946	};	2087	};
1947		2088
1948	if ($uniq) {	2089	if ($uniq) {
1949	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	2090	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
…		…
1957	my ($self) = @_;	2098	my ($self) = @_;
1958		2099
1959	# save first because save cedes	2100	# save first because save cedes
1960	$self->save;	2101	$self->save;
1961		2102
1962	my $lock = cf::lock_acquire "map_data:" . $self->path;	2103	my $lock = cf::lock_acquire "map_data:$self->{path}";
1963		2104
1964	return if $self->players;	2105	return if $self->players;
1965	return if $self->in_memory != cf::MAP_IN_MEMORY;	2106	return if $self->in_memory != cf::MAP_IN_MEMORY;
1966	return if $self->{deny_save};	2107	return if $self->{deny_save};
1967		2108
		2109	$self->in_memory (cf::MAP_SWAPPED);
		2110
		2111	$self->deactivate;
		2112	$_->clear_links_to ($self) for values %cf::MAP;
1968	$self->clear;	2113	$self->clear;
1969	$self->in_memory (cf::MAP_SWAPPED);
1970	}	2114	}
1971		2115
1972	sub reset_at {	2116	sub reset_at {
1973	my ($self) = @_;	2117	my ($self) = @_;
1974		2118
…		…
2006	if $uniq;	2150	if $uniq;
2007	}	2151	}
2008		2152
2009	delete $cf::MAP{$self->path};	2153	delete $cf::MAP{$self->path};
2010		2154
		2155	$self->deactivate;
		2156	$_->clear_links_to ($self) for values %cf::MAP;
2011	$self->clear;	2157	$self->clear;
2012
2013	$_->clear_links_to ($self) for values %cf::MAP;
2014		2158
2015	$self->unlink_save;	2159	$self->unlink_save;
2016	$self->destroy;	2160	$self->destroy;
2017	}	2161	}
2018		2162
2019	my $nuke_counter = "aaaa";	2163	my $nuke_counter = "aaaa";
2020		2164
2021	sub nuke {	2165	sub nuke {
2022	my ($self) = @_;	2166	my ($self) = @_;
2023		2167
		2168	{
		2169	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2170
2024	delete $cf::MAP{$self->path};	2171	delete $cf::MAP{$self->path};
2025		2172
2026	$self->unlink_save;	2173	$self->unlink_save;
2027		2174
2028	bless $self, "cf::map";	2175	bless $self, "cf::map";
2029	delete $self->{deny_reset};	2176	delete $self->{deny_reset};
2030	$self->{deny_save} = 1;	2177	$self->{deny_save} = 1;
2031	$self->reset_timeout (1);	2178	$self->reset_timeout (1);
2032	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2179	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033		2180
2034	$cf::MAP{$self->path} = $self;	2181	$cf::MAP{$self->path} = $self;
		2182	}
2035		2183
2036	$self->reset; # polite request, might not happen	2184	$self->reset; # polite request, might not happen
2037	}	2185	}
2038		2186
2039	=item $maps = cf::map::tmp_maps	2187	=item $maps = cf::map::tmp_maps
…		…
2115		2263
2116	sub inv_recursive {	2264	sub inv_recursive {
2117	inv_recursive_ inv $_[0]	2265	inv_recursive_ inv $_[0]
2118	}	2266	}
2119		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
2120	package cf;	2296	package cf;
2121		2297
2122	=back	2298	=back
2123		2299
2124	=head3 cf::object::player	2300	=head3 cf::object::player
…		…
2146		2322
2147	} else {	2323	} else {
2148	my $pl = $self->contr;	2324	my $pl = $self->contr;
2149		2325
2150	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2326	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151	my $diag = $pl->{npc_dialog};	2327	my $dialog = $pl->{npc_dialog};
2152	$diag->{pl}->ext_reply (	2328	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153	$diag->{id},
2154	msgtype => "reply",
2155	msg => $diag->{pl}->expand_cfpod ($msg),
2156	add_topics => []
2157	);
2158		2329
2159	} else {	2330	} else {
2160	$msg = $npc->name . " says: $msg" if $npc;	2331	$msg = $npc->name . " says: $msg" if $npc;
2161	$self->message ($msg, $flags);	2332	$self->message ($msg, $flags);
2162	}	2333	}
2163	}	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 (@_);
2164	}	2345	}
2165		2346
2166	=item $player_object->may ("access")	2347	=item $player_object->may ("access")
2167		2348
2168	Returns wether the given player is authorized to access resource "access"	2349	Returns wether the given player is authorized to access resource "access"
…		…
2247	# use -1 or undef as default coordinates, not 0, 0	2428	# use -1 or undef as default coordinates, not 0, 0
2248	($x, $y) = ($map->enter_x, $map->enter_y)	2429	($x, $y) = ($map->enter_x, $map->enter_y)
2249	if $x <=0 && $y <= 0;	2430	if $x <=0 && $y <= 0;
2250		2431
2251	$map->load;	2432	$map->load;
2252	$map->load_diag;	2433	$map->load_neighbours;
2253		2434
2254	return unless $self->contr->active;	2435	return unless $self->contr->active;
2255	$self->activate_recursive;	2436	$self->activate_recursive;
2256		2437
2257	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2438	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258	$self->enter_map ($map, $x, $y);	2439	$self->enter_map ($map, $x, $y);
2259	}	2440	}
2260		2441
2261	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2442	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262		2443
2263	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
2264	her, loading and preparing them map, calling the provided $check callback	2445	her, loading and preparing them map, calling the provided $check callback
2265	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
2266	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.
2267		2449
2268	=cut	2450	=cut
2269		2451
2270	our $GOTOGEN;	2452	our $GOTOGEN;
2271		2453
2272	sub cf::object::player::goto {	2454	sub cf::object::player::goto {
2273	my ($self, $path, $x, $y, $check) = @_;	2455	my ($self, $path, $x, $y, $check, $done) = @_;
2274		2456
2275	# 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
2276	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2458	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277		2459
2278	$self->enter_link;	2460	$self->enter_link;
2279		2461
2280	(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
2281	my $map = eval {	2484	my $map = eval {
2282	my $map = cf::map::find $path;	2485	my $map = defined $path ? cf::map::find $path : undef;
2283		2486
2284	if ($map) {	2487	if ($map) {
2285	$map = $map->customise_for ($self);	2488	$map = $map->customise_for ($self);
2286	$map = $check->($map) if $check && $map;	2489	$map = $check->($map) if $check && $map;
2287	} else {	2490	} else {
2288	$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);
2289	}	2492	}
2290		2493
2291	$map	2494	$map
2292	};	2495	};
2293		2496
…		…
2298		2501
2299	if ($gen == $self->{_goto_generation}) {	2502	if ($gen == $self->{_goto_generation}) {
2300	delete $self->{_goto_generation};	2503	delete $self->{_goto_generation};
2301	$self->leave_link ($map, $x, $y);	2504	$self->leave_link ($map, $x, $y);
2302	}	2505	}
		2506
		2507	$done->() if $done;
2303	})->prio (1);	2508	})->prio (1);
2304	}	2509	}
2305		2510
2306	=item $player_object->enter_exit ($exit_object)	2511	=item $player_object->enter_exit ($exit_object)
2307		2512
…		…
2381	# if exit is damned, update players death & WoR home-position	2586	# if exit is damned, update players death & WoR home-position
2382	$self->contr->savebed ($slaying, $hp, $sp)	2587	$self->contr->savebed ($slaying, $hp, $sp)
2383	if $exit->flag (FLAG_DAMNED);	2588	if $exit->flag (FLAG_DAMNED);
2384		2589
2385	(async {	2590	(async {
		2591	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2592
2386	$self->deactivate_recursive; # just to be sure	2593	$self->deactivate_recursive; # just to be sure
2387	unless (eval {	2594	unless (eval {
2388	$self->goto ($slaying, $hp, $sp);	2595	$self->goto ($slaying, $hp, $sp);
2389		2596
2390	1;	2597	1;
…		…
2416		2623
2417	utf8::encode $text;	2624	utf8::encode $text;
2418	$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);
2419	}	2626	}
2420		2627
2421	=item $client->send_msg ($color, $type, $msg, [extra...])	2628	=item $client->send_msg ($channel, $msg, $color, [extra...])
2422		2629
2423	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
2424	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
2425	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
2426	the message unless the client supports the msg packet.	2633	the message unless the client supports the msg packet.
2427		2634
2428	=cut	2635	=cut
2429		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
2430	sub cf::client::send_msg {	2658	sub cf::client::send_msg {
2431	my ($self, $color, $type, $msg, @extra) = @_;	2659	my ($self, $channel, $msg, $color, @extra) = @_;
2432		2660
2433	$msg = $self->pl->expand_cfpod ($msg);	2661	$msg = $self->pl->expand_cfpod ($msg);
2434		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
2435	return unless @extra \|\| length $msg;	2685	return unless @extra \|\| length $msg;
2436		2686
2437	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
2438	$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]));
2439	} else {	2694	} else {
2440	# replace some tags by gcfclient-compatible ones
2441	for ($msg) {
2442	1 while
2443	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448	}
2449
2450	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
2451	if (0 && $msg =~ /\[/) {	2710	if (0 && $msg =~ /\[/) {
		2711	# COMMAND/INFO
2452	$self->send_packet ("drawextinfo $color 4 0 $msg")	2712	$self->send_packet ("drawextinfo $color 10 8 $msg")
2453	} else {	2713	} else {
2454	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2714	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2455	$self->send_packet ("drawinfo $color $msg")	2715	$self->send_packet ("drawinfo $color $msg")
2456	}	2716	}
2457	}	2717	}
2458	}	2718	}
2459	}	2719	}
2460		2720
2461	=item $client->ext_event ($type, %msg)	2721	=item $client->ext_msg ($type, @msg)
2462		2722
2463	Sends an ext event to the client.	2723	Sends an ext event to the client.
2464		2724
2465	=cut	2725	=cut
2466		2726
2467	sub cf::client::ext_event($$%) {	2727	sub cf::client::ext_msg($$@) {
2468	my ($self, $type, %msg) = @_;	2728	my ($self, $type, @msg) = @_;
2469		2729
		2730	if ($self->extcmd == 2) {
		2731	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2732	} elsif ($self->extcmd == 1) { # TODO: remove
2470	$msg{msgtype} = "event_$type";	2733	push @msg, msgtype => "event_$type";
2471	$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	}
2472	}	2754	}
2473		2755
2474	=item $success = $client->query ($flags, "text", \&cb)	2756	=item $success = $client->query ($flags, "text", \&cb)
2475		2757
2476	Queues a query to the client, calling the given callback with	2758	Queues a query to the client, calling the given callback with
…		…
2531	my ($ns, $buf) = @_;	2813	my ($ns, $buf) = @_;
2532		2814
2533	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2815	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2534		2816
2535	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
2536	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2825	if (my $cb = $EXTICMD{$type}) {
2537	if (my %reply = $cb->($ns, $msg)) {	2826	@reply = $cb->($ns, @payload);
2538	$reply{msgid} = $msg->{msgid};
2539	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2540	}
2541	}	2827	}
		2828
		2829	$ns->ext_reply ($reply, @reply)
		2830	if $reply;
		2831
2542	} else {	2832	} else {
2543	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";
2544	}	2834	}
2545		2835
2546	cf::override;	2836	cf::override;
…		…
2593	our $safe = new Safe "safe";	2883	our $safe = new Safe "safe";
2594	our $safe_hole = new Safe::Hole;	2884	our $safe_hole = new Safe::Hole;
2595		2885
2596	$SIG{FPE} = 'IGNORE';	2886	$SIG{FPE} = 'IGNORE';
2597		2887
2598	$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	));
2599		2893
2600	# here we export the classes and methods available to script code	2894	# here we export the classes and methods available to script code
2601		2895
2602	=pod	2896	=pod
2603		2897
2604	The following functions and methods are available within a safe environment:	2898	The following functions and methods are available within a safe environment:
2605		2899
2606	cf::object	2900	cf::object
2607	contr pay_amount pay_player map x y force_find force_add	2901	contr pay_amount pay_player map x y force_find force_add destroy
2608	insert remove	2902	insert remove name archname title slaying race decrease_ob_nr
2609		2903
2610	cf::object::player	2904	cf::object::player
2611	player	2905	player
2612		2906
2613	cf::player	2907	cf::player
…		…
2618		2912
2619	=cut	2913	=cut
2620		2914
2621	for (	2915	for (
2622	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	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
2623	insert remove)],	2918	decrease_ob_nr destroy)],
2624	["cf::object::player" => qw(player)],	2919	["cf::object::player" => qw(player)],
2625	["cf::player" => qw(peaceful)],	2920	["cf::player" => qw(peaceful)],
2626	["cf::map" => qw(trigger)],	2921	["cf::map" => qw(trigger)],
2627	) {	2922	) {
2628	no strict 'refs';	2923	no strict 'refs';
…		…
2704	# the server's init and main functions	2999	# the server's init and main functions
2705		3000
2706	sub load_facedata($) {	3001	sub load_facedata($) {
2707	my ($path) = @_;	3002	my ($path) = @_;
2708		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
2709	warn "loading facedata from $path\n";	3010	warn "loading facedata from $path\n";
2710		3011
2711	my $facedata;	3012	my $facedata;
2712	0 < aio_load $path, $facedata	3013	0 < aio_load $path, $facedata
2713	or die "$path: $!";	3014	or die "$path: $!";
…		…
2715	$facedata = Coro::Storable::thaw $facedata;	3016	$facedata = Coro::Storable::thaw $facedata;
2716		3017
2717	$facedata->{version} == 2	3018	$facedata->{version} == 2
2718	or cf::cleanup "$path: version mismatch, cannot proceed.";	3019	or cf::cleanup "$path: version mismatch, cannot proceed.";
2719		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
2720	{	3028	{
2721	my $faces = $facedata->{faceinfo};	3029	my $faces = $facedata->{faceinfo};
2722		3030
2723	while (my ($face, $info) = each %$faces) {	3031	while (my ($face, $info) = each %$faces) {
2724	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3032	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2725	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3033	cf::face::set_visibility $idx, $info->{visibility};
		3034	cf::face::set_magicmap $idx, $info->{magicmap};
2726	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3035	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2727	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3036	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2728	Coro::cede;	3037
		3038	cf::cede_to_tick;
2729	}	3039	}
2730		3040
2731	while (my ($face, $info) = each %$faces) {	3041	while (my ($face, $info) = each %$faces) {
2732	next unless $info->{smooth};	3042	next unless $info->{smooth};
2733	my $idx = cf::face::find $face	3043	my $idx = cf::face::find $face
2734	or next;	3044	or next;
2735	if (my $smooth = cf::face::find $info->{smooth}) {	3045	if (my $smooth = cf::face::find $info->{smooth}) {
		3046	cf::face::set_smooth $idx, $smooth;
2736	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3047	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2737	} else {	3048	} else {
2738	warn "smooth face '$info->{smooth}' not found for face '$face'";	3049	warn "smooth face '$info->{smooth}' not found for face '$face'";
2739	}	3050	}
2740	Coro::cede;	3051
		3052	cf::cede_to_tick;
2741	}	3053	}
2742	}	3054	}
2743		3055
2744	{	3056	{
2745	my $anims = $facedata->{animinfo};	3057	my $anims = $facedata->{animinfo};
2746		3058
2747	while (my ($anim, $info) = each %$anims) {	3059	while (my ($anim, $info) = each %$anims) {
2748	cf::anim::set $anim, $info->{frames}, $info->{facings};	3060	cf::anim::set $anim, $info->{frames}, $info->{facings};
2749	Coro::cede;	3061	cf::cede_to_tick;
2750	}	3062	}
2751		3063
2752	cf::anim::invalidate_all; # d'oh	3064	cf::anim::invalidate_all; # d'oh
2753	}	3065	}
2754		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
2755	1	3116	1
2756	}	3117	}
2757		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
2758	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
2759	load_resource_file "$MAPDIR/regions"	3132	load_resource_file "$MAPDIR/regions"
2760	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	}
2761	}	3139	}
2762		3140
2763	sub reload_facedata {	3141	sub reload_facedata {
2764	load_facedata "$DATADIR/facedata"	3142	load_facedata "$DATADIR/facedata"
2765	or die "unable to load facedata\n";	3143	or die "unable to load facedata\n";
…		…
2794		3172
2795	sub init {	3173	sub init {
2796	reload_resources;	3174	reload_resources;
2797	}	3175	}
2798		3176
2799	sub cfg_load {	3177	sub reload_config {
2800	open my $fh, "<:utf8", "$CONFDIR/config"	3178	open my $fh, "<:utf8", "$CONFDIR/config"
2801	or return;	3179	or return;
2802		3180
2803	local $/;	3181	local $/;
2804	*CFG = YAML::Syck::Load <$fh>;	3182	*CFG = YAML::Syck::Load <$fh>;
…		…
2820	sub main {	3198	sub main {
2821	# we must not ever block the main coroutine	3199	# we must not ever block the main coroutine
2822	local $Coro::idle = sub {	3200	local $Coro::idle = sub {
2823	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#
2824	(async {	3202	(async {
		3203	$Coro::current->{desc} = "IDLE BUG HANDLER";
2825	Event::one_event;	3204	Event::one_event;
2826	})->prio (Coro::PRIO_MAX);	3205	})->prio (Coro::PRIO_MAX);
2827	};	3206	};
2828		3207
2829	cfg_load;	3208	reload_config;
2830	db_init;	3209	db_init;
2831	load_extensions;	3210	load_extensions;
2832		3211
2833	$TICK_WATCHER->start;	3212	$TICK_WATCHER->start;
2834	Event::loop;	3213	Event::loop;
…		…
2901	# and maps saved/destroyed asynchronously.	3280	# and maps saved/destroyed asynchronously.
2902	warn "begin emergency player save\n";	3281	warn "begin emergency player save\n";
2903	for my $login (keys %cf::PLAYER) {	3282	for my $login (keys %cf::PLAYER) {
2904	my $pl = $cf::PLAYER{$login} or next;	3283	my $pl = $cf::PLAYER{$login} or next;
2905	$pl->valid or next;	3284	$pl->valid or next;
		3285	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2906	$pl->save;	3286	$pl->save;
2907	}	3287	}
2908	warn "end emergency player save\n";	3288	warn "end emergency player save\n";
2909		3289
2910	warn "begin emergency map save\n";	3290	warn "begin emergency map save\n";
…		…
3027	warn "reloading cf.pm";	3407	warn "reloading cf.pm";
3028	require cf;	3408	require cf;
3029	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3409	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3030		3410
3031	warn "loading config and database again";	3411	warn "loading config and database again";
3032	cf::cfg_load;	3412	cf::reload_config;
3033		3413
3034	warn "loading extensions";	3414	warn "loading extensions";
3035	cf::load_extensions;	3415	cf::load_extensions;
3036		3416
3037	warn "reattaching attachments to objects/players";	3417	warn "reattaching attachments to objects/players";
…		…
3073	register_command "reload" => sub {	3453	register_command "reload" => sub {
3074	my ($who, $arg) = @_;	3454	my ($who, $arg) = @_;
3075		3455
3076	if ($who->flag (FLAG_WIZ)) {	3456	if ($who->flag (FLAG_WIZ)) {
3077	$who->message ("reloading server.");	3457	$who->message ("reloading server.");
		3458	async {
		3459	$Coro::current->{desc} = "perl_reload";
3078	async { reload_perl };	3460	reload_perl;
		3461	};
3079	}	3462	}
3080	};	3463	};
3081		3464
3082	unshift @INC, $LIBDIR;	3465	unshift @INC, $LIBDIR;
3083		3466
…		…
3102	my $signal = new Coro::Signal;	3485	my $signal = new Coro::Signal;
3103	push @WAIT_FOR_TICK_BEGIN, $signal;	3486	push @WAIT_FOR_TICK_BEGIN, $signal;
3104	$signal->wait;	3487	$signal->wait;
3105	}	3488	}
3106		3489
3107	my $min = 1e6;#d#
3108	my $avg = 10;
3109	$TICK_WATCHER = Event->timer (	3490	$TICK_WATCHER = Event->timer (
3110	reentrant => 0,	3491	reentrant => 0,
3111	parked => 1,	3492	parked => 1,
3112	prio => 0,	3493	prio => 0,
3113	at => $NEXT_TICK \|\| $TICK,	3494	at => $NEXT_TICK \|\| $TICK,
…		…
3121		3502
3122	$NOW = $tick_start = Event::time;	3503	$NOW = $tick_start = Event::time;
3123		3504
3124	cf::server_tick; # one server iteration	3505	cf::server_tick; # one server iteration
3125		3506
3126	0 && sync_job {#d#
3127	for(1..10) {
3128	my $t = Event::time;
3129	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3130	or die;
3131
3132	$map->width (50);
3133	$map->height (50);
3134	$map->alloc;
3135	$map->_load_objects ("/tmp/x.map", 1);
3136	my $t = Event::time - $t;
3137
3138	#next unless $t < 0.0013;#d#
3139	if ($t < $min) {
3140	$min = $t;
3141	}
3142	$avg = $avg * 0.99 + $t * 0.01;
3143	}
3144	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3145	exit 0;
3146	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3147	};
3148
3149	$RUNTIME += $TICK;	3507	$RUNTIME += $TICK;
3150	$NEXT_TICK += $TICK;	3508	$NEXT_TICK += $TICK;
3151		3509
3152	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3510	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3153	$NEXT_RUNTIME_WRITE = $NOW + 10;	3511	$NEXT_RUNTIME_WRITE = $NOW + 10;
3154	Coro::async_pool {	3512	Coro::async_pool {
		3513	$Coro::current->{desc} = "runtime saver";
3155	write_runtime	3514	write_runtime
3156	or warn "ERROR: unable to write runtime file: $!";	3515	or warn "ERROR: unable to write runtime file: $!";
3157	};	3516	};
3158	}	3517	}
3159		3518
3160	# my $AFTER = Event::time;
3161	# warn $AFTER - $NOW;#d#
3162
3163	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3519	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3164	$sig->send;	3520	$sig->send;
3165	}	3521	}
3166	while (my $sig = shift @WAIT_FOR_TICK) {	3522	while (my $sig = shift @WAIT_FOR_TICK) {
3167	$sig->send;	3523	$sig->send;
…		…
3177		3533
3178	$LOAD = ($NOW - $tick_start) / $TICK;	3534	$LOAD = ($NOW - $tick_start) / $TICK;
3179	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3535	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3180		3536
3181	_post_tick;	3537	_post_tick;
3182
3183
3184	},	3538	},
3185	);	3539	);
3186		3540
3187	{	3541	{
		3542	BDB::min_parallel 8;
3188	BDB::max_poll_time $TICK * 0.1;	3543	BDB::max_poll_time $TICK * 0.1;
3189	$BDB_POLL_WATCHER = Event->io (	3544	$BDB_POLL_WATCHER = Event->io (
3190	reentrant => 0,	3545	reentrant => 0,
3191	fd => BDB::poll_fileno,	3546	fd => BDB::poll_fileno,
3192	poll => 'r',	3547	poll => 'r',
3193	prio => 0,	3548	prio => 0,
3194	data => WF_AUTOCANCEL,	3549	data => WF_AUTOCANCEL,
3195	cb => \&BDB::poll_cb,	3550	cb => \&BDB::poll_cb,
3196	);	3551	);
3197	BDB::min_parallel 8;
3198		3552
3199	BDB::set_sync_prepare {	3553	BDB::set_sync_prepare {
3200	my $status;	3554	my $status;
3201	my $current = $Coro::current;	3555	my $current = $Coro::current;
3202	(	3556	(
…		…
3211	)	3565	)
3212	};	3566	};
3213		3567
3214	unless ($DB_ENV) {	3568	unless ($DB_ENV) {
3215	$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);
3216		3574
3217	cf::sync_job {	3575	cf::sync_job {
3218	eval {	3576	eval {
3219	BDB::db_env_open	3577	BDB::db_env_open
3220	$DB_ENV,	3578	$DB_ENV,
…		…
3222	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
3223	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3581	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3224	0666;	3582	0666;
3225		3583
3226	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3584	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3227
3228	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
3229	$DB_ENV->set_lk_detect;
3230	};	3585	};
3231		3586
3232	cf::cleanup "db_env_open(db): $@" if $@;	3587	cf::cleanup "db_env_open(db): $@" if $@;
3233	};	3588	};
3234	}	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	);
3235	}	3621	}
3236		3622
3237	{	3623	{
3238	IO::AIO::min_parallel 8;	3624	IO::AIO::min_parallel 8;
3239		3625
…		…
3242	$AIO_POLL_WATCHER = Event->io (	3628	$AIO_POLL_WATCHER = Event->io (
3243	reentrant => 0,	3629	reentrant => 0,
3244	data => WF_AUTOCANCEL,	3630	data => WF_AUTOCANCEL,
3245	fd => IO::AIO::poll_fileno,	3631	fd => IO::AIO::poll_fileno,
3246	poll => 'r',	3632	poll => 'r',
3247	prio => 6,	3633	prio => 0,
3248	cb => \&IO::AIO::poll_cb,	3634	cb => \&IO::AIO::poll_cb,
3249	);	3635	);
3250	}	3636	}
3251		3637
3252	my $_log_backtrace;	3638	my $_log_backtrace;
…		…
3258		3644
3259	# limit the # of concurrent backtraces	3645	# limit the # of concurrent backtraces
3260	if ($_log_backtrace < 2) {	3646	if ($_log_backtrace < 2) {
3261	++$_log_backtrace;	3647	++$_log_backtrace;
3262	async {	3648	async {
		3649	$Coro::current->{desc} = "abt $msg";
		3650
3263	my @bt = fork_call {	3651	my @bt = fork_call {
3264	@addr = map { sprintf "%x", $_ } @addr;	3652	@addr = map { sprintf "%x", $_ } @addr;
3265	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3653	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3266	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 \|"
3267	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.300 by root, Tue Jul 10 06:44:29 2007 UTC vs. Revision 1.384 by root, Fri Oct 12 18:17:16 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.300 by root, Tue Jul 10 06:44:29 2007 UTC vs.
Revision 1.384 by root, Fri Oct 12 18:17:16 2007 UTC