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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.380 by root, Mon Oct 8 13:58:07 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	warn "pst<$res>" unless $res =~ /^pst/;
427	$res = Coro::Storable::thaw $res;
428
429	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431	Carp::confess $$res unless "ARRAY" eq ref $res;
432
433	return wantarray ? @$res : $res->[-1];
434	} else {
435	reset_signals;	504	reset_signals;
436	local $SIG{__WARN__};	505	&$cb
437	local $SIG{__DIE__};	506	}, @args;
438	local $Coro::idle;
439	$Coro::current->prio (Coro::PRIO_MAX);
440	eval {
441	close $fh1;
442		507
443	my @res = eval { $cb->(@args) };	508	wantarray ? @res : $res[-1]
444
445	open my $fh, ">", \my $buf
446	or die "fork_call: cannot open fh-to-buf in child : $!";
447	Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448	close $fh;
449
450	warn "writing ", length $buf;
451	my $x;
452	(length $buf) == ($x = syswrite $fh2, $buf)
453	or warn "error writing ".(length $buf)." != $x\n";
454	close $fh2;
455	};
456
457	warn $@ if $@;
458	_exit 0;
459	}
460	}	509	}
461		510
462	=item $value = cf::db_get $family => $key	511	=item $value = cf::db_get $family => $key
463		512
464	Returns a single value from the environment database.	513	Returns a single value from the environment database.
…		…
466	=item cf::db_put $family => $key => $value	515	=item cf::db_put $family => $key => $value
467		516
468	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
469	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).
470		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
471	=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	}
472		543
473	our $DB;	544	our $DB;
474		545
475	sub db_init {	546	sub db_init {
476	unless ($DB) {
477	$DB = BDB::db_create $DB_ENV;
478
479	cf::sync_job {	547	cf::sync_job {
480	eval {	548	$DB \|\|= db_table "db";
481	$DB->set_flags (BDB::CHKSUM);
482
483	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
484	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
485	cf::cleanup "db_open(db): $!" if $!;
486	};
487	cf::cleanup "db_open(db): $@" if $@;
488	};
489	}	549	};
490	}	550	}
491		551
492	sub db_get($$) {	552	sub db_get($$) {
493	my $key = "$_[0]/$_[1]";	553	my $key = "$_[0]/$_[1]";
494		554
…		…
544	if (1) {	604	if (1) {
545	$md5 =	605	$md5 =
546	join "\x00",	606	join "\x00",
547	$processversion,	607	$processversion,
548	map {	608	map {
549	Coro::cede;	609	cf::cede_to_tick;
550	($src->[$_], Digest::MD5::md5_hex $data[$_])	610	($src->[$_], Digest::MD5::md5_hex $data[$_])
551	} 0.. $#$src;	611	} 0.. $#$src;
552		612
553		613
554	my $dbmd5 = db_get cache => "$id/md5";	614	my $dbmd5 = db_get cache => "$id/md5";
…		…
860	";	920	";
861	die if $@;	921	die if $@;
862	}	922	}
863		923
864	our $override;	924	our $override;
865	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?
866		926
867	sub override {	927	sub override {
868	$override = 1;	928	$override = 1;
869	@invoke_results = ();	929	@INVOKE_RESULTS = (@_);
870	}	930	}
871		931
872	sub do_invoke {	932	sub do_invoke {
873	my $event = shift;	933	my $event = shift;
874	my $callbacks = shift;	934	my $callbacks = shift;
875		935
876	@invoke_results = ();	936	@INVOKE_RESULTS = ();
877		937
878	local $override;	938	local $override;
879		939
880	for (@$callbacks) {	940	for (@$callbacks) {
881	eval { &{$_->[1]} };	941	eval { &{$_->[1]} };
…		…
898		958
899	Generate an object-specific event with the given arguments.	959	Generate an object-specific event with the given arguments.
900		960
901	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
902	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
903	results (if you must, access C<@cf::invoke_results> directly).	963	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904		964
905	=back	965	=back
906		966
907	=cut	967	=cut
908		968
909	#############################################################################	969	#############################################################################
910	# 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	}
911		982
912	sub reattach {	983	sub reattach {
913	# basically do the same as instantiate, without calling instantiate	984	# basically do the same as instantiate, without calling instantiate
914	my ($obj) = @_;	985	my ($obj) = @_;
915		986
…		…
962	sub object_freezer_save {	1033	sub object_freezer_save {
963	my ($filename, $rdata, $objs) = @_;	1034	my ($filename, $rdata, $objs) = @_;
964		1035
965	sync_job {	1036	sync_job {
966	if (length $$rdata) {	1037	if (length $$rdata) {
		1038	utf8::decode (my $decname = $filename);
967	warn sprintf "saving %s (%d,%d)\n",	1039	warn sprintf "saving %s (%d,%d)\n",
968	$filename, length $$rdata, scalar @$objs;	1040	$decname, length $$rdata, scalar @$objs;
969		1041
970	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1042	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
971	chmod SAVE_MODE, $fh;	1043	chmod SAVE_MODE, $fh;
972	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1044	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
973	aio_fsync $fh if $cf::USE_FSYNC;	1045	aio_fsync $fh if $cf::USE_FSYNC;
974	close $fh;	1046	close $fh;
975		1047
976	if (@$objs) {	1048	if (@$objs) {
977	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) {
978	chmod SAVE_MODE, $fh;	1050	chmod SAVE_MODE, $fh;
979	my $data = Storable::nfreeze { version => 1, objs => $objs };	1051	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
980	aio_write $fh, 0, (length $data), $data, 0;	1052	aio_write $fh, 0, (length $data), $data, 0;
981	aio_fsync $fh if $cf::USE_FSYNC;	1053	aio_fsync $fh if $cf::USE_FSYNC;
982	close $fh;	1054	close $fh;
983	aio_rename "$filename.pst~", "$filename.pst";	1055	aio_rename "$filename.pst~", "$filename.pst";
984	}	1056	}
…		…
992	}	1064	}
993	} else {	1065	} else {
994	aio_unlink $filename;	1066	aio_unlink $filename;
995	aio_unlink "$filename.pst";	1067	aio_unlink "$filename.pst";
996	}	1068	}
997	}	1069	};
998	}	1070	}
999		1071
1000	sub object_freezer_as_string {	1072	sub object_freezer_as_string {
1001	my ($rdata, $objs) = @_;	1073	my ($rdata, $objs) = @_;
1002		1074
…		…
1014	or return;	1086	or return;
1015		1087
1016	unless (aio_stat "$filename.pst") {	1088	unless (aio_stat "$filename.pst") {
1017	(aio_load "$filename.pst", $av) >= 0	1089	(aio_load "$filename.pst", $av) >= 0
1018	or return;	1090	or return;
1019	$av = eval { (Storable::thaw $av)->{objs} };
1020	}
1021		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);
1022	warn sprintf "loading %s (%d)\n",	1098	warn sprintf "loading %s (%d,%d)\n",
1023	$filename, length $data, scalar @{$av \|\| []};	1099	$decname, length $data, scalar @{$av \|\| []};
		1100
1024	return ($data, $av);	1101	($data, $av)
1025	}	1102	}
1026		1103
1027	=head2 COMMAND CALLBACKS	1104	=head2 COMMAND CALLBACKS
1028		1105
1029	=over 4	1106	=over 4
…		…
1102	my ($pl, $buf) = @_;	1179	my ($pl, $buf) = @_;
1103		1180
1104	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1181	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105		1182
1106	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
1107	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1191	if (my $cb = $EXTCMD{$type}) {
1108	if (my %reply = $cb->($pl, $msg)) {	1192	@reply = $cb->($pl, @payload);
1109	$pl->ext_reply ($msg->{msgid}, %reply);
1110	}
1111	}	1193	}
		1194
		1195	$pl->ext_reply ($reply, @reply)
		1196	if $reply;
		1197
1112	} else {	1198	} else {
1113	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1199	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114	}	1200	}
1115		1201
1116	cf::override;	1202	cf::override;
…		…
1206		1292
1207	=head3 cf::player	1293	=head3 cf::player
1208		1294
1209	=over 4	1295	=over 4
1210		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
1211	=item cf::player::find $login	1311	=item cf::player::find $login
1212		1312
1213	Returns the given player object, loading it if necessary (might block).	1313	Returns the given player object, loading it if necessary (might block).
1214		1314
1215	=cut	1315	=cut
…		…
1250	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1350	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1251	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1351	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1252	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1352	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1253	aio_unlink +(playerdir $login) . "/$login.pl";	1353	aio_unlink +(playerdir $login) . "/$login.pl";
1254		1354
1255	my $pl = load_pl path $login	1355	my $f = new_from_file cf::object::thawer path $login
1256	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;
1257	$cf::PLAYER{$login} = $pl	1362	$cf::PLAYER{$login} = $pl
1258	}	1363	}
1259	}	1364	}
1260	}	1365	}
1261		1366
…		…
1271		1376
1272	aio_mkdir playerdir $pl, 0770;	1377	aio_mkdir playerdir $pl, 0770;
1273	$pl->{last_save} = $cf::RUNTIME;	1378	$pl->{last_save} = $cf::RUNTIME;
1274		1379
1275	$pl->save_pl ($path);	1380	$pl->save_pl ($path);
1276	Coro::cede;	1381	cf::cede_to_tick;
1277	}	1382	}
1278		1383
1279	sub new($) {	1384	sub new($) {
1280	my ($login) = @_;	1385	my ($login) = @_;
1281		1386
…		…
1285	$self->{deny_save} = 1;	1390	$self->{deny_save} = 1;
1286		1391
1287	$cf::PLAYER{$login} = $self;	1392	$cf::PLAYER{$login} = $self;
1288		1393
1289	$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 (@_);
1290	}	1405	}
1291		1406
1292	=item $pl->quit_character	1407	=item $pl->quit_character
1293		1408
1294	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
…		…
1349	or return [];	1464	or return [];
1350		1465
1351	my @logins;	1466	my @logins;
1352		1467
1353	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") {
1354	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1473	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1355	aio_read $fh, 0, 512, my $buf, 0 or next;	1474	aio_read $fh, 0, 512, my $buf, 0 or next;
1356	$buf !~ /^password -------------$/m or next; # official not-valid tag	1475	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1476	}
1357		1477
1358	utf8::decode $login;	1478	utf8::decode $login;
1359	push @logins, $login;	1479	push @logins, $login;
1360	}	1480	}
1361		1481
…		…
1399	sub expand_cfpod {	1519	sub expand_cfpod {
1400	((my $self), (local $_)) = @_;	1520	((my $self), (local $_)) = @_;
1401		1521
1402	# escape & and <	1522	# escape & and <
1403	s/&/&/g;	1523	s/&/&/g;
1404	s/(?<![BIUGH])</</g;	1524	s/(?<![BIUGHT])</</g;
1405		1525
1406	# 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
1407		1527
1408	1 while	1528	1 while
1409	# replace B<>, I<>, U<> etc.	1529	# replace B<>, I<>, U<> etc.
1410	s/B<([^\>]*)>/<b>$1<\/b>/	1530	s/B<([^\>]*)>/<b>$1<\/b>/
1411	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1531	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1412	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1532	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1533	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1413	# replace G<male\|female> tags	1534	# replace G<male\|female> tags
1414	\|\| s{G<([^>\|])\\|([^>])>}{	1535	\|\| s{G<([^>\|])\\|([^>])>}{
1415	$self->gender ? $2 : $1	1536	$self->gender ? $2 : $1
1416	}ge	1537	}ge
1417	# replace H<hint text>	1538	# replace H<hint text>
…		…
1438	sub hintmode {	1559	sub hintmode {
1439	$_[0]{hintmode} = $_[1] if @_ > 1;	1560	$_[0]{hintmode} = $_[1] if @_ > 1;
1440	$_[0]{hintmode}	1561	$_[0]{hintmode}
1441	}	1562	}
1442		1563
1443	=item $player->ext_reply ($msgid, %msg)	1564	=item $player->ext_reply ($msgid, @msg)
1444		1565
1445	Sends an ext reply to the player.	1566	Sends an ext reply to the player.
1446		1567
1447	=cut	1568	=cut
1448		1569
1449	sub ext_reply($$%) {	1570	sub ext_reply($$@) {
1450	my ($self, $id, %msg) = @_;	1571	my ($self, $id, @msg) = @_;
1451		1572
1452	$msg{msgid} = $id;	1573	$self->ns->ext_reply ($id, @msg)
1453	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1454	}	1574	}
1455		1575
1456	=item $player->ext_event ($type, %msg)	1576	=item $player->ext_msg ($type, @msg)
1457		1577
1458	Sends an ext event to the client.	1578	Sends an ext event to the client.
1459		1579
1460	=cut	1580	=cut
1461		1581
1462	sub ext_event($$%) {	1582	sub ext_msg($$@) {
1463	my ($self, $type, %msg) = @_;	1583	my ($self, $type, @msg) = @_;
1464		1584
1465	$self->ns->ext_event ($type, %msg);	1585	$self->ns->ext_msg ($type, @msg);
1466	}	1586	}
1467		1587
1468	=head3 cf::region	1588	=head3 cf::region
1469		1589
1470	=over 4	1590	=over 4
…		…
1483	my ($path) = @_;	1603	my ($path) = @_;
1484		1604
1485	my ($match, $specificity);	1605	my ($match, $specificity);
1486		1606
1487	for my $region (list) {	1607	for my $region (list) {
1488	if ($region->match && $path =~ $region->match) {	1608	if ($region->{match} && $path =~ $region->{match}) {
1489	($match, $specificity) = ($region, $region->specificity)	1609	($match, $specificity) = ($region, $region->specificity)
1490	if $region->specificity > $specificity;	1610	if $region->specificity > $specificity;
1491	}	1611	}
1492	}	1612	}
1493		1613
…		…
1613	$self->init; # pass $1 etc.	1733	$self->init; # pass $1 etc.
1614	return $self;	1734	return $self;
1615	}	1735	}
1616	}	1736	}
1617		1737
1618	Carp::carp "unable to resolve path '$path' (base '$base').";	1738	Carp::cluck "unable to resolve path '$path' (base '$base').";
1619	()	1739	()
1620	}	1740	}
1621		1741
1622	sub init {	1742	sub init {
1623	my ($self) = @_;	1743	my ($self) = @_;
…		…
1686		1806
1687	sub load_header_from($) {	1807	sub load_header_from($) {
1688	my ($self, $path) = @_;	1808	my ($self, $path) = @_;
1689		1809
1690	utf8::encode $path;	1810	utf8::encode $path;
1691	#aio_open $path, O_RDONLY, 0	1811	my $f = new_from_file cf::object::thawer $path
1692	# or return;
1693
1694	$self->_load_header ($path)
1695	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;
1696		1819
1697	$self->{load_path} = $path;	1820	$self->{load_path} = $path;
1698		1821
1699	1	1822	1
1700	}	1823	}
…		…
1754	sub find {	1877	sub find {
1755	my ($path, $origin) = @_;	1878	my ($path, $origin) = @_;
1756		1879
1757	$path = normalise $path, $origin && $origin->path;	1880	$path = normalise $path, $origin && $origin->path;
1758		1881
		1882	cf::lock_wait "map_data:$path";#d#remove
1759	cf::lock_wait "map_find:$path";	1883	cf::lock_wait "map_find:$path";
1760		1884
1761	$cf::MAP{$path} \|\| do {	1885	$cf::MAP{$path} \|\| do {
1762	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
1763	my $map = new_from_path cf::map $path	1889	my $map = new_from_path cf::map $path
1764	or return;	1890	or return;
1765		1891
1766	$map->{last_save} = $cf::RUNTIME;	1892	$map->{last_save} = $cf::RUNTIME;
1767		1893
…		…
1769	or return;	1895	or return;
1770		1896
1771	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1897	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1772	# doing this can freeze the server in a sync job, obviously	1898	# doing this can freeze the server in a sync job, obviously
1773	#$cf::WAIT_FOR_TICK->wait;	1899	#$cf::WAIT_FOR_TICK->wait;
		1900	undef $guard1;
		1901	undef $guard2;
1774	$map->reset;	1902	$map->reset;
1775	undef $guard;
1776	return find $path;	1903	return find $path;
1777	}	1904	}
1778		1905
1779	$cf::MAP{$path} = $map	1906	$cf::MAP{$path} = $map
1780	}	1907	}
…		…
1789	local $self->{deny_reset} = 1; # loading can take a long time	1916	local $self->{deny_reset} = 1; # loading can take a long time
1790		1917
1791	my $path = $self->{path};	1918	my $path = $self->{path};
1792		1919
1793	{	1920	{
1794	my $guard = cf::lock_acquire "map_load:$path";	1921	my $guard = cf::lock_acquire "map_data:$path";
1795		1922
		1923	return unless $self->valid;
1796	return if $self->in_memory != cf::MAP_SWAPPED;	1924	return unless $self->in_memory == cf::MAP_SWAPPED;
1797		1925
1798	$self->in_memory (cf::MAP_LOADING);	1926	$self->in_memory (cf::MAP_LOADING);
1799		1927
1800	$self->alloc;	1928	$self->alloc;
1801		1929
1802	$self->pre_load;	1930	$self->pre_load;
1803	Coro::cede;	1931	cf::cede_to_tick;
1804		1932
		1933	my $f = new_from_file cf::object::thawer $self->{load_path};
		1934	$f->skip_block;
1805	$self->_load_objects ($self->{load_path}, 1)	1935	$self->_load_objects ($f)
1806	or return;	1936	or return;
1807		1937
1808	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1938	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1809	if delete $self->{load_original};	1939	if delete $self->{load_original};
1810		1940
1811	if (my $uniq = $self->uniq_path) {	1941	if (my $uniq = $self->uniq_path) {
1812	utf8::encode $uniq;	1942	utf8::encode $uniq;
1813	if (aio_open $uniq, O_RDONLY, 0) {	1943	unless (aio_stat $uniq) {
		1944	if (my $f = new_from_file cf::object::thawer $uniq) {
1814	$self->clear_unique_items;	1945	$self->clear_unique_items;
1815	$self->_load_objects ($uniq, 0);	1946	$self->_load_objects ($f);
		1947	$f->resolve_delayed_derefs;
		1948	}
1816	}	1949	}
1817	}	1950	}
1818		1951
1819	Coro::cede;	1952	$f->resolve_delayed_derefs;
		1953
		1954	cf::cede_to_tick;
1820	# now do the right thing for maps	1955	# now do the right thing for maps
1821	$self->link_multipart_objects;	1956	$self->link_multipart_objects;
1822	$self->difficulty ($self->estimate_difficulty)	1957	$self->difficulty ($self->estimate_difficulty)
1823	unless $self->difficulty;	1958	unless $self->difficulty;
1824	Coro::cede;	1959	cf::cede_to_tick;
1825		1960
1826	unless ($self->{deny_activate}) {	1961	unless ($self->{deny_activate}) {
1827	$self->decay_objects;	1962	$self->decay_objects;
1828	$self->fix_auto_apply;	1963	$self->fix_auto_apply;
1829	$self->update_buttons;	1964	$self->update_buttons;
1830	Coro::cede;	1965	cf::cede_to_tick;
1831	$self->set_darkness_map;	1966	$self->set_darkness_map;
1832	Coro::cede;	1967	cf::cede_to_tick;
1833	$self->activate;	1968	$self->activate;
1834	}	1969	}
		1970
		1971	$self->{last_save} = $cf::RUNTIME;
		1972	$self->last_access ($cf::RUNTIME);
1835		1973
1836	$self->in_memory (cf::MAP_IN_MEMORY);	1974	$self->in_memory (cf::MAP_IN_MEMORY);
1837	}	1975	}
1838		1976
1839	$self->post_load;	1977	$self->post_load;
…		…
1850		1988
1851	$self	1989	$self
1852	}	1990	}
1853		1991
1854	# 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
1855	sub load_diag {	1993	sub load_neighbours {
1856	my ($map) = @_;	1994	my ($map) = @_;
1857		1995
1858	my @diag; # diagonal neighbours	1996	my @neigh; # diagonal neighbours
1859		1997
1860	for (0 .. 3) {	1998	for (0 .. 3) {
1861	my $neigh = $map->tile_path ($_)	1999	my $neigh = $map->tile_path ($_)
1862	or next;	2000	or next;
1863	$neigh = find $neigh, $map	2001	$neigh = find $neigh, $map
1864	or next;	2002	or next;
1865	$neigh->load;	2003	$neigh->load;
1866		2004
		2005	push @neigh,
1867	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2006	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1868	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2007	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1869	}	2008	}
1870		2009
1871	for (@diag) {	2010	for (grep defined $_->[0], @neigh) {
		2011	my ($path, $origin) = @$_;
1872	my $neigh = find @$_	2012	my $neigh = find $path, $origin
1873	or next;	2013	or next;
1874	$neigh->load;	2014	$neigh->load;
1875	}	2015	}
1876	}	2016	}
1877		2017
…		…
1882	}	2022	}
1883		2023
1884	sub do_load_sync {	2024	sub do_load_sync {
1885	my ($map) = @_;	2025	my ($map) = @_;
1886		2026
		2027	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2028	if $Coro::current == $Coro::main;
		2029
1887	cf::sync_job { $map->load };	2030	cf::sync_job { $map->load };
1888	}	2031	}
1889		2032
1890	our %MAP_PREFETCH;	2033	our %MAP_PREFETCH;
1891	our $MAP_PREFETCHER = undef;	2034	our $MAP_PREFETCHER = undef;
1892		2035
1893	sub find_async {	2036	sub find_async {
1894	my ($path, $origin) = @_;	2037	my ($path, $origin, $load) = @_;
1895		2038
1896	$path = normalise $path, $origin && $origin->{path};	2039	$path = normalise $path, $origin && $origin->{path};
1897		2040
1898	if (my $map = $cf::MAP{$path}) {	2041	if (my $map = $cf::MAP{$path}) {
1899	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2042	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1900	}	2043	}
1901		2044
1902	undef $MAP_PREFETCH{$path};	2045	$MAP_PREFETCH{$path} \|= $load;
		2046
1903	$MAP_PREFETCHER \|\|= cf::async {	2047	$MAP_PREFETCHER \|\|= cf::async {
		2048	$Coro::current->{desc} = "map prefetcher";
		2049
1904	while (%MAP_PREFETCH) {	2050	while (%MAP_PREFETCH) {
1905	for my $path (keys %MAP_PREFETCH) {	2051	while (my ($k, $v) = each %MAP_PREFETCH) {
1906	my $map = find $path	2052	if (my $map = find $k) {
1907	or next;
1908	$map->load;	2053	$map->load if $v;
		2054	}
1909		2055
1910	delete $MAP_PREFETCH{$path};	2056	delete $MAP_PREFETCH{$k};
1911	}	2057	}
1912	}	2058	}
1913	undef $MAP_PREFETCHER;	2059	undef $MAP_PREFETCHER;
1914	};	2060	};
1915	$MAP_PREFETCHER->prio (6);	2061	$MAP_PREFETCHER->prio (6);
…		…
1918	}	2064	}
1919		2065
1920	sub save {	2066	sub save {
1921	my ($self) = @_;	2067	my ($self) = @_;
1922		2068
1923	my $lock = cf::lock_acquire "map_data:" . $self->path;	2069	my $lock = cf::lock_acquire "map_data:$self->{path}";
1924		2070
1925	$self->{last_save} = $cf::RUNTIME;	2071	$self->{last_save} = $cf::RUNTIME;
1926		2072
1927	return unless $self->dirty;	2073	return unless $self->dirty;
1928		2074
…		…
1934	return if $self->{deny_save};	2080	return if $self->{deny_save};
1935		2081
1936	local $self->{last_access} = $self->last_access;#d#	2082	local $self->{last_access} = $self->last_access;#d#
1937		2083
1938	cf::async {	2084	cf::async {
		2085	$Coro::current->{desc} = "map player save";
1939	$_->contr->save for $self->players;	2086	$_->contr->save for $self->players;
1940	};	2087	};
1941		2088
1942	if ($uniq) {	2089	if ($uniq) {
1943	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	2090	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
…		…
1951	my ($self) = @_;	2098	my ($self) = @_;
1952		2099
1953	# save first because save cedes	2100	# save first because save cedes
1954	$self->save;	2101	$self->save;
1955		2102
1956	my $lock = cf::lock_acquire "map_data:" . $self->path;	2103	my $lock = cf::lock_acquire "map_data:$self->{path}";
1957		2104
1958	return if $self->players;	2105	return if $self->players;
1959	return if $self->in_memory != cf::MAP_IN_MEMORY;	2106	return if $self->in_memory != cf::MAP_IN_MEMORY;
1960	return if $self->{deny_save};	2107	return if $self->{deny_save};
1961		2108
		2109	$self->in_memory (cf::MAP_SWAPPED);
		2110
		2111	$self->deactivate;
		2112	$_->clear_links_to ($self) for values %cf::MAP;
1962	$self->clear;	2113	$self->clear;
1963	$self->in_memory (cf::MAP_SWAPPED);
1964	}	2114	}
1965		2115
1966	sub reset_at {	2116	sub reset_at {
1967	my ($self) = @_;	2117	my ($self) = @_;
1968		2118
…		…
2000	if $uniq;	2150	if $uniq;
2001	}	2151	}
2002		2152
2003	delete $cf::MAP{$self->path};	2153	delete $cf::MAP{$self->path};
2004		2154
		2155	$self->deactivate;
		2156	$_->clear_links_to ($self) for values %cf::MAP;
2005	$self->clear;	2157	$self->clear;
2006
2007	$_->clear_links_to ($self) for values %cf::MAP;
2008		2158
2009	$self->unlink_save;	2159	$self->unlink_save;
2010	$self->destroy;	2160	$self->destroy;
2011	}	2161	}
2012		2162
2013	my $nuke_counter = "aaaa";	2163	my $nuke_counter = "aaaa";
2014		2164
2015	sub nuke {	2165	sub nuke {
2016	my ($self) = @_;	2166	my ($self) = @_;
2017		2167
		2168	{
		2169	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2170
2018	delete $cf::MAP{$self->path};	2171	delete $cf::MAP{$self->path};
2019		2172
2020	$self->unlink_save;	2173	$self->unlink_save;
2021		2174
2022	bless $self, "cf::map";	2175	bless $self, "cf::map";
2023	delete $self->{deny_reset};	2176	delete $self->{deny_reset};
2024	$self->{deny_save} = 1;	2177	$self->{deny_save} = 1;
2025	$self->reset_timeout (1);	2178	$self->reset_timeout (1);
2026	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2179	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2027		2180
2028	$cf::MAP{$self->path} = $self;	2181	$cf::MAP{$self->path} = $self;
		2182	}
2029		2183
2030	$self->reset; # polite request, might not happen	2184	$self->reset; # polite request, might not happen
2031	}	2185	}
2032		2186
2033	=item $maps = cf::map::tmp_maps	2187	=item $maps = cf::map::tmp_maps
…		…
2109		2263
2110	sub inv_recursive {	2264	sub inv_recursive {
2111	inv_recursive_ inv $_[0]	2265	inv_recursive_ inv $_[0]
2112	}	2266	}
2113		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
2114	package cf;	2296	package cf;
2115		2297
2116	=back	2298	=back
2117		2299
2118	=head3 cf::object::player	2300	=head3 cf::object::player
…		…
2140		2322
2141	} else {	2323	} else {
2142	my $pl = $self->contr;	2324	my $pl = $self->contr;
2143		2325
2144	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2326	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145	my $diag = $pl->{npc_dialog};	2327	my $dialog = $pl->{npc_dialog};
2146	$diag->{pl}->ext_reply (	2328	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2147	$diag->{id},
2148	msgtype => "reply",
2149	msg => $diag->{pl}->expand_cfpod ($msg),
2150	add_topics => []
2151	);
2152		2329
2153	} else {	2330	} else {
2154	$msg = $npc->name . " says: $msg" if $npc;	2331	$msg = $npc->name . " says: $msg" if $npc;
2155	$self->message ($msg, $flags);	2332	$self->message ($msg, $flags);
2156	}	2333	}
2157	}	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 (@_);
2158	}	2345	}
2159		2346
2160	=item $player_object->may ("access")	2347	=item $player_object->may ("access")
2161		2348
2162	Returns wether the given player is authorized to access resource "access"	2349	Returns wether the given player is authorized to access resource "access"
…		…
2241	# use -1 or undef as default coordinates, not 0, 0	2428	# use -1 or undef as default coordinates, not 0, 0
2242	($x, $y) = ($map->enter_x, $map->enter_y)	2429	($x, $y) = ($map->enter_x, $map->enter_y)
2243	if $x <=0 && $y <= 0;	2430	if $x <=0 && $y <= 0;
2244		2431
2245	$map->load;	2432	$map->load;
2246	$map->load_diag;	2433	$map->load_neighbours;
2247		2434
2248	return unless $self->contr->active;	2435	return unless $self->contr->active;
2249	$self->activate_recursive;	2436	$self->activate_recursive;
2250		2437
2251	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2438	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252	$self->enter_map ($map, $x, $y);	2439	$self->enter_map ($map, $x, $y);
2253	}	2440	}
2254		2441
2255	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2442	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256		2443
2257	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
2258	her, loading and preparing them map, calling the provided $check callback	2445	her, loading and preparing them map, calling the provided $check callback
2259	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
2260	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.
2261		2449
2262	=cut	2450	=cut
2263		2451
2264	our $GOTOGEN;	2452	our $GOTOGEN;
2265		2453
2266	sub cf::object::player::goto {	2454	sub cf::object::player::goto {
2267	my ($self, $path, $x, $y, $check) = @_;	2455	my ($self, $path, $x, $y, $check, $done) = @_;
2268		2456
2269	# 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
2270	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2458	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271		2459
2272	$self->enter_link;	2460	$self->enter_link;
2273		2461
2274	(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
2275	my $map = eval {	2484	my $map = eval {
2276	my $map = cf::map::find $path;	2485	my $map = defined $path ? cf::map::find $path : undef;
2277		2486
2278	if ($map) {	2487	if ($map) {
2279	$map = $map->customise_for ($self);	2488	$map = $map->customise_for ($self);
2280	$map = $check->($map) if $check && $map;	2489	$map = $check->($map) if $check && $map;
2281	} else {	2490	} else {
2282	$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);
2283	}	2492	}
2284		2493
2285	$map	2494	$map
2286	};	2495	};
2287		2496
…		…
2292		2501
2293	if ($gen == $self->{_goto_generation}) {	2502	if ($gen == $self->{_goto_generation}) {
2294	delete $self->{_goto_generation};	2503	delete $self->{_goto_generation};
2295	$self->leave_link ($map, $x, $y);	2504	$self->leave_link ($map, $x, $y);
2296	}	2505	}
		2506
		2507	$done->() if $done;
2297	})->prio (1);	2508	})->prio (1);
2298	}	2509	}
2299		2510
2300	=item $player_object->enter_exit ($exit_object)	2511	=item $player_object->enter_exit ($exit_object)
2301		2512
…		…
2375	# if exit is damned, update players death & WoR home-position	2586	# if exit is damned, update players death & WoR home-position
2376	$self->contr->savebed ($slaying, $hp, $sp)	2587	$self->contr->savebed ($slaying, $hp, $sp)
2377	if $exit->flag (FLAG_DAMNED);	2588	if $exit->flag (FLAG_DAMNED);
2378		2589
2379	(async {	2590	(async {
		2591	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2592
2380	$self->deactivate_recursive; # just to be sure	2593	$self->deactivate_recursive; # just to be sure
2381	unless (eval {	2594	unless (eval {
2382	$self->goto ($slaying, $hp, $sp);	2595	$self->goto ($slaying, $hp, $sp);
2383		2596
2384	1;	2597	1;
…		…
2410		2623
2411	utf8::encode $text;	2624	utf8::encode $text;
2412	$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);
2413	}	2626	}
2414		2627
2415	=item $client->send_msg ($color, $type, $msg, [extra...])	2628	=item $client->send_msg ($channel, $msg, $color, [extra...])
2416		2629
2417	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
2418	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
2419	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
2420	the message unless the client supports the msg packet.	2633	the message unless the client supports the msg packet.
2421		2634
2422	=cut	2635	=cut
2423		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
2424	sub cf::client::send_msg {	2658	sub cf::client::send_msg {
2425	my ($self, $color, $type, $msg, @extra) = @_;	2659	my ($self, $channel, $msg, $color, @extra) = @_;
2426		2660
2427	$msg = $self->pl->expand_cfpod ($msg);	2661	$msg = $self->pl->expand_cfpod ($msg);
2428		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
2429	return unless @extra \|\| length $msg;	2685	return unless @extra \|\| length $msg;
2430		2686
2431	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
2432	$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]));
2433	} else {	2694	} else {
2434	# replace some tags by gcfclient-compatible ones
2435	for ($msg) {
2436	1 while
2437	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2438	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2439	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2440	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2441	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2442	}
2443
2444	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
2445	if (0 && $msg =~ /\[/) {	2710	if (0 && $msg =~ /\[/) {
		2711	# COMMAND/INFO
2446	$self->send_packet ("drawextinfo $color 4 0 $msg")	2712	$self->send_packet ("drawextinfo $color 10 8 $msg")
2447	} else {	2713	} else {
2448	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2714	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2449	$self->send_packet ("drawinfo $color $msg")	2715	$self->send_packet ("drawinfo $color $msg")
2450	}	2716	}
2451	}	2717	}
2452	}	2718	}
2453	}	2719	}
2454		2720
2455	=item $client->ext_event ($type, %msg)	2721	=item $client->ext_msg ($type, @msg)
2456		2722
2457	Sends an ext event to the client.	2723	Sends an ext event to the client.
2458		2724
2459	=cut	2725	=cut
2460		2726
2461	sub cf::client::ext_event($$%) {	2727	sub cf::client::ext_msg($$@) {
2462	my ($self, $type, %msg) = @_;	2728	my ($self, $type, @msg) = @_;
2463		2729
		2730	if ($self->extcmd == 2) {
		2731	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2732	} elsif ($self->extcmd == 1) { # TODO: remove
2464	$msg{msgtype} = "event_$type";	2733	push @msg, msgtype => "event_$type";
2465	$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	}
2466	}	2754	}
2467		2755
2468	=item $success = $client->query ($flags, "text", \&cb)	2756	=item $success = $client->query ($flags, "text", \&cb)
2469		2757
2470	Queues a query to the client, calling the given callback with	2758	Queues a query to the client, calling the given callback with
…		…
2525	my ($ns, $buf) = @_;	2813	my ($ns, $buf) = @_;
2526		2814
2527	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2815	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528		2816
2529	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
2530	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2825	if (my $cb = $EXTICMD{$type}) {
2531	if (my %reply = $cb->($ns, $msg)) {	2826	@reply = $cb->($ns, @payload);
2532	$reply{msgid} = $msg->{msgid};
2533	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534	}
2535	}	2827	}
		2828
		2829	$ns->ext_reply ($reply, @reply)
		2830	if $reply;
		2831
