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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.287 by root, Mon Jun 25 05:43:45 2007 UTC vs.
Revision 1.367 by root, Wed Sep 12 11:10:11 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 3.64 ();
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
		26	use JSON::XS ();
25	use BDB ();	27	use BDB ();
26	use Data::Dumper;	28	use Data::Dumper;
27	use Digest::MD5;	29	use Digest::MD5;
28	use Fcntl;	30	use Fcntl;
29	use YAML::Syck ();	31	use YAML::Syck ();
30	use IO::AIO 2.32 ();	32	use IO::AIO 2.32 ();
31	use Time::HiRes;	33	use Time::HiRes;
32	use Compress::LZF;	34	use Compress::LZF;
		35	use Digest::MD5 ();
33		36
34	# configure various modules to our taste	37	# configure various modules to our taste
35	#	38	#
36	$Storable::canonical = 1; # reduce rsync transfers	39	$Storable::canonical = 1; # reduce rsync transfers
37	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
…		…
77	our $NEXT_TICK;	80	our $NEXT_TICK;
78	our $NOW;	81	our $NOW;
79	our $USE_FSYNC = 1; # use fsync to write maps - default off	82	our $USE_FSYNC = 1; # use fsync to write maps - default off
80		83
81	our $BDB_POLL_WATCHER;	84	our $BDB_POLL_WATCHER;
		85	our $BDB_CHECKPOINT_WATCHER;
		86	our $BDB_TRICKLE_WATCHER;
82	our $DB_ENV;	87	our $DB_ENV;
83		88
84	our %CFG;	89	our %CFG;
85		90
86	our $UPTIME; $UPTIME \|\|= time;	91	our $UPTIME; $UPTIME \|\|= time;
87	our $RUNTIME;	92	our $RUNTIME;
88		93
89	our %PLAYER; # all users	94	our (%PLAYER, %PLAYER_LOADING); # all users
90	our %MAP; # all maps	95	our (%MAP, %MAP_LOADING ); # all maps
91	our $LINK_MAP; # the special {link} map, which is always available	96	our $LINK_MAP; # the special {link} map, which is always available
92		97
93	# used to convert map paths into valid unix filenames by replacing / by ∕	98	# used to convert map paths into valid unix filenames by replacing / by ∕
94	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	99	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
95		100
…		…
165		170
166	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	171	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
167	returns directly I<after> the tick processing (and consequently, can only wake one process	172	returns directly I<after> the tick processing (and consequently, can only wake one process
168	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	173	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
169		174
		175	=item @cf::INVOKE_RESULTS
		176
		177	This array contains the results of the last C<invoke ()> call. When
		178	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		179	that call.
		180
170	=back	181	=back
171		182
172	=cut	183	=cut
173		184
174	BEGIN {	185	BEGIN {
…		…
178	$msg .= "\n"	189	$msg .= "\n"
179	unless $msg =~ /\n$/;	190	unless $msg =~ /\n$/;
180		191
181	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	192	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
182		193
183	utf8::encode $msg;
184	LOG llevError, $msg;	194	LOG llevError, $msg;
185	};	195	};
186	}	196	}
187		197
188	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	198	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
237	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	247	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
238	$d	248	$d
239	} \|\| "[unable to dump $_[0]: '$@']";	249	} \|\| "[unable to dump $_[0]: '$@']";
240	}	250	}
241		251
242	use JSON::XS ();
243
244	=item $ref = cf::from_json $json	252	=item $ref = cf::from_json $json
245		253
246	Converts a JSON string into the corresponding perl data structure.	254	Converts a JSON string into the corresponding perl data structure.
247		255
248	=item $json = cf::to_json $ref	256	=item $json = cf::to_json $ref
249		257
250	Converts a perl data structure into its JSON representation.	258	Converts a perl data structure into its JSON representation.
251		259
252	=cut	260	=cut
253		261
254	our $json_coder = JSON::XS->new->convert_blessed->utf8;	262	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255		263
256	sub to_json ($) { $json_coder->encode ($_[0]) }	264	sub to_json ($) { $json_coder->encode ($_[0]) }
257	sub from_json ($) { $json_coder->decode ($_[0]) }	265	sub from_json ($) { $json_coder->decode ($_[0]) }
258		266
259	=item cf::lock_wait $string	267	=item cf::lock_wait $string
…		…
265	Wait until the given lock is available and then acquires it and returns	273	Wait until the given lock is available and then acquires it and returns
266	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	274	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
267	for example when the coroutine gets canceled), the lock is automatically	275	for example when the coroutine gets canceled), the lock is automatically
268	returned.	276	returned.
269		277
		278	Locks are not recursive, locking from the same coro twice results in a
		279	deadlocked coro.
		280
270	Lock names should begin with a unique identifier (for example, cf::map::find	281	Lock names should begin with a unique identifier (for example, cf::map::find
271	uses map_find and cf::map::load uses map_load).	282	uses map_find and cf::map::load uses map_load).
272		283
273	=item $locked = cf::lock_active $string	284	=item $locked = cf::lock_active $string
274		285
275	Return true if the lock is currently active, i.e. somebody has locked it.	286	Return true if the lock is currently active, i.e. somebody has locked it.
276		287
277	=cut	288	=cut
278		289
279	our %LOCK;	290	our %LOCK;
		291	our %LOCKER;#d#
280		292
281	sub lock_wait($) {	293	sub lock_wait($) {
282	my ($key) = @_;	294	my ($key) = @_;
		295
		296	if ($LOCKER{$key} == $Coro::current) {#d#
		297	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		298	return;#d#
		299	}#d#
283		300
284	# wait for lock, if any	301	# wait for lock, if any
285	while ($LOCK{$key}) {	302	while ($LOCK{$key}) {
286	push @{ $LOCK{$key} }, $Coro::current;	303	push @{ $LOCK{$key} }, $Coro::current;
287	Coro::schedule;	304	Coro::schedule;
…		…
293		310
294	# wait, to be sure we are not locked	311	# wait, to be sure we are not locked
295	lock_wait $key;	312	lock_wait $key;
296		313
297	$LOCK{$key} = [];	314	$LOCK{$key} = [];
		315	$LOCKER{$key} = $Coro::current;#d#
298		316
299	Coro::guard {	317	Coro::guard {
		318	delete $LOCKER{$key};#d#
300	# wake up all waiters, to be on the safe side	319	# wake up all waiters, to be on the safe side
301	$_->ready for @{ delete $LOCK{$key} };	320	$_->ready for @{ delete $LOCK{$key} };
302	}	321	}
303	}	322	}
304		323
…		…
314	my $guard = Coro::guard {	333	my $guard = Coro::guard {
315	$TICK_WATCHER->start;	334	$TICK_WATCHER->start;
316	};	335	};
317	$TICK_WATCHER->stop;	336	$TICK_WATCHER->stop;
318	$guard	337	$guard
		338	}
		339
		340	=item cf::get_slot $time[, $priority[, $name]]
		341
		342	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		343	This call blocks and returns only when you have at least C<$time> seconds
		344	of cpu time till the next tick. The slot is only valid till the next cede.
		345
		346	The optional C<$name> can be used to identify the job to run. It might be
		347	used for statistical purposes and should identify the same time-class.
		348
		349	Useful for short background jobs.
		350
		351	=cut
		352
		353	our @SLOT_QUEUE;
		354	our $SLOT_QUEUE;
		355
		356	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		357	$SLOT_QUEUE = Coro::async {
		358	my $signal = new Coro::Signal;
		359
		360	while () {
		361	next_job:
		362	my $avail = cf::till_tick;
		363	if ($avail > 0.01) {
		364	for (0 .. $#SLOT_QUEUE) {
		365	if ($SLOT_QUEUE[$_][0] < $avail) {
		366	my $job = splice @SLOT_QUEUE, $_, 1, ();
		367	$job->[2]->send;
		368	Coro::cede;
		369	goto next_job;
		370	}
		371	}
		372	}
		373
		374	if (@SLOT_QUEUE) {
		375	# we do not use wait_For_tick() as it returns immediately when tick is inactive
		376	push @cf::WAIT_FOR_TICK, $signal;
		377	$signal->wait;
		378	} else {
		379	Coro::schedule;
		380	}
		381	}
		382	};
		383
		384	sub get_slot($;$$) {
		385	my ($time, $pri, $name) = @_;
		386
		387	$time = $TICK * .6 if $time > $TICK * .6;
		388	my $sig = new Coro::Signal;
		389
		390	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		391	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		392	$SLOT_QUEUE->ready;
		393	$sig->wait;
319	}	394	}
320		395
321	=item cf::async { BLOCK }	396	=item cf::async { BLOCK }
322		397
323	Currently the same as Coro::async_pool, meaning you cannot use	398	Currently the same as Coro::async_pool, meaning you cannot use
…		…
413	=cut	488	=cut
414		489
415	sub fork_call(&@) {	490	sub fork_call(&@) {
416	my ($cb, @args) = @_;	491	my ($cb, @args) = @_;
417		492
418	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	493	# we seemingly have to make a local copy of the whole thing,
419	# or die "socketpair: $!";	494	# otherwise perl prematurely frees the stuff :/
420	pipe my $fh1, my $fh2	495	# TODO: investigate and fix (likely this will be rather laborious)
421	or die "pipe: $!";
422		496
423	if (my $pid = fork) {	497	my @res = Coro::Util::fork_eval {
424	close $fh2;
425
426	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
427	$res = Coro::Storable::thaw $res;
428
429	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431	die $$res unless "ARRAY" eq ref $res;
432
433	return wantarray ? @$res : $res->[-1];
434	} else {
435	reset_signals;	498	reset_signals;
436	local $SIG{__WARN__};	499	&$cb
437	local $SIG{__DIE__};	500	}, @args;
438	eval {
439	close $fh1;
440		501
441	my @res = eval { $cb->(@args) };	502	wantarray ? @res : $res[-1]
442	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
443	};
444
445	warn $@ if $@;
446	_exit 0;
447	}
448	}	503	}
449		504
450	=item $value = cf::db_get $family => $key	505	=item $value = cf::db_get $family => $key
451		506
452	Returns a single value from the environment database.	507	Returns a single value from the environment database.
…		…
454	=item cf::db_put $family => $key => $value	509	=item cf::db_put $family => $key => $value
455		510
456	Stores the given C<$value> in the family. It can currently store binary	511	Stores the given C<$value> in the family. It can currently store binary
457	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).	512	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
458		513
		514	=item $db = cf::db_table "name"
		515
		516	Create and/or open a new database table. The string must not be "db" and must be unique
		517	within each server.
		518
