ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Diff Legend

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