2536	} else {	2832	} else {
2537	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";
2538	}	2834	}
2539		2835
2540	cf::override;	2836	cf::override;
…		…
2587	our $safe = new Safe "safe";	2883	our $safe = new Safe "safe";
2588	our $safe_hole = new Safe::Hole;	2884	our $safe_hole = new Safe::Hole;
2589		2885
2590	$SIG{FPE} = 'IGNORE';	2886	$SIG{FPE} = 'IGNORE';
2591		2887
2592	$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	));
2593		2893
2594	# here we export the classes and methods available to script code	2894	# here we export the classes and methods available to script code
2595		2895
2596	=pod	2896	=pod
2597		2897
2598	The following functions and methods are available within a safe environment:	2898	The following functions and methods are available within a safe environment:
2599		2899
2600	cf::object	2900	cf::object
2601	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
2602	insert remove	2902	insert remove name archname title slaying race decrease_ob_nr
2603		2903
2604	cf::object::player	2904	cf::object::player
2605	player	2905	player
2606		2906
2607	cf::player	2907	cf::player
…		…
2612		2912
2613	=cut	2913	=cut
2614		2914
2615	for (	2915	for (
2616	["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
2617	insert remove)],	2918	decrease_ob_nr)],
2618	["cf::object::player" => qw(player)],	2919	["cf::object::player" => qw(player)],
2619	["cf::player" => qw(peaceful)],	2920	["cf::player" => qw(peaceful)],
2620	["cf::map" => qw(trigger)],	2921	["cf::map" => qw(trigger)],
2621	) {	2922	) {
2622	no strict 'refs';	2923	no strict 'refs';
…		…
2698	# the server's init and main functions	2999	# the server's init and main functions
2699		3000
2700	sub load_facedata($) {	3001	sub load_facedata($) {
2701	my ($path) = @_;	3002	my ($path) = @_;
2702		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
2703	warn "loading facedata from $path\n";	3010	warn "loading facedata from $path\n";
2704		3011
2705	my $facedata;	3012	my $facedata;
2706	0 < aio_load $path, $facedata	3013	0 < aio_load $path, $facedata
2707	or die "$path: $!";	3014	or die "$path: $!";
…		…
2709	$facedata = Coro::Storable::thaw $facedata;	3016	$facedata = Coro::Storable::thaw $facedata;
2710		3017
2711	$facedata->{version} == 2	3018	$facedata->{version} == 2
2712	or cf::cleanup "$path: version mismatch, cannot proceed.";	3019	or cf::cleanup "$path: version mismatch, cannot proceed.";
2713		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
2714	{	3028	{
2715	my $faces = $facedata->{faceinfo};	3029	my $faces = $facedata->{faceinfo};
2716		3030
2717	while (my ($face, $info) = each %$faces) {	3031	while (my ($face, $info) = each %$faces) {
2718	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3032	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2719	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3033	cf::face::set_visibility $idx, $info->{visibility};
		3034	cf::face::set_magicmap $idx, $info->{magicmap};
2720	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3035	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2721	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3036	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2722	Coro::cede;	3037
		3038	cf::cede_to_tick;
2723	}	3039	}
2724		3040
2725	while (my ($face, $info) = each %$faces) {	3041	while (my ($face, $info) = each %$faces) {
2726	next unless $info->{smooth};	3042	next unless $info->{smooth};
2727	my $idx = cf::face::find $face	3043	my $idx = cf::face::find $face
2728	or next;	3044	or next;
2729	if (my $smooth = cf::face::find $info->{smooth}) {	3045	if (my $smooth = cf::face::find $info->{smooth}) {
		3046	cf::face::set_smooth $idx, $smooth;
2730	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3047	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731	} else {	3048	} else {
2732	warn "smooth face '$info->{smooth}' not found for face '$face'";	3049	warn "smooth face '$info->{smooth}' not found for face '$face'";
2733	}	3050	}
2734	Coro::cede;	3051
		3052	cf::cede_to_tick;
2735	}	3053	}
2736	}	3054	}
2737		3055
2738	{	3056	{
2739	my $anims = $facedata->{animinfo};	3057	my $anims = $facedata->{animinfo};
2740		3058
2741	while (my ($anim, $info) = each %$anims) {	3059	while (my ($anim, $info) = each %$anims) {
2742	cf::anim::set $anim, $info->{frames}, $info->{facings};	3060	cf::anim::set $anim, $info->{frames}, $info->{facings};
2743	Coro::cede;	3061	cf::cede_to_tick;
2744	}	3062	}
2745		3063
2746	cf::anim::invalidate_all; # d'oh	3064	cf::anim::invalidate_all; # d'oh
2747	}	3065	}
2748		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
2749	1	3116	1
2750	}	3117	}
2751		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
2752	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
2753	load_resource_file "$MAPDIR/regions"	3132	load_resource_file "$MAPDIR/regions"
2754	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	}
2755	}	3139	}
2756		3140
2757	sub reload_facedata {	3141	sub reload_facedata {
2758	load_facedata "$DATADIR/facedata"	3142	load_facedata "$DATADIR/facedata"
2759	or die "unable to load facedata\n";	3143	or die "unable to load facedata\n";
…		…
2788		3172
2789	sub init {	3173	sub init {
2790	reload_resources;	3174	reload_resources;
2791	}	3175	}
2792		3176
2793	sub cfg_load {	3177	sub reload_config {
2794	open my $fh, "<:utf8", "$CONFDIR/config"	3178	open my $fh, "<:utf8", "$CONFDIR/config"
2795	or return;	3179	or return;
2796		3180
2797	local $/;	3181	local $/;
2798	*CFG = YAML::Syck::Load <$fh>;	3182	*CFG = YAML::Syck::Load <$fh>;
…		…
2814	sub main {	3198	sub main {
2815	# we must not ever block the main coroutine	3199	# we must not ever block the main coroutine
2816	local $Coro::idle = sub {	3200	local $Coro::idle = sub {
2817	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#
2818	(async {	3202	(async {
		3203	$Coro::current->{desc} = "IDLE BUG HANDLER";
2819	Event::one_event;	3204	Event::one_event;
2820	})->prio (Coro::PRIO_MAX);	3205	})->prio (Coro::PRIO_MAX);
2821	};	3206	};
2822		3207
2823	cfg_load;	3208	reload_config;
2824	db_init;	3209	db_init;
2825	load_extensions;	3210	load_extensions;
2826		3211
2827	$TICK_WATCHER->start;	3212	$TICK_WATCHER->start;
2828	Event::loop;	3213	Event::loop;
…		…
3021	warn "reloading cf.pm";	3406	warn "reloading cf.pm";
3022	require cf;	3407	require cf;
3023	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3408	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3024		3409
3025	warn "loading config and database again";	3410	warn "loading config and database again";
3026	cf::cfg_load;	3411	cf::reload_config;
3027		3412
3028	warn "loading extensions";	3413	warn "loading extensions";
3029	cf::load_extensions;	3414	cf::load_extensions;
3030		3415
3031	warn "reattaching attachments to objects/players";	3416	warn "reattaching attachments to objects/players";
…		…
3067	register_command "reload" => sub {	3452	register_command "reload" => sub {
3068	my ($who, $arg) = @_;	3453	my ($who, $arg) = @_;
3069		3454
3070	if ($who->flag (FLAG_WIZ)) {	3455	if ($who->flag (FLAG_WIZ)) {
3071	$who->message ("reloading server.");	3456	$who->message ("reloading server.");
		3457	async {
		3458	$Coro::current->{desc} = "perl_reload";
3072	async { reload_perl };	3459	reload_perl;
		3460	};
3073	}	3461	}
3074	};	3462	};
3075		3463
3076	unshift @INC, $LIBDIR;	3464	unshift @INC, $LIBDIR;
3077		3465
…		…
3096	my $signal = new Coro::Signal;	3484	my $signal = new Coro::Signal;
3097	push @WAIT_FOR_TICK_BEGIN, $signal;	3485	push @WAIT_FOR_TICK_BEGIN, $signal;
3098	$signal->wait;	3486	$signal->wait;
3099	}	3487	}
3100		3488
3101	my $min = 1e6;#d#
3102	my $avg = 10;
3103	$TICK_WATCHER = Event->timer (	3489	$TICK_WATCHER = Event->timer (
3104	reentrant => 0,	3490	reentrant => 0,
3105	parked => 1,	3491	parked => 1,
3106	prio => 0,	3492	prio => 0,
3107	at => $NEXT_TICK \|\| $TICK,	3493	at => $NEXT_TICK \|\| $TICK,
…		…
3115		3501
3116	$NOW = $tick_start = Event::time;	3502	$NOW = $tick_start = Event::time;
3117		3503
3118	cf::server_tick; # one server iteration	3504	cf::server_tick; # one server iteration
3119		3505
3120	0 && sync_job {#d#
3121	for(1..10) {
3122	my $t = Event::time;
3123	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3124	or die;
3125
3126	$map->width (50);
3127	$map->height (50);
3128	$map->alloc;
3129	$map->_load_objects ("/tmp/x.map", 1);
3130	my $t = Event::time - $t;
3131
3132	#next unless $t < 0.0013;#d#
3133	if ($t < $min) {
3134	$min = $t;
3135	}
3136	$avg = $avg * 0.99 + $t * 0.01;
3137	}
3138	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3139	exit 0;
3140	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3141	};
3142
3143	$RUNTIME += $TICK;	3506	$RUNTIME += $TICK;
3144	$NEXT_TICK += $TICK;	3507	$NEXT_TICK += $TICK;
3145		3508
3146	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3509	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3147	$NEXT_RUNTIME_WRITE = $NOW + 10;	3510	$NEXT_RUNTIME_WRITE = $NOW + 10;
3148	Coro::async_pool {	3511	Coro::async_pool {
		3512	$Coro::current->{desc} = "runtime saver";
3149	write_runtime	3513	write_runtime
3150	or warn "ERROR: unable to write runtime file: $!";	3514	or warn "ERROR: unable to write runtime file: $!";
3151	};	3515	};
3152	}	3516	}
3153		3517
3154	# my $AFTER = Event::time;
3155	# warn $AFTER - $NOW;#d#
3156
3157	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3518	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3158	$sig->send;	3519	$sig->send;
3159	}	3520	}
3160	while (my $sig = shift @WAIT_FOR_TICK) {	3521	while (my $sig = shift @WAIT_FOR_TICK) {
3161	$sig->send;	3522	$sig->send;
…		…
3171		3532
3172	$LOAD = ($NOW - $tick_start) / $TICK;	3533	$LOAD = ($NOW - $tick_start) / $TICK;
3173	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3534	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3174		3535
3175	_post_tick;	3536	_post_tick;
3176
3177
3178	},	3537	},
3179	);	3538	);
3180		3539
3181	{	3540	{
		3541	BDB::min_parallel 8;
3182	BDB::max_poll_time $TICK * 0.1;	3542	BDB::max_poll_time $TICK * 0.1;
3183	$BDB_POLL_WATCHER = Event->io (	3543	$BDB_POLL_WATCHER = Event->io (
3184	reentrant => 0,	3544	reentrant => 0,
3185	fd => BDB::poll_fileno,	3545	fd => BDB::poll_fileno,
3186	poll => 'r',	3546	poll => 'r',
3187	prio => 0,	3547	prio => 0,
3188	data => WF_AUTOCANCEL,	3548	data => WF_AUTOCANCEL,
3189	cb => \&BDB::poll_cb,	3549	cb => \&BDB::poll_cb,
3190	);	3550	);
3191	BDB::min_parallel 8;
3192		3551
3193	BDB::set_sync_prepare {	3552	BDB::set_sync_prepare {
3194	my $status;	3553	my $status;
3195	my $current = $Coro::current;	3554	my $current = $Coro::current;
3196	(	3555	(
…		…
3205	)	3564	)
3206	};	3565	};
3207		3566
3208	unless ($DB_ENV) {	3567	unless ($DB_ENV) {
3209	$DB_ENV = BDB::db_env_create;	3568	$DB_ENV = BDB::db_env_create;
		3569	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC
		3570	\| BDB::LOG_AUTOREMOVE, 1);
		3571	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3572	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3210		3573
3211	cf::sync_job {	3574	cf::sync_job {
3212	eval {	3575	eval {
3213	BDB::db_env_open	3576	BDB::db_env_open
3214	$DB_ENV,	3577	$DB_ENV,
…		…
3216	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN	3579	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN
3217	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3580	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3218	0666;	3581	0666;
3219		3582
3220	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3583	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3221
3222	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
3223	$DB_ENV->set_lk_detect;
3224	};	3584	};
3225		3585
3226	cf::cleanup "db_env_open(db): $@" if $@;	3586	cf::cleanup "db_env_open(db): $@" if $@;
3227	};	3587	};
3228	}	3588	}
		3589
		3590	$BDB_DEADLOCK_WATCHER = Event->timer (
		3591	after => 3,
		3592	interval => 1,
		3593	hard => 1,
		3594	prio => 0,
		3595	data => WF_AUTOCANCEL,
		3596	cb => sub {
		3597	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3598	},
		3599	);
		3600	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3601	after => 11,
		3602	interval => 60,
		3603	hard => 1,
		3604	prio => 0,
		3605	data => WF_AUTOCANCEL,
		3606	cb => sub {
		3607	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3608	},
		3609	);
		3610	$BDB_TRICKLE_WATCHER = Event->timer (
		3611	after => 5,
		3612	interval => 10,
		3613	hard => 1,
		3614	prio => 0,
		3615	data => WF_AUTOCANCEL,
		3616	cb => sub {
		3617	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3618	},
		3619	);