459	=cut	519	=cut
		520
		521	sub db_table($) {
		522	my ($name) = @_;
		523	my $db = BDB::db_create $DB_ENV;
		524
		525	eval {
		526	$db->set_flags (BDB::CHKSUM);
		527
		528	utf8::encode $name;
		529	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		530	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
		531	cf::cleanup "db_open(db): $!" if $!;
		532	};
		533	cf::cleanup "db_open(db): $@" if $@;
		534
		535	$db
		536	}
460		537
461	our $DB;	538	our $DB;
462		539
463	sub db_init {	540	sub db_init {
464	unless ($DB) {
465	$DB = BDB::db_create $DB_ENV;
466
467	cf::sync_job {	541	cf::sync_job {
468	eval {	542	$DB \|\|= db_table "db";
469	$DB->set_flags (BDB::CHKSUM);
470
471	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
472	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
473	cf::cleanup "db_open(db): $!" if $!;
474	};
475	cf::cleanup "db_open(db): $@" if $@;
476	};
477	}	543	};
478	}	544	}
479		545
480	sub db_get($$) {	546	sub db_get($$) {
481	my $key = "$_[0]/$_[1]";	547	my $key = "$_[0]/$_[1]";
482		548
…		…
532	if (1) {	598	if (1) {
533	$md5 =	599	$md5 =
534	join "\x00",	600	join "\x00",
535	$processversion,	601	$processversion,
536	map {	602	map {
537	Coro::cede;	603	cf::cede_to_tick;
538	($src->[$_], Digest::MD5::md5_hex $data[$_])	604	($src->[$_], Digest::MD5::md5_hex $data[$_])
539	} 0.. $#$src;	605	} 0.. $#$src;
540		606
541		607
542	my $dbmd5 = db_get cache => "$id/md5";	608	my $dbmd5 = db_get cache => "$id/md5";
…		…
848	";	914	";
849	die if $@;	915	die if $@;
850	}	916	}
851		917
852	our $override;	918	our $override;
853	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	919	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
854		920
855	sub override {	921	sub override {
856	$override = 1;	922	$override = 1;
857	@invoke_results = ();	923	@INVOKE_RESULTS = (@_);
858	}	924	}
859		925
860	sub do_invoke {	926	sub do_invoke {
861	my $event = shift;	927	my $event = shift;
862	my $callbacks = shift;	928	my $callbacks = shift;
863		929
864	@invoke_results = ();	930	@INVOKE_RESULTS = ();
865		931
866	local $override;	932	local $override;
867		933
868	for (@$callbacks) {	934	for (@$callbacks) {
869	eval { &{$_->[1]} };	935	eval { &{$_->[1]} };
…		…
886		952
887	Generate an object-specific event with the given arguments.	953	Generate an object-specific event with the given arguments.
888		954
889	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	955	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
890	removed in future versions), and there is no public API to access override	956	removed in future versions), and there is no public API to access override
891	results (if you must, access C<@cf::invoke_results> directly).	957	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
892		958
893	=back	959	=back
894		960
895	=cut	961	=cut
896		962
897	#############################################################################	963	#############################################################################
898	# object support	964	# object support
		965	#
		966
		967	sub _can_merge {
		968	my ($ob1, $ob2) = @_;
		969
		970	local $Storable::canonical = 1;
		971	my $fob1 = Storable::freeze $ob1;
		972	my $fob2 = Storable::freeze $ob2;
		973
		974	$fob1 eq $fob2
		975	}
899		976
900	sub reattach {	977	sub reattach {
901	# basically do the same as instantiate, without calling instantiate	978	# basically do the same as instantiate, without calling instantiate
902	my ($obj) = @_;	979	my ($obj) = @_;
903		980
…		…
948	);	1025	);
949		1026
950	sub object_freezer_save {	1027	sub object_freezer_save {
951	my ($filename, $rdata, $objs) = @_;	1028	my ($filename, $rdata, $objs) = @_;
952		1029
		1030	my $guard = cf::lock_acquire "io";
		1031
953	sync_job {	1032	sync_job {
954	if (length $$rdata) {	1033	if (length $$rdata) {
		1034	utf8::decode (my $decname = $filename);
955	warn sprintf "saving %s (%d,%d)\n",	1035	warn sprintf "saving %s (%d,%d)\n",
956	$filename, length $$rdata, scalar @$objs;	1036	$decname, length $$rdata, scalar @$objs;
957		1037
958	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1038	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
959	chmod SAVE_MODE, $fh;	1039	chmod SAVE_MODE, $fh;
960	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1040	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
961	aio_fsync $fh if $cf::USE_FSYNC;	1041	aio_fsync $fh if $cf::USE_FSYNC;
…		…
980	}	1060	}
981	} else {	1061	} else {
982	aio_unlink $filename;	1062	aio_unlink $filename;
983	aio_unlink "$filename.pst";	1063	aio_unlink "$filename.pst";
984	}	1064	}
985	}	1065	};
		1066
		1067	undef $guard;
986	}	1068	}
987		1069
988	sub object_freezer_as_string {	1070	sub object_freezer_as_string {
989	my ($rdata, $objs) = @_;	1071	my ($rdata, $objs) = @_;
990		1072
…		…
995		1077
996	sub object_thawer_load {	1078	sub object_thawer_load {
997	my ($filename) = @_;	1079	my ($filename) = @_;
998		1080
999	my ($data, $av);	1081	my ($data, $av);
		1082
		1083	my $guard = cf::lock_acquire "io";
1000		1084
1001	(aio_load $filename, $data) >= 0	1085	(aio_load $filename, $data) >= 0
1002	or return;	1086	or return;
1003		1087
1004	unless (aio_stat "$filename.pst") {	1088	unless (aio_stat "$filename.pst") {
1005	(aio_load "$filename.pst", $av) >= 0	1089	(aio_load "$filename.pst", $av) >= 0
1006	or return;	1090	or return;
		1091
		1092	undef $guard;
1007	$av = eval { (Storable::thaw $av)->{objs} };	1093	$av = eval { (Storable::thaw $av)->{objs} };
1008	}	1094	}
1009		1095
		1096	utf8::decode (my $decname = $filename);
1010	warn sprintf "loading %s (%d)\n",	1097	warn sprintf "loading %s (%d,%d)\n",
1011	$filename, length $data, scalar @{$av \|\| []};	1098	$decname, length $data, scalar @{$av \|\| []};
		1099
1012	return ($data, $av);	1100	($data, $av)
1013	}	1101	}
1014		1102
1015	=head2 COMMAND CALLBACKS	1103	=head2 COMMAND CALLBACKS
1016		1104
1017	=over 4	1105	=over 4
…		…
1087	cf::override;	1175	cf::override;
1088	},	1176	},
1089	on_extcmd => sub {	1177	on_extcmd => sub {
1090	my ($pl, $buf) = @_;	1178	my ($pl, $buf) = @_;
1091		1179
1092	my $msg = eval { from_json $buf };	1180	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1093		1181
1094	if (ref $msg) {	1182	if (ref $msg) {
		1183	my ($type, $reply, @payload) =
		1184	"ARRAY" eq ref $msg
		1185	? @$msg
		1186	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1187
		1188	my @reply;
		1189
1095	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1190	if (my $cb = $EXTCMD{$type}) {
1096	if (my %reply = $cb->($pl, $msg)) {	1191	@reply = $cb->($pl, @payload);
1097	$pl->ext_reply ($msg->{msgid}, %reply);
1098	}
1099	}	1192	}
		1193
		1194	$pl->ext_reply ($reply, @reply)
		1195	if $reply;
		1196
1100	} else {	1197	} else {
1101	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1198	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1102	}	1199	}
1103		1200
1104	cf::override;	1201	cf::override;
…		…
1194		1291
1195	=head3 cf::player	1292	=head3 cf::player
1196		1293
1197	=over 4	1294	=over 4
1198		1295
		1296	=item cf::player::num_playing
		1297
		1298	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1299
		1300	=cut
		1301
		1302	sub num_playing {
		1303	scalar grep
		1304	$_->ob->map
		1305	&& !$_->hidden
		1306	&& !$_->ob->flag (cf::FLAG_WIZ),
		1307	cf::player::list
		1308	}
		1309
1199	=item cf::player::find $login	1310	=item cf::player::find $login
1200		1311
1201	Returns the given player object, loading it if necessary (might block).	1312	Returns the given player object, loading it if necessary (might block).
1202		1313
1203	=cut	1314	=cut
…		…
1238	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1349	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1239	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1350	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1240	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1351	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1241	aio_unlink +(playerdir $login) . "/$login.pl";	1352	aio_unlink +(playerdir $login) . "/$login.pl";
1242		1353
1243	my $pl = load_pl path $login	1354	my $f = new_from_file cf::object::thawer path $login
1244	or return;	1355	or return;
		1356
		1357	$f->next;
		1358	my $pl = cf::player::load_pl $f
		1359	or return;
		1360	local $cf::PLAYER_LOADING{$login} = $pl;
		1361	$f->resolve_delayed_derefs;
1245	$cf::PLAYER{$login} = $pl	1362	$cf::PLAYER{$login} = $pl
1246	}	1363	}
1247	}	1364	}
1248	}	1365	}
1249		1366
…		…
1259		1376
1260	aio_mkdir playerdir $pl, 0770;	1377	aio_mkdir playerdir $pl, 0770;
1261	$pl->{last_save} = $cf::RUNTIME;	1378	$pl->{last_save} = $cf::RUNTIME;
1262		1379
1263	$pl->save_pl ($path);	1380	$pl->save_pl ($path);
1264	Coro::cede;	1381	cf::cede_to_tick;
1265	}	1382	}
1266		1383
1267	sub new($) {	1384	sub new($) {
1268	my ($login) = @_;	1385	my ($login) = @_;
1269		1386
…		…
1273	$self->{deny_save} = 1;	1390	$self->{deny_save} = 1;
1274		1391
1275	$cf::PLAYER{$login} = $self;	1392	$cf::PLAYER{$login} = $self;
1276		1393
1277	$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 (@_);
1278	}	1405	}
1279		1406
1280	=item $pl->quit_character	1407	=item $pl->quit_character
1281		1408
1282	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
…		…
1337	or return [];	1464	or return [];
1338		1465
1339	my @logins;	1466	my @logins;
1340		1467
1341	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") {
1342	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1473	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1343	aio_read $fh, 0, 512, my $buf, 0 or next;	1474	aio_read $fh, 0, 512, my $buf, 0 or next;
1344	$buf !~ /^password -------------$/m or next; # official not-valid tag	1475	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1476	}
1345		1477
1346	utf8::decode $login;	1478	utf8::decode $login;
1347	push @logins, $login;	1479	push @logins, $login;
1348	}	1480	}
1349		1481
…		…
1387	sub expand_cfpod {	1519	sub expand_cfpod {
1388	((my $self), (local $_)) = @_;	1520	((my $self), (local $_)) = @_;
1389		1521
1390	# escape & and <	1522	# escape & and <
1391	s/&/&/g;	1523	s/&/&/g;
1392	s/(?<![BIUGH])</</g;	1524	s/(?<![BIUGHT])</</g;
1393		1525
1394	# 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
1395		1527
1396	1 while	1528	1 while
1397	# replace B<>, I<>, U<> etc.	1529	# replace B<>, I<>, U<> etc.
1398	s/B<([^\>]*)>/<b>$1<\/b>/	1530	s/B<([^\>]*)>/<b>$1<\/b>/
1399	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1531	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1400	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1532	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1533	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1401	# replace G<male\|female> tags	1534	# replace G<male\|female> tags
1402	\|\| s{G<([^>\|])\\|([^>])>}{	1535	\|\| s{G<([^>\|])\\|([^>])>}{
1403	$self->gender ? $2 : $1	1536	$self->gender ? $2 : $1
1404	}ge	1537	}ge
1405	# replace H<hint text>	1538	# replace H<hint text>
1406	\|\| s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;	1539	\|\| s{H<([^\>]*)>}
		1540	{
		1541	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1542	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1543	"")
		1544	[$self->{hintmode}]
		1545	}ge;
1407		1546
1408	# create single paragraphs (very hackish)	1547	# create single paragraphs (very hackish)
1409	s/(?<=\S)\n(?=\w)/ /g;	1548	s/(?<=\S)\n(?=\w)/ /g;
1410		1549
		1550	# compress some whitespace
		1551	s/\s+\n/\n/g; # ws line-ends
		1552	s/\n\n+/\n/g; # double lines
		1553	s/^\n+//; # beginning lines
		1554	s/\n+$//; # ending lines
		1555
1411	$_	1556	$_
1412	}	1557	}
1413		1558
		1559	sub hintmode {
		1560	$_[0]{hintmode} = $_[1] if @_ > 1;
		1561	$_[0]{hintmode}
		1562	}
		1563