3229	}	3620	}
3230		3621
3231	{	3622	{
3232	IO::AIO::min_parallel 8;	3623	IO::AIO::min_parallel 8;
3233		3624
…		…
3236	$AIO_POLL_WATCHER = Event->io (	3627	$AIO_POLL_WATCHER = Event->io (
3237	reentrant => 0,	3628	reentrant => 0,
3238	data => WF_AUTOCANCEL,	3629	data => WF_AUTOCANCEL,
3239	fd => IO::AIO::poll_fileno,	3630	fd => IO::AIO::poll_fileno,
3240	poll => 'r',	3631	poll => 'r',
3241	prio => 6,	3632	prio => 0,
3242	cb => \&IO::AIO::poll_cb,	3633	cb => \&IO::AIO::poll_cb,
3243	);	3634	);
3244	}	3635	}
3245		3636
3246	my $_log_backtrace;	3637	my $_log_backtrace;
…		…
3252		3643
3253	# limit the # of concurrent backtraces	3644	# limit the # of concurrent backtraces
3254	if ($_log_backtrace < 2) {	3645	if ($_log_backtrace < 2) {
3255	++$_log_backtrace;	3646	++$_log_backtrace;
3256	async {	3647	async {
		3648	$Coro::current->{desc} = "abt $msg";
		3649
3257	my @bt = fork_call {	3650	my @bt = fork_call {
3258	@addr = map { sprintf "%x", $_ } @addr;	3651	@addr = map { sprintf "%x", $_ } @addr;
3259	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3652	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3260	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"	3653	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"
3261	or die "addr2line: $!";	3654	or die "addr2line: $!";

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.298 by root, Sun Jul 8 14:50:07 2007 UTC vs. Revision 1.380 by root, Mon Oct 8 13:58:07 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.380 by root, Mon Oct 8 13:58:07 2007 UTC