1414	=item $player->ext_reply ($msgid, %msg)	1564	=item $player->ext_reply ($msgid, @msg)
1415		1565
1416	Sends an ext reply to the player.	1566	Sends an ext reply to the player.
1417		1567
1418	=cut	1568	=cut
1419		1569
1420	sub ext_reply($$%) {	1570	sub ext_reply($$@) {
1421	my ($self, $id, %msg) = @_;	1571	my ($self, $id, @msg) = @_;
1422		1572
1423	$msg{msgid} = $id;	1573	$self->ns->ext_reply ($id, @msg)
1424	$self->send ("ext " . cf::to_json \%msg);
1425	}	1574	}
1426		1575
1427	=item $player->ext_event ($type, %msg)	1576	=item $player->ext_msg ($type, @msg)
1428		1577
1429	Sends an ext event to the client.	1578	Sends an ext event to the client.
1430		1579
1431	=cut	1580	=cut
1432		1581
1433	sub ext_event($$%) {	1582	sub ext_msg($$@) {
1434	my ($self, $type, %msg) = @_;	1583	my ($self, $type, @msg) = @_;
1435		1584
1436	$self->ns->ext_event ($type, %msg);	1585	$self->ns->ext_msg ($type, @msg);
1437	}	1586	}
1438		1587
1439	=head3 cf::region	1588	=head3 cf::region
1440		1589
1441	=over 4	1590	=over 4
…		…
1454	my ($path) = @_;	1603	my ($path) = @_;
1455		1604
1456	my ($match, $specificity);	1605	my ($match, $specificity);
1457		1606
1458	for my $region (list) {	1607	for my $region (list) {
1459	if ($region->match && $path =~ $region->match) {	1608	if ($region->{match} && $path =~ $region->{match}) {
1460	($match, $specificity) = ($region, $region->specificity)	1609	($match, $specificity) = ($region, $region->specificity)
1461	if $region->specificity > $specificity;	1610	if $region->specificity > $specificity;
1462	}	1611	}
1463	}	1612	}
1464		1613
…		…
1584	$self->init; # pass $1 etc.	1733	$self->init; # pass $1 etc.
1585	return $self;	1734	return $self;
1586	}	1735	}
1587	}	1736	}
1588		1737
1589	Carp::carp "unable to resolve path '$path' (base '$base').";	1738	Carp::cluck "unable to resolve path '$path' (base '$base').";
1590	()	1739	()
1591	}	1740	}
1592		1741
1593	sub init {	1742	sub init {
1594	my ($self) = @_;	1743	my ($self) = @_;
…		…
1657		1806
1658	sub load_header_from($) {	1807	sub load_header_from($) {
1659	my ($self, $path) = @_;	1808	my ($self, $path) = @_;
1660		1809
1661	utf8::encode $path;	1810	utf8::encode $path;
1662	#aio_open $path, O_RDONLY, 0	1811	my $f = new_from_file cf::object::thawer $path
1663	# or return;
1664
1665	$self->_load_header ($path)
1666	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;
1667		1819
1668	$self->{load_path} = $path;	1820	$self->{load_path} = $path;
1669		1821
1670	1	1822	1
1671	}	1823	}
…		…
1725	sub find {	1877	sub find {
1726	my ($path, $origin) = @_;	1878	my ($path, $origin) = @_;
1727		1879
1728	$path = normalise $path, $origin && $origin->path;	1880	$path = normalise $path, $origin && $origin->path;
1729		1881
		1882	cf::lock_wait "map_data:$path";#d#remove
1730	cf::lock_wait "map_find:$path";	1883	cf::lock_wait "map_find:$path";
1731		1884
1732	$cf::MAP{$path} \|\| do {	1885	$cf::MAP{$path} \|\| do {
1733	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
1734	my $map = new_from_path cf::map $path	1889	my $map = new_from_path cf::map $path
1735	or return;	1890	or return;
1736		1891
1737	$map->{last_save} = $cf::RUNTIME;	1892	$map->{last_save} = $cf::RUNTIME;
1738		1893
…		…
1740	or return;	1895	or return;
1741		1896
1742	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1897	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1743	# doing this can freeze the server in a sync job, obviously	1898	# doing this can freeze the server in a sync job, obviously
1744	#$cf::WAIT_FOR_TICK->wait;	1899	#$cf::WAIT_FOR_TICK->wait;
		1900	undef $guard1;
		1901	undef $guard2;
1745	$map->reset;	1902	$map->reset;
1746	undef $guard;
1747	return find $path;	1903	return find $path;
1748	}	1904	}
1749		1905
1750	$cf::MAP{$path} = $map	1906	$cf::MAP{$path} = $map
1751	}	1907	}
…		…
1760	local $self->{deny_reset} = 1; # loading can take a long time	1916	local $self->{deny_reset} = 1; # loading can take a long time
1761		1917
1762	my $path = $self->{path};	1918	my $path = $self->{path};
1763		1919
1764	{	1920	{
1765	my $guard = cf::lock_acquire "map_load:$path";	1921	my $guard = cf::lock_acquire "map_data:$path";
1766		1922
		1923	return unless $self->valid;
1767	return if $self->in_memory != cf::MAP_SWAPPED;	1924	return unless $self->in_memory == cf::MAP_SWAPPED;
1768		1925
1769	$self->in_memory (cf::MAP_LOADING);	1926	$self->in_memory (cf::MAP_LOADING);
1770		1927
1771	$self->alloc;	1928	$self->alloc;
1772		1929
1773	$self->pre_load;	1930	$self->pre_load;
1774	Coro::cede;	1931	cf::cede_to_tick;
1775		1932
		1933	my $f = new_from_file cf::object::thawer $self->{load_path};
		1934	$f->skip_block;
1776	$self->_load_objects ($self->{load_path}, 1)	1935	$self->_load_objects ($f)
1777	or return;	1936	or return;
1778		1937
1779	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1938	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1780	if delete $self->{load_original};	1939	if delete $self->{load_original};
1781		1940
1782	if (my $uniq = $self->uniq_path) {	1941	if (my $uniq = $self->uniq_path) {
1783	utf8::encode $uniq;	1942	utf8::encode $uniq;
1784	if (aio_open $uniq, O_RDONLY, 0) {	1943	unless (aio_stat $uniq) {
		1944	if (my $f = new_from_file cf::object::thawer $uniq) {
1785	$self->clear_unique_items;	1945	$self->clear_unique_items;
1786	$self->_load_objects ($uniq, 0);	1946	$self->_load_objects ($f);
		1947	$f->resolve_delayed_derefs;
		1948	}
1787	}	1949	}
1788	}	1950	}
1789		1951
1790	Coro::cede;	1952	$f->resolve_delayed_derefs;
		1953
		1954	cf::cede_to_tick;
1791	# now do the right thing for maps	1955	# now do the right thing for maps
1792	$self->link_multipart_objects;	1956	$self->link_multipart_objects;
1793	$self->difficulty ($self->estimate_difficulty)	1957	$self->difficulty ($self->estimate_difficulty)
1794	unless $self->difficulty;	1958	unless $self->difficulty;
1795	Coro::cede;	1959	cf::cede_to_tick;
1796		1960
1797	unless ($self->{deny_activate}) {	1961	unless ($self->{deny_activate}) {
1798	$self->decay_objects;	1962	$self->decay_objects;
1799	$self->fix_auto_apply;	1963	$self->fix_auto_apply;
1800	$self->update_buttons;	1964	$self->update_buttons;
1801	Coro::cede;	1965	cf::cede_to_tick;
1802	$self->set_darkness_map;	1966	$self->set_darkness_map;
1803	Coro::cede;	1967	cf::cede_to_tick;
1804	$self->activate;	1968	$self->activate;
1805	}	1969	}
		1970
		1971	$self->{last_save} = $cf::RUNTIME;
		1972	$self->last_access ($cf::RUNTIME);
1806		1973
1807	$self->in_memory (cf::MAP_IN_MEMORY);	1974	$self->in_memory (cf::MAP_IN_MEMORY);
1808	}	1975	}
1809		1976
1810	$self->post_load;	1977	$self->post_load;
…		…
1821		1988
1822	$self	1989	$self
1823	}	1990	}
1824		1991
1825	# 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
1826	sub load_diag {	1993	sub load_neighbours {
1827	my ($map) = @_;	1994	my ($map) = @_;
1828		1995
1829	my @diag; # diagonal neighbours	1996	my @neigh; # diagonal neighbours
1830		1997
1831	for (0 .. 3) {	1998	for (0 .. 3) {
1832	my $neigh = $map->tile_path ($_)	1999	my $neigh = $map->tile_path ($_)
1833	or next;	2000	or next;
1834	$neigh = find $neigh, $map	2001	$neigh = find $neigh, $map
1835	or next;	2002	or next;
1836	$neigh->load;	2003	$neigh->load;
1837		2004
		2005	push @neigh,
1838	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2006	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1839	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2007	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1840	}	2008	}
1841		2009
1842	for (@diag) {	2010	for (grep defined $_->[0], @neigh) {
		2011	my ($path, $origin) = @$_;
1843	my $neigh = find @$_	2012	my $neigh = find $path, $origin
1844	or next;	2013	or next;
1845	$neigh->load;	2014	$neigh->load;
1846	}	2015	}
1847	}	2016	}
1848		2017
…		…
1853	}	2022	}
1854		2023
1855	sub do_load_sync {	2024	sub do_load_sync {
1856	my ($map) = @_;	2025	my ($map) = @_;
1857		2026
		2027	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2028	if $Coro::current == $Coro::main;
		2029
1858	cf::sync_job { $map->load };	2030	cf::sync_job { $map->load };
1859	}	2031	}
1860		2032
1861	our %MAP_PREFETCH;	2033	our %MAP_PREFETCH;
1862	our $MAP_PREFETCHER = undef;	2034	our $MAP_PREFETCHER = undef;
1863		2035
1864	sub find_async {	2036	sub find_async {
1865	my ($path, $origin) = @_;	2037	my ($path, $origin, $load) = @_;
1866		2038
1867	$path = normalise $path, $origin && $origin->{path};	2039	$path = normalise $path, $origin && $origin->{path};
1868		2040
1869	if (my $map = $cf::MAP{$path}) {	2041	if (my $map = $cf::MAP{$path}) {
1870	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2042	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1871	}	2043	}
1872		2044
1873	undef $MAP_PREFETCH{$path};	2045	$MAP_PREFETCH{$path} \|= $load;
		2046
1874	$MAP_PREFETCHER \|\|= cf::async {	2047	$MAP_PREFETCHER \|\|= cf::async {
1875	while (%MAP_PREFETCH) {	2048	while (%MAP_PREFETCH) {
1876	for my $path (keys %MAP_PREFETCH) {	2049	while (my ($k, $v) = each %MAP_PREFETCH) {
1877	my $map = find $path	2050	if (my $map = find $k) {
1878	or next;
1879	$map->load;	2051	$map->load if $v;
		2052	}
1880		2053
1881	delete $MAP_PREFETCH{$path};	2054	delete $MAP_PREFETCH{$k};
1882	}	2055	}
1883	}	2056	}
1884	undef $MAP_PREFETCHER;	2057	undef $MAP_PREFETCHER;
1885	};	2058	};
1886	$MAP_PREFETCHER->prio (6);	2059	$MAP_PREFETCHER->prio (6);
…		…
1889	}	2062	}
1890		2063
1891	sub save {	2064	sub save {
1892	my ($self) = @_;	2065	my ($self) = @_;
1893		2066
1894	my $lock = cf::lock_acquire "map_data:" . $self->path;	2067	my $lock = cf::lock_acquire "map_data:$self->{path}";
1895		2068
1896	$self->{last_save} = $cf::RUNTIME;	2069	$self->{last_save} = $cf::RUNTIME;
1897		2070
1898	return unless $self->dirty;	2071	return unless $self->dirty;
1899		2072
…		…
1922	my ($self) = @_;	2095	my ($self) = @_;
1923		2096
1924	# save first because save cedes	2097	# save first because save cedes
1925	$self->save;	2098	$self->save;
1926		2099
1927	my $lock = cf::lock_acquire "map_data:" . $self->path;	2100	my $lock = cf::lock_acquire "map_data:$self->{path}";
1928		2101
1929	return if $self->players;	2102	return if $self->players;
1930	return if $self->in_memory != cf::MAP_IN_MEMORY;	2103	return if $self->in_memory != cf::MAP_IN_MEMORY;
1931	return if $self->{deny_save};	2104	return if $self->{deny_save};
1932		2105
		2106	$self->in_memory (cf::MAP_SWAPPED);
		2107
		2108	$self->deactivate;
		2109	$_->clear_links_to ($self) for values %cf::MAP;
1933	$self->clear;	2110	$self->clear;
1934	$self->in_memory (cf::MAP_SWAPPED);
1935	}	2111	}
1936		2112
1937	sub reset_at {	2113	sub reset_at {
1938	my ($self) = @_;	2114	my ($self) = @_;
1939		2115
…		…
1971	if $uniq;	2147	if $uniq;
1972	}	2148	}
1973		2149
1974	delete $cf::MAP{$self->path};	2150	delete $cf::MAP{$self->path};
1975		2151
		2152	$self->deactivate;
		2153	$_->clear_links_to ($self) for values %cf::MAP;
1976	$self->clear;	2154	$self->clear;
1977
1978	$_->clear_links_to ($self) for values %cf::MAP;
1979		2155
1980	$self->unlink_save;	2156	$self->unlink_save;
1981	$self->destroy;	2157	$self->destroy;
1982	}	2158	}
1983		2159
1984	my $nuke_counter = "aaaa";	2160	my $nuke_counter = "aaaa";
1985		2161
1986	sub nuke {	2162	sub nuke {
1987	my ($self) = @_;	2163	my ($self) = @_;
1988		2164
		2165	{
		2166	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2167
1989	delete $cf::MAP{$self->path};	2168	delete $cf::MAP{$self->path};
1990		2169
1991	$self->unlink_save;	2170	$self->unlink_save;
1992		2171
1993	bless $self, "cf::map";	2172	bless $self, "cf::map";
1994	delete $self->{deny_reset};	2173	delete $self->{deny_reset};
1995	$self->{deny_save} = 1;	2174	$self->{deny_save} = 1;
1996	$self->reset_timeout (1);	2175	$self->reset_timeout (1);
1997	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2176	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1998		2177
1999	$cf::MAP{$self->path} = $self;	2178	$cf::MAP{$self->path} = $self;
		2179	}
2000		2180
2001	$self->reset; # polite request, might not happen	2181	$self->reset; # polite request, might not happen
2002	}	2182	}
2003		2183
2004	=item $maps = cf::map::tmp_maps	2184	=item $maps = cf::map::tmp_maps
…		…
2080		2260
2081	sub inv_recursive {	2261	sub inv_recursive {
2082	inv_recursive_ inv $_[0]	2262	inv_recursive_ inv $_[0]
2083	}	2263	}
2084		2264
		2265	=item $ref = $ob->ref
		2266
		2267	creates and returns a persistent reference to an objetc that can be stored as a string.
		2268
		2269	=item $ob = cf::object::deref ($refstring)
		2270
		2271	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2272	even if the object actually exists. May block.
		2273
		2274	=cut
		2275
		2276	sub deref {
		2277	my ($ref) = @_;
		2278
		2279	# temporary compatibility#TODO#remove
		2280	$ref =~ s{^<}{player/<};
		2281
		2282	if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
		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
2085	package cf;	2296	package cf;
2086		2297
2087	=back	2298	=back
2088		2299
2089	=head3 cf::object::player	2300	=head3 cf::object::player
…		…
2111		2322
2112	} else {	2323	} else {
2113	my $pl = $self->contr;	2324	my $pl = $self->contr;
2114		2325
2115	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2326	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2116	my $diag = $pl->{npc_dialog};	2327	my $dialog = $pl->{npc_dialog};
2117	$diag->{pl}->ext_reply (	2328	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2118	$diag->{id},
2119	msgtype => "reply",
2120	msg => $diag->{pl}->expand_cfpod ($msg),
2121	add_topics => []
2122	);
2123		2329
2124	} else {	2330	} else {
2125	$msg = $npc->name . " says: $msg" if $npc;	2331	$msg = $npc->name . " says: $msg" if $npc;
2126	$self->message ($msg, $flags);	2332	$self->message ($msg, $flags);
2127	}	2333	}
2128	}	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 (@_);
2129	}	2345	}
2130		2346
2131	=item $player_object->may ("access")	2347	=item $player_object->may ("access")
2132		2348
2133	Returns wether the given player is authorized to access resource "access"	2349	Returns wether the given player is authorized to access resource "access"
…		…
2212	# use -1 or undef as default coordinates, not 0, 0	2428	# use -1 or undef as default coordinates, not 0, 0
2213	($x, $y) = ($map->enter_x, $map->enter_y)	2429	($x, $y) = ($map->enter_x, $map->enter_y)
2214	if $x <=0 && $y <= 0;	2430	if $x <=0 && $y <= 0;
2215		2431
2216	$map->load;	2432	$map->load;
2217	$map->load_diag;	2433	$map->load_neighbours;
2218		2434
2219	return unless $self->contr->active;	2435	return unless $self->contr->active;
2220	$self->activate_recursive;	2436	$self->activate_recursive;
2221		2437
2222	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2438	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223	$self->enter_map ($map, $x, $y);	2439	$self->enter_map ($map, $x, $y);
2224	}	2440	}
2225		2441
2226	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2442	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2227		2443
2228	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
2229	her, loading and preparing them map, calling the provided $check callback	2445	her, loading and preparing them map, calling the provided $check callback
2230	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
2231	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.
2232		2449
2233	=cut	2450	=cut
2234		2451
2235	our $GOTOGEN;	2452	our $GOTOGEN;
2236		2453
2237	sub cf::object::player::goto {	2454	sub cf::object::player::goto {
2238	my ($self, $path, $x, $y, $check) = @_;	2455	my ($self, $path, $x, $y, $check, $done) = @_;
2239		2456
2240	# 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
2241	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2458	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242		2459
2243	$self->enter_link;	2460	$self->enter_link;
2244		2461
2245	(async {	2462	(async {
		2463	# *tag paths override both path and x\|y
		2464	if ($path =~ /^\(.)$/) {
		2465	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2466	my $ob = $obs[rand @obs];
		2467
		2468	# see if we actually can go there
		2469	# todo: use ob_blocked to check all tiles of the destination "object"
		2470	# for suitability.
		2471
		2472	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2473	}
		2474	}
		2475
2246	my $map = eval {	2476	my $map = eval {
2247	my $map = cf::map::find $path;	2477	my $map = cf::map::find $path;
2248		2478
2249	if ($map) {	2479	if ($map) {
2250	$map = $map->customise_for ($self);	2480	$map = $map->customise_for ($self);
…		…
2263		2493
2264	if ($gen == $self->{_goto_generation}) {	2494	if ($gen == $self->{_goto_generation}) {
2265	delete $self->{_goto_generation};	2495	delete $self->{_goto_generation};
2266	$self->leave_link ($map, $x, $y);	2496	$self->leave_link ($map, $x, $y);
2267	}	2497	}
		2498
		2499	$done->() if $done;
2268	})->prio (1);	2500	})->prio (1);
2269	}	2501	}
2270		2502
2271	=item $player_object->enter_exit ($exit_object)	2503	=item $player_object->enter_exit ($exit_object)
2272		2504
…		…
2341	my $hp = $exit->stats->hp;	2573	my $hp = $exit->stats->hp;
2342	my $sp = $exit->stats->sp;	2574	my $sp = $exit->stats->sp;
2343		2575
2344	$self->enter_link;	2576	$self->enter_link;
2345		2577
		2578	# if exit is damned, update players death & WoR home-position
		2579	$self->contr->savebed ($slaying, $hp, $sp)
		2580	if $exit->flag (FLAG_DAMNED);
		2581
2346	(async {	2582	(async {
2347	$self->deactivate_recursive; # just to be sure	2583	$self->deactivate_recursive; # just to be sure
2348	unless (eval {	2584	unless (eval {
2349	$self->goto ($slaying, $hp, $sp);	2585	$self->goto ($slaying, $hp, $sp);
2350		2586
…		…
2377		2613
2378	utf8::encode $text;	2614	utf8::encode $text;
2379	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2615	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2380	}	2616	}
2381		2617
2382	=item $client->send_msg ($color, $type, $msg, [extra...])	2618	=item $client->send_msg ($channel, $msg, $color, [extra...])
2383		2619
2384	Send a drawinfo or msg packet to the client, formatting the msg for the	2620	Send a drawinfo or msg packet to the client, formatting the msg for the
2385	client if neccessary. C<$type> should be a string identifying the type of	2621	client if neccessary. C<$type> should be a string identifying the type of
2386	the message, with C<log> being the default. If C<$color> is negative, suppress	2622	the message, with C<log> being the default. If C<$color> is negative, suppress
2387	the message unless the client supports the msg packet.	2623	the message unless the client supports the msg packet.
2388		2624
2389	=cut	2625	=cut
2390		2626
		2627	our %CHANNEL = (
		2628	"c/identify" => {
		2629	id => "identify",
		2630	title => "Identify",
		2631	reply => undef,
		2632	tooltip => "Items recently identified",
		2633	},
		2634	"c/examine" => {
		2635	id => "examine",
		2636	title => "Examine",
		2637	reply => undef,
		2638	tooltip => "Signs and other items you examined",
		2639	},
		2640	);
		2641
2391	sub cf::client::send_msg {	2642	sub cf::client::send_msg {
2392	my ($self, $color, $type, $msg, @extra) = @_;	2643	my ($self, $channel, $msg, $color, @extra) = @_;
2393		2644
2394	$msg = $self->pl->expand_cfpod ($msg);	2645	$msg = $self->pl->expand_cfpod ($msg);
2395		2646
		2647	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2648
		2649	# check predefined channels, for the benefit of C
		2650	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};
		2651
		2652	if (ref $channel) {
		2653	# send meta info to client, if not yet sent
		2654	unless (exists $self->{channel}{$channel->{id}}) {
		2655	$self->{channel}{$channel->{id}} = $channel;
		2656	$self->ext_msg (channel_info => $channel)
		2657	if $self->can_msg;
		2658	}
		2659
		2660	$channel = $channel->{id};
		2661	}
		2662
		2663	return unless @extra \|\| length $msg;
		2664
2396	if ($self->can_msg) {	2665	if ($self->can_msg) {
2397	$self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);	2666	# default colour, mask it out
		2667	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2668	if $color & cf::NDI_DEF;
		2669
		2670	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2671	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2398	} else {	2672	} else {
2399	# replace some tags by gcfclient-compatible ones
2400	for ($msg) {
2401	1 while
2402	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2403	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2404	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2405	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2406	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2407	}
2408
2409	if ($color >= 0) {	2673	if ($color >= 0) {
		2674	# replace some tags by gcfclient-compatible ones
		2675	for ($msg) {
		2676	1 while
		2677	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2678	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2679	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2680	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2681	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2682	}
		2683
		2684	$color &= cf::NDI_COLOR_MASK;
		2685
		2686	utf8::encode $msg;
		2687
2410	if (0 && $msg =~ /\[/) {	2688	if (0 && $msg =~ /\[/) {
		2689	# COMMAND/INFO
2411	$self->send_packet ("drawextinfo $color 4 0 $msg")	2690	$self->send_packet ("drawextinfo $color 10 8 $msg")
2412	} else {	2691	} else {
2413	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2692	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2414	$self->send_packet ("drawinfo $color $msg")	2693	$self->send_packet ("drawinfo $color $msg")
2415	}	2694	}
2416	}	2695	}
2417	}	2696	}
2418	}	2697	}
2419		2698
2420	=item $client->ext_event ($type, %msg)	2699	=item $client->ext_msg ($type, @msg)
2421		2700
2422	Sends an ext event to the client.	2701	Sends an ext event to the client.
2423		2702
2424	=cut	2703	=cut
2425		2704
2426	sub cf::client::ext_event($$%) {	2705	sub cf::client::ext_msg($$@) {
2427	my ($self, $type, %msg) = @_;	2706	my ($self, $type, @msg) = @_;
2428		2707
		2708	if ($self->extcmd == 2) {
		2709	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2710	} elsif ($self->extcmd == 1) { # TODO: remove
2429	$msg{msgtype} = "event_$type";	2711	push @msg, msgtype => "event_$type";
2430	$self->send_packet ("ext " . cf::to_json \%msg);	2712	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2713	}
		2714	}
		2715
		2716	=item $client->ext_reply ($msgid, @msg)
		2717
		2718	Sends an ext reply to the client.
		2719
		2720	=cut
		2721
		2722	sub cf::client::ext_reply($$@) {
		2723	my ($self, $id, @msg) = @_;
		2724
		2725	if ($self->extcmd == 2) {
		2726	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2727	} elsif ($self->extcmd == 1) {
		2728	#TODO: version 1, remove
		2729	unshift @msg, msgtype => "reply", msgid => $id;
		2730	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2731	}
2431	}	2732	}
2432		2733
2433	=item $success = $client->query ($flags, "text", \&cb)	2734	=item $success = $client->query ($flags, "text", \&cb)
2434		2735
2435	Queues a query to the client, calling the given callback with	2736	Queues a query to the client, calling the given callback with
…		…
2458		2759
2459	1	2760	1
2460	}	2761	}
2461		2762
2462	cf::client->attach (	2763	cf::client->attach (
		2764	on_connect => sub {
		2765	my ($ns) = @_;
		2766
		2767	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2768	},
2463	on_reply => sub {	2769	on_reply => sub {
2464	my ($ns, $msg) = @_;	2770	my ($ns, $msg) = @_;
2465		2771
2466	# this weird shuffling is so that direct followup queries	2772	# this weird shuffling is so that direct followup queries
2467	# get handled first	2773	# get handled first
…		…
2482	}	2788	}
2483	},	2789	},
2484	on_exticmd => sub {	2790	on_exticmd => sub {
2485	my ($ns, $buf) = @_;	2791	my ($ns, $buf) = @_;
2486		2792
2487	my $msg = eval { from_json $buf };	2793	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488		2794
2489	if (ref $msg) {	2795	if (ref $msg) {
		2796	my ($type, $reply, @payload) =
		2797	"ARRAY" eq ref $msg
		2798	? @$msg
		2799	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2800
		2801	my @reply;
		2802
2490	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2803	if (my $cb = $EXTICMD{$type}) {
2491	if (my %reply = $cb->($ns, $msg)) {	2804	@reply = $cb->($ns, @payload);
2492	$reply{msgid} = $msg->{msgid};
2493	$ns->send ("ext " . cf::to_json \%reply);
2494	}
2495	}	2805	}
		2806
		2807	$ns->ext_reply ($reply, @reply)
		2808	if $reply;
		2809
2496	} else {	2810	} else {
2497	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2811	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2498	}	2812	}
2499		2813
2500	cf::override;	2814	cf::override;
…		…
2547	our $safe = new Safe "safe";	2861	our $safe = new Safe "safe";
2548	our $safe_hole = new Safe::Hole;	2862	our $safe_hole = new Safe::Hole;
2549		2863
2550	$SIG{FPE} = 'IGNORE';	2864	$SIG{FPE} = 'IGNORE';
2551		2865
2552	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2866	$safe->permit_only (Opcode::opset qw(
		2867	:base_core :base_mem :base_orig :base_math
		2868	grepstart grepwhile mapstart mapwhile
		2869	sort time
		2870	));
2553		2871
2554	# here we export the classes and methods available to script code	2872	# here we export the classes and methods available to script code
2555		2873
2556	=pod	2874	=pod
2557		2875
2558	The following functions and methods are available within a safe environment:	2876	The following functions and methods are available within a safe environment:
2559		2877
2560	cf::object contr pay_amount pay_player map	2878	cf::object
		2879	contr pay_amount pay_player map x y force_find force_add
		2880	insert remove name archname title slaying race decrease_ob_nr
		2881
2561	cf::object::player player	2882	cf::object::player
2562	cf::player peaceful	2883	player
2563	cf::map trigger	2884
		2885	cf::player
		2886	peaceful
		2887
		2888	cf::map
		2889	trigger
2564		2890
2565	=cut	2891	=cut
2566		2892
2567	for (	2893	for (
2568	["cf::object" => qw(contr pay_amount pay_player map)],	2894	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2895	insert remove inv name archname title slaying race
		2896	decrease_ob_nr)],
2569	["cf::object::player" => qw(player)],	2897	["cf::object::player" => qw(player)],
2570	["cf::player" => qw(peaceful)],	2898	["cf::player" => qw(peaceful)],
2571	["cf::map" => qw(trigger)],	2899	["cf::map" => qw(trigger)],
2572	) {	2900	) {
2573	no strict 'refs';	2901	no strict 'refs';
…		…
2649	# the server's init and main functions	2977	# the server's init and main functions
2650		2978
2651	sub load_facedata($) {	2979	sub load_facedata($) {
2652	my ($path) = @_;	2980	my ($path) = @_;
2653		2981
		2982	# HACK to clear player env face cache, we need some signal framework
		2983	# for this (global event?)
		2984	%ext::player_env::MUSIC_FACE_CACHE = ();
		2985
		2986	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		2987
2654	warn "loading facedata from $path\n";	2988	warn "loading facedata from $path\n";
2655		2989
2656	my $facedata;	2990	my $facedata;
2657	0 < aio_load $path, $facedata	2991	0 < aio_load $path, $facedata
2658	or die "$path: $!";	2992	or die "$path: $!";
…		…
2660	$facedata = Coro::Storable::thaw $facedata;	2994	$facedata = Coro::Storable::thaw $facedata;
2661		2995
2662	$facedata->{version} == 2	2996	$facedata->{version} == 2
2663	or cf::cleanup "$path: version mismatch, cannot proceed.";	2997	or cf::cleanup "$path: version mismatch, cannot proceed.";
2664		2998
		2999	# patch in the exptable
		3000	$facedata->{resource}{"res/exp_table"} = {
		3001	type => FT_RSRC,
		3002	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3003	};
		3004	cf::cede_to_tick;
		3005
2665	{	3006	{
2666	my $faces = $facedata->{faceinfo};	3007	my $faces = $facedata->{faceinfo};
2667		3008
2668	while (my ($face, $info) = each %$faces) {	3009	while (my ($face, $info) = each %$faces) {
2669	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3010	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2670	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3011	cf::face::set_visibility $idx, $info->{visibility};
		3012	cf::face::set_magicmap $idx, $info->{magicmap};
2671	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3013	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2672	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3014	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2673	Coro::cede;	3015
		3016	cf::cede_to_tick;
2674	}	3017	}
2675		3018
2676	while (my ($face, $info) = each %$faces) {	3019	while (my ($face, $info) = each %$faces) {
2677	next unless $info->{smooth};	3020	next unless $info->{smooth};
2678	my $idx = cf::face::find $face	3021	my $idx = cf::face::find $face
2679	or next;	3022	or next;
2680	if (my $smooth = cf::face::find $info->{smooth}) {	3023	if (my $smooth = cf::face::find $info->{smooth}) {
		3024	cf::face::set_smooth $idx, $smooth;
2681	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3025	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682	} else {	3026	} else {
2683	warn "smooth face '$info->{smooth}' not found for face '$face'";	3027	warn "smooth face '$info->{smooth}' not found for face '$face'";
2684	}	3028	}
2685	Coro::cede;	3029
		3030	cf::cede_to_tick;
2686	}	3031	}
2687	}	3032	}
2688		3033
2689	{	3034	{
2690	my $anims = $facedata->{animinfo};	3035	my $anims = $facedata->{animinfo};
2691		3036
2692	while (my ($anim, $info) = each %$anims) {	3037	while (my ($anim, $info) = each %$anims) {
2693	cf::anim::set $anim, $info->{frames}, $info->{facings};	3038	cf::anim::set $anim, $info->{frames}, $info->{facings};
2694	Coro::cede;	3039	cf::cede_to_tick;
2695	}	3040	}
2696		3041
2697	cf::anim::invalidate_all; # d'oh	3042	cf::anim::invalidate_all; # d'oh
2698	}	3043	}
2699		3044
		3045	{
		3046	# TODO: for gcfclient pleasure, we should give resources
		3047	# that gcfclient doesn't grok a >10000 face index.
		3048	my $res = $facedata->{resource};
		3049
		3050	my $soundconf = delete $res->{"res/sound.conf"};
		3051
		3052	while (my ($name, $info) = each %$res) {
		3053	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3054	my $data;
		3055
		3056	if ($info->{type} & 1) {
		3057	# prepend meta info
		3058
		3059	my $meta = $enc->encode ({
		3060	name => $name,
		3061	%{ $info->{meta} \|\| {} },
		3062	});
		3063
		3064	$data = pack "(w/a)", $meta, $info->{data};
		3065	} else {
		3066	$data = $info->{data};
		3067	}
		3068
		3069	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3070	cf::face::set_type $idx, $info->{type};
		3071
		3072	cf::cede_to_tick;
		3073	}
		3074
		3075	if ($soundconf) {
		3076	$soundconf = $enc->decode (delete $soundconf->{data});
		3077
		3078	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3079	my $sound = $soundconf->{compat}[$_]
		3080	or next;
		3081
		3082	my $face = cf::face::find "sound/$sound->[1]";
		3083	cf::sound::set $sound->[0] => $face;
		3084	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3085	}
		3086
		3087	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3088	my $face = cf::face::find "sound/$v";
		3089	cf::sound::set $k => $face;
		3090	}
		3091	}
		3092	}
		3093
2700	1	3094	1
2701	}	3095	}
2702		3096
		3097	register_exticmd fx_want => sub {
		3098	my ($ns, $want) = @_;
		3099
		3100	while (my ($k, $v) = each %$want) {
		3101	$ns->fx_want ($k, $v);
		3102	}
		3103	};
		3104
2703	sub reload_regions {	3105	sub reload_regions {
		3106	# HACK to clear player env face cache, we need some signal framework
		3107	# for this (global event?)
		3108	%ext::player_env::MUSIC_FACE_CACHE = ();
		3109
2704	load_resource_file "$MAPDIR/regions"	3110	load_resource_file "$MAPDIR/regions"
2705	or die "unable to load regions file\n";	3111	or die "unable to load regions file\n";
		3112
		3113	for (cf::region::list) {
		3114	$_->{match} = qr/$_->{match}/
		3115	if exists $_->{match};
		3116	}
2706	}	3117	}
2707		3118
2708	sub reload_facedata {	3119	sub reload_facedata {
2709	load_facedata "$DATADIR/facedata"	3120	load_facedata "$DATADIR/facedata"
2710	or die "unable to load facedata\n";	3121	or die "unable to load facedata\n";
2711	}	3122	}
2712		3123
2713	sub reload_archetypes {	3124	sub reload_archetypes {
		3125	load_resource_file "$DATADIR/archetypes"
		3126	or die "unable to load archetypes\n";
		3127	#d# NEED to laod twice to resolve forward references
		3128	# this really needs to be done in an extra post-pass
		3129	# (which needs to be synchronous, so solve it differently)
2714	load_resource_file "$DATADIR/archetypes"	3130	load_resource_file "$DATADIR/archetypes"
2715	or die "unable to load archetypes\n";	3131	or die "unable to load archetypes\n";
2716	}	3132	}
2717		3133
2718	sub reload_treasures {	3134	sub reload_treasures {
…		…
2734		3150
2735	sub init {	3151	sub init {
2736	reload_resources;	3152	reload_resources;
2737	}	3153	}
2738		3154
2739	sub cfg_load {	3155	sub reload_config {
2740	open my $fh, "<:utf8", "$CONFDIR/config"	3156	open my $fh, "<:utf8", "$CONFDIR/config"
2741	or return;	3157	or return;
2742		3158
2743	local $/;	3159	local $/;
2744	*CFG = YAML::Syck::Load <$fh>;	3160	*CFG = YAML::Syck::Load <$fh>;
…		…
2764	(async {	3180	(async {
2765	Event::one_event;	3181	Event::one_event;
2766	})->prio (Coro::PRIO_MAX);	3182	})->prio (Coro::PRIO_MAX);
2767	};	3183	};
2768		3184
2769	cfg_load;	3185	reload_config;
2770	db_init;	3186	db_init;
2771	load_extensions;	3187	load_extensions;
2772		3188
2773	$TICK_WATCHER->start;	3189	$TICK_WATCHER->start;
2774	Event::loop;	3190	Event::loop;
…		…
2967	warn "reloading cf.pm";	3383	warn "reloading cf.pm";
2968	require cf;	3384	require cf;
2969	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3385	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2970		3386
2971	warn "loading config and database again";	3387	warn "loading config and database again";
2972	cf::cfg_load;	3388	cf::reload_config;
2973		3389
2974	warn "loading extensions";	3390	warn "loading extensions";
2975	cf::load_extensions;	3391	cf::load_extensions;
2976		3392
2977	warn "reattaching attachments to objects/players";	3393	warn "reattaching attachments to objects/players";
…		…
3042	my $signal = new Coro::Signal;	3458	my $signal = new Coro::Signal;
3043	push @WAIT_FOR_TICK_BEGIN, $signal;	3459	push @WAIT_FOR_TICK_BEGIN, $signal;
3044	$signal->wait;	3460	$signal->wait;
3045	}	3461	}
3046		3462
3047	my $min = 1e6;#d#	3463	our $stat_fh;
3048	my $avg = 10;	3464	sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND \| Fcntl::O_CREAT \| Fcntl::O_WRONLY, 0600;#d#
		3465
3049	$TICK_WATCHER = Event->timer (	3466	$TICK_WATCHER = Event->timer (
3050	reentrant => 0,	3467	reentrant => 0,
3051	parked => 1,	3468	parked => 1,
3052	prio => 0,	3469	prio => 0,
3053	at => $NEXT_TICK \|\| $TICK,	3470	at => $NEXT_TICK \|\| $TICK,
…		…
3057	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3474	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3058	unless ++$bug_warning > 10;	3475	unless ++$bug_warning > 10;
3059	return;	3476	return;
3060	}	3477	}
3061		3478
		3479	my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
		3480
3062	$NOW = $tick_start = Event::time;	3481	$NOW = $tick_start = Event::time;
3063		3482
3064	cf::server_tick; # one server iteration	3483	cf::server_tick; # one server iteration
3065
3066	0 && sync_job {#d#
3067	for(1..10) {
3068	my $t = Event::time;
3069	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3070	or die;
3071
3072	$map->width (50);
3073	$map->height (50);
3074	$map->alloc;
3075	$map->_load_objects ("/tmp/x.map", 1);
3076	my $t = Event::time - $t;
3077
3078	#next unless $t < 0.0013;#d#
3079	if ($t < $min) {
3080	$min = $t;
3081	}
3082	$avg = $avg * 0.99 + $t * 0.01;
3083	}
3084	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3085	exit 0;
3086	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3087	};
3088		3484
3089	$RUNTIME += $TICK;	3485	$RUNTIME += $TICK;
3090	$NEXT_TICK += $TICK;	3486	$NEXT_TICK += $TICK;
3091		3487
3092	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3488	if ($NOW >= $NEXT_RUNTIME_WRITE) {
…		…
3118	$LOAD = ($NOW - $tick_start) / $TICK;	3514	$LOAD = ($NOW - $tick_start) / $TICK;
3119	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3515	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3120		3516
3121	_post_tick;	3517	_post_tick;
3122		3518
3123		3519	# gather some statistics#d#
		3520	$stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
		3521	IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
3124	},	3522	},
3125	);	3523	);
3126		3524
3127	{	3525	{
		3526	BDB::min_parallel 8;
3128	BDB::max_poll_time $TICK * 0.1;	3527	BDB::max_poll_time $TICK * 0.1;
3129	$BDB_POLL_WATCHER = Event->io (	3528	$BDB_POLL_WATCHER = Event->io (
3130	reentrant => 0,	3529	reentrant => 0,
3131	fd => BDB::poll_fileno,	3530	fd => BDB::poll_fileno,
3132	poll => 'r',	3531	poll => 'r',
3133	prio => 0,	3532	prio => 0,
3134	data => WF_AUTOCANCEL,	3533	data => WF_AUTOCANCEL,
3135	cb => \&BDB::poll_cb,	3534	cb => \&BDB::poll_cb,
3136	);	3535	);
3137	BDB::min_parallel 8;
3138		3536
3139	BDB::set_sync_prepare {	3537	BDB::set_sync_prepare {
3140	my $status;	3538	my $status;
3141	my $current = $Coro::current;	3539	my $current = $Coro::current;
3142	(	3540	(
…		…
3163	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3561	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3164	0666;	3562	0666;
3165		3563
3166	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3564	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3167		3565
3168	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);	3566	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC
		3567	\| BDB::LOG_AUTOREMOVE, 1);
3169	$DB_ENV->set_lk_detect;	3568	$DB_ENV->set_lk_detect;
3170	};	3569	};
3171		3570
3172	cf::cleanup "db_env_open(db): $@" if $@;	3571	cf::cleanup "db_env_open(db): $@" if $@;
3173	};	3572	};
3174	}	3573	}
		3574
		3575	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3576	after => 11,
		3577	interval => 60,
		3578	hard => 1,
		3579	prio => 0,
		3580	data => WF_AUTOCANCEL,
		3581	cb => sub {
		3582	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3583	},
		3584	);
		3585	$BDB_TRICKLE_WATCHER = Event->timer (
		3586	after => 5,
		3587	interval => 10,
		3588	hard => 1,
		3589	prio => 0,
		3590	data => WF_AUTOCANCEL,
		3591	cb => sub {
		3592	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3593	},
		3594	);
3175	}	3595	}
3176		3596
3177	{	3597	{
3178	IO::AIO::min_parallel 8;	3598	IO::AIO::min_parallel 8;
3179		3599

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.287 by root, Mon Jun 25 05:43:45 2007 UTC vs. Revision 1.367 by root, Wed Sep 12 11:10:11 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.287 by root, Mon Jun 25 05:43:45 2007 UTC vs.
Revision 1.367 by root, Wed Sep 12 11:10:11 2007 UTC