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.378 by root, Thu Oct 4 11:36:54 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	$Coro::current->desc ("timeslot manager");
		360
		361	my $signal = new Coro::Signal;
		362
		363	while () {
		364	next_job:
		365	my $avail = cf::till_tick;
		366	if ($avail > 0.01) {
		367	for (0 .. $#SLOT_QUEUE) {
		368	if ($SLOT_QUEUE[$_][0] < $avail) {
		369	my $job = splice @SLOT_QUEUE, $_, 1, ();
		370	$job->[2]->send;
		371	Coro::cede;
		372	goto next_job;
		373	}
		374	}
		375	}
		376
		377	if (@SLOT_QUEUE) {
		378	# we do not use wait_For_tick() as it returns immediately when tick is inactive
		379	push @cf::WAIT_FOR_TICK, $signal;
		380	$signal->wait;
		381	} else {
		382	Coro::schedule;
		383	}
		384	}
		385	};
		386
		387	sub get_slot($;$$) {
		388	my ($time, $pri, $name) = @_;
		389
		390	$time = $TICK * .6 if $time > $TICK * .6;
		391	my $sig = new Coro::Signal;
		392
		393	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		394	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		395	$SLOT_QUEUE->ready;
		396	$sig->wait;
319	}	397	}
320		398
321	=item cf::async { BLOCK }	399	=item cf::async { BLOCK }
322		400
323	Currently the same as Coro::async_pool, meaning you cannot use	401	Currently the same as Coro::async_pool, meaning you cannot use
…		…
357		435
358	my $busy = 1;	436	my $busy = 1;
359	my @res;	437	my @res;
360		438
361	(async {	439	(async {
		440	$Coro::current->desc ("sync job coro");
362	@res = eval { $job->() };	441	@res = eval { $job->() };
363	warn $@ if $@;	442	warn $@ if $@;
364	undef $busy;	443	undef $busy;
365	})->prio (Coro::PRIO_MAX);	444	})->prio (Coro::PRIO_MAX);
366		445
…		…
413	=cut	492	=cut
414		493
415	sub fork_call(&@) {	494	sub fork_call(&@) {
416	my ($cb, @args) = @_;	495	my ($cb, @args) = @_;
417		496
418	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	497	# we seemingly have to make a local copy of the whole thing,
419	# or die "socketpair: $!";	498	# otherwise perl prematurely frees the stuff :/
420	pipe my $fh1, my $fh2	499	# TODO: investigate and fix (likely this will be rather laborious)
421	or die "pipe: $!";
422		500
423	if (my $pid = fork) {	501	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;	502	reset_signals;
436	local $SIG{__WARN__};	503	&$cb
437	local $SIG{__DIE__};	504	}, @args;
438	eval {
439	close $fh1;
440		505
441	my @res = eval { $cb->(@args) };	506	wantarray ? @res : $res[-1]
442	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
443	};
444
445	warn $@ if $@;
446	_exit 0;
447	}
448	}	507	}
449		508
450	=item $value = cf::db_get $family => $key	509	=item $value = cf::db_get $family => $key
451		510
452	Returns a single value from the environment database.	511	Returns a single value from the environment database.
…		…
454	=item cf::db_put $family => $key => $value	513	=item cf::db_put $family => $key => $value
455		514
456	Stores the given C<$value> in the family. It can currently store binary	515	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).	516	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
458		517
		518	=item $db = cf::db_table "name"
		519
		520	Create and/or open a new database table. The string must not be "db" and must be unique
		521	within each server.
		522
459	=cut	523	=cut
		524
		525	sub db_table($) {
		526	my ($name) = @_;
		527	my $db = BDB::db_create $DB_ENV;
		528
		529	eval {
		530	$db->set_flags (BDB::CHKSUM);
		531
		532	utf8::encode $name;
		533	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		534	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		535	cf::cleanup "db_open(db): $!" if $!;
		536	};
		537	cf::cleanup "db_open(db): $@" if $@;
		538
		539	$db
		540	}
460		541
461	our $DB;	542	our $DB;
462		543
463	sub db_init {	544	sub db_init {
464	unless ($DB) {
465	$DB = BDB::db_create $DB_ENV;
466
467	cf::sync_job {	545	cf::sync_job {
468	eval {	546	$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	}	547	};
478	}	548	}
479		549
480	sub db_get($$) {	550	sub db_get($$) {
481	my $key = "$_[0]/$_[1]";	551	my $key = "$_[0]/$_[1]";
482		552
…		…
532	if (1) {	602	if (1) {
533	$md5 =	603	$md5 =
534	join "\x00",	604	join "\x00",
535	$processversion,	605	$processversion,
536	map {	606	map {
537	Coro::cede;	607	cf::cede_to_tick;
538	($src->[$_], Digest::MD5::md5_hex $data[$_])	608	($src->[$_], Digest::MD5::md5_hex $data[$_])
539	} 0.. $#$src;	609	} 0.. $#$src;
540		610
541		611
542	my $dbmd5 = db_get cache => "$id/md5";	612	my $dbmd5 = db_get cache => "$id/md5";
…		…
848	";	918	";
849	die if $@;	919	die if $@;
850	}	920	}
851		921
852	our $override;	922	our $override;
853	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	923	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
854		924
855	sub override {	925	sub override {
856	$override = 1;	926	$override = 1;
857	@invoke_results = ();	927	@INVOKE_RESULTS = (@_);
858	}	928	}
859		929
860	sub do_invoke {	930	sub do_invoke {
861	my $event = shift;	931	my $event = shift;
862	my $callbacks = shift;	932	my $callbacks = shift;
863		933
864	@invoke_results = ();	934	@INVOKE_RESULTS = ();
865		935
866	local $override;	936	local $override;
867		937
868	for (@$callbacks) {	938	for (@$callbacks) {
869	eval { &{$_->[1]} };	939	eval { &{$_->[1]} };
…		…
886		956
887	Generate an object-specific event with the given arguments.	957	Generate an object-specific event with the given arguments.
888		958
889	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	959	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	960	removed in future versions), and there is no public API to access override
891	results (if you must, access C<@cf::invoke_results> directly).	961	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
892		962
893	=back	963	=back
894		964
895	=cut	965	=cut
896		966
897	#############################################################################	967	#############################################################################
898	# object support	968	# object support
		969	#
		970
		971	sub _can_merge {
		972	my ($ob1, $ob2) = @_;
		973
		974	local $Storable::canonical = 1;
		975	my $fob1 = Storable::freeze $ob1;
		976	my $fob2 = Storable::freeze $ob2;
		977
		978	$fob1 eq $fob2
		979	}
899		980
900	sub reattach {	981	sub reattach {
901	# basically do the same as instantiate, without calling instantiate	982	# basically do the same as instantiate, without calling instantiate
902	my ($obj) = @_;	983	my ($obj) = @_;
903		984
…		…
950	sub object_freezer_save {	1031	sub object_freezer_save {
951	my ($filename, $rdata, $objs) = @_;	1032	my ($filename, $rdata, $objs) = @_;
952		1033
953	sync_job {	1034	sync_job {
954	if (length $$rdata) {	1035	if (length $$rdata) {
		1036	utf8::decode (my $decname = $filename);
955	warn sprintf "saving %s (%d,%d)\n",	1037	warn sprintf "saving %s (%d,%d)\n",
956	$filename, length $$rdata, scalar @$objs;	1038	$decname, length $$rdata, scalar @$objs;
957		1039
958	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1040	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
959	chmod SAVE_MODE, $fh;	1041	chmod SAVE_MODE, $fh;
960	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1042	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
961	aio_fsync $fh if $cf::USE_FSYNC;	1043	aio_fsync $fh if $cf::USE_FSYNC;
…		…
980	}	1062	}
981	} else {	1063	} else {
982	aio_unlink $filename;	1064	aio_unlink $filename;
983	aio_unlink "$filename.pst";	1065	aio_unlink "$filename.pst";
984	}	1066	}
985	}	1067	};
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
…		…
1002	or return;	1084	or return;
1003		1085
1004	unless (aio_stat "$filename.pst") {	1086	unless (aio_stat "$filename.pst") {
1005	(aio_load "$filename.pst", $av) >= 0	1087	(aio_load "$filename.pst", $av) >= 0
1006	or return;	1088	or return;
		1089
1007	$av = eval { (Storable::thaw $av)->{objs} };	1090	$av = eval { (Storable::thaw $av)->{objs} };
1008	}	1091	}
1009		1092
		1093	utf8::decode (my $decname = $filename);
1010	warn sprintf "loading %s (%d)\n",	1094	warn sprintf "loading %s (%d,%d)\n",
1011	$filename, length $data, scalar @{$av || []};	1095	$decname, length $data, scalar @{$av || []};
		1096
1012	return ($data, $av);	1097	($data, $av)
1013	}	1098	}
1014		1099
1015	=head2 COMMAND CALLBACKS	1100	=head2 COMMAND CALLBACKS
1016		1101
1017	=over 4	1102	=over 4
…		…
1087	cf::override;	1172	cf::override;
1088	},	1173	},
1089	on_extcmd => sub {	1174	on_extcmd => sub {
1090	my ($pl, $buf) = @_;	1175	my ($pl, $buf) = @_;
1091		1176
1092	my $msg = eval { from_json $buf };	1177	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1093		1178
1094	if (ref $msg) {	1179	if (ref $msg) {
		1180	my ($type, $reply, @payload) =
		1181	"ARRAY" eq ref $msg
		1182	? @$msg
		1183	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1184
		1185	my @reply;
		1186
1095	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1187	if (my $cb = $EXTCMD{$type}) {
1096	if (my %reply = $cb->($pl, $msg)) {	1188	@reply = $cb->($pl, @payload);
1097	$pl->ext_reply ($msg->{msgid}, %reply);
1098	}
1099	}	1189	}
		1190
		1191	$pl->ext_reply ($reply, @reply)
		1192	if $reply;
		1193
1100	} else {	1194	} else {
1101	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1195	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1102	}	1196	}
1103		1197
1104	cf::override;	1198	cf::override;
…		…
1194		1288
1195	=head3 cf::player	1289	=head3 cf::player
1196		1290
1197	=over 4	1291	=over 4
1198		1292
		1293	=item cf::player::num_playing
		1294
		1295	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1296
		1297	=cut
		1298
		1299	sub num_playing {
		1300	scalar grep
		1301	$_->ob->map
		1302	&& !$_->hidden
		1303	&& !$_->ob->flag (cf::FLAG_WIZ),
		1304	cf::player::list
		1305	}
		1306
1199	=item cf::player::find $login	1307	=item cf::player::find $login
1200		1308
1201	Returns the given player object, loading it if necessary (might block).	1309	Returns the given player object, loading it if necessary (might block).
1202		1310
1203	=cut	1311	=cut
…		…
1238	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1346	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1239	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1347	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1240	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1348	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1241	aio_unlink +(playerdir $login) . "/$login.pl";	1349	aio_unlink +(playerdir $login) . "/$login.pl";
1242		1350
1243	my $pl = load_pl path $login	1351	my $f = new_from_file cf::object::thawer path $login
1244	or return;	1352	or return;
		1353
		1354	my $pl = cf::player::load_pl $f
		1355	or return;
		1356	local $cf::PLAYER_LOADING{$login} = $pl;
		1357	$f->resolve_delayed_derefs;
1245	$cf::PLAYER{$login} = $pl	1358	$cf::PLAYER{$login} = $pl
1246	}	1359	}
1247	}	1360	}
1248	}	1361	}
1249		1362
…		…
1259		1372
1260	aio_mkdir playerdir $pl, 0770;	1373	aio_mkdir playerdir $pl, 0770;
1261	$pl->{last_save} = $cf::RUNTIME;	1374	$pl->{last_save} = $cf::RUNTIME;
1262		1375
1263	$pl->save_pl ($path);	1376	$pl->save_pl ($path);
1264	Coro::cede;	1377	cf::cede_to_tick;
1265	}	1378	}
1266		1379
1267	sub new($) {	1380	sub new($) {
1268	my ($login) = @_;	1381	my ($login) = @_;
1269		1382
…		…
1273	$self->{deny_save} = 1;	1386	$self->{deny_save} = 1;
1274		1387
1275	$cf::PLAYER{$login} = $self;	1388	$cf::PLAYER{$login} = $self;
1276		1389
1277	$self	1390	$self
		1391	}
		1392
		1393	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1394
		1395	=cut
		1396
		1397	sub send_msg {
		1398	my $ns = shift->ns
		1399	or return;
		1400	$ns->send_msg (@_);
1278	}	1401	}
1279		1402
1280	=item $pl->quit_character	1403	=item $pl->quit_character
1281		1404
1282	Nukes the player without looking back. If logged in, the connection will	1405	Nukes the player without looking back. If logged in, the connection will
…		…
1337	or return [];	1460	or return [];
1338		1461
1339	my @logins;	1462	my @logins;
1340		1463
1341	for my $login (@$dirs) {	1464	for my $login (@$dirs) {
		1465	my $path = path $login;
		1466
		1467	# a .pst is a dead give-away for a valid player
		1468	unless (-e "$path.pst") {
1342	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1469	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1343	aio_read $fh, 0, 512, my $buf, 0 or next;	1470	aio_read $fh, 0, 512, my $buf, 0 or next;
1344	$buf !~ /^password -------------$/m or next; # official not-valid tag	1471	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1472	}
1345		1473
1346	utf8::decode $login;	1474	utf8::decode $login;
1347	push @logins, $login;	1475	push @logins, $login;
1348	}	1476	}
1349		1477
…		…
1387	sub expand_cfpod {	1515	sub expand_cfpod {
1388	((my $self), (local $_)) = @_;	1516	((my $self), (local $_)) = @_;
1389		1517
1390	# escape & and <	1518	# escape & and <
1391	s/&/&amp;/g;	1519	s/&/&amp;/g;
1392	s/(?<![BIUGH])</&lt;/g;	1520	s/(?<![BIUGHT])</&lt;/g;
1393		1521
1394	# this is buggy, it needs to properly take care of nested <'s	1522	# this is buggy, it needs to properly take care of nested <'s
1395		1523
1396	1 while	1524	1 while
1397	# replace B<>, I<>, U<> etc.	1525	# replace B<>, I<>, U<> etc.
1398	s/B<([^\>]*)>/<b>$1<\/b>/	1526	s/B<([^\>]*)>/<b>$1<\/b>/
1399	|| s/I<([^\>]*)>/<i>$1<\/i>/	1527	|| s/I<([^\>]*)>/<i>$1<\/i>/
1400	|| s/U<([^\>]*)>/<u>$1<\/u>/	1528	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1529	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1401	# replace G<male|female> tags	1530	# replace G<male|female> tags
1402	|| s{G<([^>|]*)\|([^>]*)>}{	1531	|| s{G<([^>|]*)\|([^>]*)>}{
1403	$self->gender ? $2 : $1	1532	$self->gender ? $2 : $1
1404	}ge	1533	}ge
1405	# replace H<hint text>	1534	# replace H<hint text>
1406	|| s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;	1535	|| s{H<([^\>]*)>}
		1536	{
		1537	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1538	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1539	"")
		1540	[$self->{hintmode}]
		1541	}ge;
1407		1542
1408	# create single paragraphs (very hackish)	1543	# create single paragraphs (very hackish)
1409	s/(?<=\S)\n(?=\w)/ /g;	1544	s/(?<=\S)\n(?=\w)/ /g;
1410		1545
		1546	# compress some whitespace
		1547	s/\s+\n/\n/g; # ws line-ends
		1548	s/\n\n+/\n/g; # double lines
		1549	s/^\n+//; # beginning lines
		1550	s/\n+$//; # ending lines
		1551
1411	$_	1552	$_
1412	}	1553	}
1413		1554
		1555	sub hintmode {
		1556	$_[0]{hintmode} = $_[1] if @_ > 1;
		1557	$_[0]{hintmode}
		1558	}
		1559
1414	=item $player->ext_reply ($msgid, %msg)	1560	=item $player->ext_reply ($msgid, @msg)
1415		1561
1416	Sends an ext reply to the player.	1562	Sends an ext reply to the player.
1417		1563
1418	=cut	1564	=cut
1419		1565
1420	sub ext_reply($$%) {	1566	sub ext_reply($$@) {
1421	my ($self, $id, %msg) = @_;	1567	my ($self, $id, @msg) = @_;
1422		1568
1423	$msg{msgid} = $id;	1569	$self->ns->ext_reply ($id, @msg)
1424	$self->send ("ext " . cf::to_json \%msg);
1425	}	1570	}
1426		1571
1427	=item $player->ext_event ($type, %msg)	1572	=item $player->ext_msg ($type, @msg)
1428		1573
1429	Sends an ext event to the client.	1574	Sends an ext event to the client.
1430		1575
1431	=cut	1576	=cut
1432		1577
1433	sub ext_event($$%) {	1578	sub ext_msg($$@) {
1434	my ($self, $type, %msg) = @_;	1579	my ($self, $type, @msg) = @_;
1435		1580
1436	$self->ns->ext_event ($type, %msg);	1581	$self->ns->ext_msg ($type, @msg);
1437	}	1582	}
1438		1583
1439	=head3 cf::region	1584	=head3 cf::region
1440		1585
1441	=over 4	1586	=over 4
…		…
1454	my ($path) = @_;	1599	my ($path) = @_;
1455		1600
1456	my ($match, $specificity);	1601	my ($match, $specificity);
1457		1602
1458	for my $region (list) {	1603	for my $region (list) {
1459	if ($region->match && $path =~ $region->match) {	1604	if ($region->{match} && $path =~ $region->{match}) {
1460	($match, $specificity) = ($region, $region->specificity)	1605	($match, $specificity) = ($region, $region->specificity)
1461	if $region->specificity > $specificity;	1606	if $region->specificity > $specificity;
1462	}	1607	}
1463	}	1608	}
1464		1609
…		…
1584	$self->init; # pass $1 etc.	1729	$self->init; # pass $1 etc.
1585	return $self;	1730	return $self;
1586	}	1731	}
1587	}	1732	}
1588		1733
1589	Carp::carp "unable to resolve path '$path' (base '$base').";	1734	Carp::cluck "unable to resolve path '$path' (base '$base').";
1590	()	1735	()
1591	}	1736	}
1592		1737
1593	sub init {	1738	sub init {
1594	my ($self) = @_;	1739	my ($self) = @_;
…		…
1657		1802
1658	sub load_header_from($) {	1803	sub load_header_from($) {
1659	my ($self, $path) = @_;	1804	my ($self, $path) = @_;
1660		1805
1661	utf8::encode $path;	1806	utf8::encode $path;
1662	#aio_open $path, O_RDONLY, 0	1807	my $f = new_from_file cf::object::thawer $path
1663	# or return;
1664
1665	$self->_load_header ($path)
1666	or return;	1808	or return;
		1809
		1810	$self->_load_header ($f)
		1811	or return;
		1812
		1813	local $MAP_LOADING{$self->{path}} = $self;
		1814	$f->resolve_delayed_derefs;
1667		1815
1668	$self->{load_path} = $path;	1816	$self->{load_path} = $path;
1669		1817
1670	1	1818	1
1671	}	1819	}
…		…
1725	sub find {	1873	sub find {
1726	my ($path, $origin) = @_;	1874	my ($path, $origin) = @_;
1727		1875
1728	$path = normalise $path, $origin && $origin->path;	1876	$path = normalise $path, $origin && $origin->path;
1729		1877
		1878	cf::lock_wait "map_data:$path";#d#remove
1730	cf::lock_wait "map_find:$path";	1879	cf::lock_wait "map_find:$path";
1731		1880
1732	$cf::MAP{$path} || do {	1881	$cf::MAP{$path} || do {
1733	my $guard = cf::lock_acquire "map_find:$path";	1882	my $guard1 = cf::lock_acquire "map_find:$path";
		1883	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1884
1734	my $map = new_from_path cf::map $path	1885	my $map = new_from_path cf::map $path
1735	or return;	1886	or return;
1736		1887
1737	$map->{last_save} = $cf::RUNTIME;	1888	$map->{last_save} = $cf::RUNTIME;
1738		1889
…		…
1740	or return;	1891	or return;
1741		1892
1742	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1893	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1743	# doing this can freeze the server in a sync job, obviously	1894	# doing this can freeze the server in a sync job, obviously
1744	#$cf::WAIT_FOR_TICK->wait;	1895	#$cf::WAIT_FOR_TICK->wait;
		1896	undef $guard1;
		1897	undef $guard2;
1745	$map->reset;	1898	$map->reset;
1746	undef $guard;
1747	return find $path;	1899	return find $path;
1748	}	1900	}
1749		1901
1750	$cf::MAP{$path} = $map	1902	$cf::MAP{$path} = $map
1751	}	1903	}
…		…
1760	local $self->{deny_reset} = 1; # loading can take a long time	1912	local $self->{deny_reset} = 1; # loading can take a long time
1761		1913
1762	my $path = $self->{path};	1914	my $path = $self->{path};
1763		1915
1764	{	1916	{
1765	my $guard = cf::lock_acquire "map_load:$path";	1917	my $guard = cf::lock_acquire "map_data:$path";
1766		1918
		1919	return unless $self->valid;
1767	return if $self->in_memory != cf::MAP_SWAPPED;	1920	return unless $self->in_memory == cf::MAP_SWAPPED;
1768		1921
1769	$self->in_memory (cf::MAP_LOADING);	1922	$self->in_memory (cf::MAP_LOADING);
1770		1923
1771	$self->alloc;	1924	$self->alloc;
1772		1925
1773	$self->pre_load;	1926	$self->pre_load;
1774	Coro::cede;	1927	cf::cede_to_tick;
1775		1928
		1929	my $f = new_from_file cf::object::thawer $self->{load_path};
		1930	$f->skip_block;
1776	$self->_load_objects ($self->{load_path}, 1)	1931	$self->_load_objects ($f)
1777	or return;	1932	or return;
1778		1933
1779	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1934	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1780	if delete $self->{load_original};	1935	if delete $self->{load_original};
1781		1936
1782	if (my $uniq = $self->uniq_path) {	1937	if (my $uniq = $self->uniq_path) {
1783	utf8::encode $uniq;	1938	utf8::encode $uniq;
1784	if (aio_open $uniq, O_RDONLY, 0) {	1939	unless (aio_stat $uniq) {
		1940	if (my $f = new_from_file cf::object::thawer $uniq) {
1785	$self->clear_unique_items;	1941	$self->clear_unique_items;
1786	$self->_load_objects ($uniq, 0);	1942	$self->_load_objects ($f);
		1943	$f->resolve_delayed_derefs;
		1944	}
1787	}	1945	}
1788	}	1946	}
1789		1947
1790	Coro::cede;	1948	$f->resolve_delayed_derefs;
		1949
		1950	cf::cede_to_tick;
1791	# now do the right thing for maps	1951	# now do the right thing for maps
1792	$self->link_multipart_objects;	1952	$self->link_multipart_objects;
1793	$self->difficulty ($self->estimate_difficulty)	1953	$self->difficulty ($self->estimate_difficulty)
1794	unless $self->difficulty;	1954	unless $self->difficulty;
1795	Coro::cede;	1955	cf::cede_to_tick;
1796		1956
1797	unless ($self->{deny_activate}) {	1957	unless ($self->{deny_activate}) {
1798	$self->decay_objects;	1958	$self->decay_objects;
1799	$self->fix_auto_apply;	1959	$self->fix_auto_apply;
1800	$self->update_buttons;	1960	$self->update_buttons;
1801	Coro::cede;	1961	cf::cede_to_tick;
1802	$self->set_darkness_map;	1962	$self->set_darkness_map;
1803	Coro::cede;	1963	cf::cede_to_tick;
1804	$self->activate;	1964	$self->activate;
1805	}	1965	}
		1966
		1967	$self->{last_save} = $cf::RUNTIME;
		1968	$self->last_access ($cf::RUNTIME);
1806		1969
1807	$self->in_memory (cf::MAP_IN_MEMORY);	1970	$self->in_memory (cf::MAP_IN_MEMORY);
1808	}	1971	}
1809		1972
1810	$self->post_load;	1973	$self->post_load;
…		…
1821		1984
1822	$self	1985	$self
1823	}	1986	}
1824		1987
1825	# find and load all maps in the 3x3 area around a map	1988	# find and load all maps in the 3x3 area around a map
1826	sub load_diag {	1989	sub load_neighbours {
1827	my ($map) = @_;	1990	my ($map) = @_;
1828		1991
1829	my @diag; # diagonal neighbours	1992	my @neigh; # diagonal neighbours
1830		1993
1831	for (0 .. 3) {	1994	for (0 .. 3) {
1832	my $neigh = $map->tile_path ($_)	1995	my $neigh = $map->tile_path ($_)
1833	or next;	1996	or next;
1834	$neigh = find $neigh, $map	1997	$neigh = find $neigh, $map
1835	or next;	1998	or next;
1836	$neigh->load;	1999	$neigh->load;
1837		2000
		2001	push @neigh,
1838	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2002	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1839	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2003	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1840	}	2004	}
1841		2005
1842	for (@diag) {	2006	for (grep defined $_->[0], @neigh) {
		2007	my ($path, $origin) = @$_;
1843	my $neigh = find @$_	2008	my $neigh = find $path, $origin
1844	or next;	2009	or next;
1845	$neigh->load;	2010	$neigh->load;
1846	}	2011	}
1847	}	2012	}
1848		2013
…		…
1853	}	2018	}
1854		2019
1855	sub do_load_sync {	2020	sub do_load_sync {
1856	my ($map) = @_;	2021	my ($map) = @_;
1857		2022
		2023	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2024	if $Coro::current == $Coro::main;
		2025
1858	cf::sync_job { $map->load };	2026	cf::sync_job { $map->load };
1859	}	2027	}
1860		2028
1861	our %MAP_PREFETCH;	2029	our %MAP_PREFETCH;
1862	our $MAP_PREFETCHER = undef;	2030	our $MAP_PREFETCHER = undef;
1863		2031
1864	sub find_async {	2032	sub find_async {
1865	my ($path, $origin) = @_;	2033	my ($path, $origin, $load) = @_;
1866		2034
1867	$path = normalise $path, $origin && $origin->{path};	2035	$path = normalise $path, $origin && $origin->{path};
1868		2036
1869	if (my $map = $cf::MAP{$path}) {	2037	if (my $map = $cf::MAP{$path}) {
1870	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2038	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1871	}	2039	}
1872		2040
1873	undef $MAP_PREFETCH{$path};	2041	$MAP_PREFETCH{$path} |= $load;
		2042
1874	$MAP_PREFETCHER ||= cf::async {	2043	$MAP_PREFETCHER ||= cf::async {
		2044	$Coro::current->{desc} = "map prefetcher";
		2045
1875	while (%MAP_PREFETCH) {	2046	while (%MAP_PREFETCH) {
1876	for my $path (keys %MAP_PREFETCH) {	2047	while (my ($k, $v) = each %MAP_PREFETCH) {
1877	my $map = find $path	2048	if (my $map = find $k) {
1878	or next;
1879	$map->load;	2049	$map->load if $v;
		2050	}
1880		2051
1881	delete $MAP_PREFETCH{$path};	2052	delete $MAP_PREFETCH{$k};
1882	}	2053	}
1883	}	2054	}
1884	undef $MAP_PREFETCHER;	2055	undef $MAP_PREFETCHER;
1885	};	2056	};
1886	$MAP_PREFETCHER->prio (6);	2057	$MAP_PREFETCHER->prio (6);
…		…
1889	}	2060	}
1890		2061
1891	sub save {	2062	sub save {
1892	my ($self) = @_;	2063	my ($self) = @_;
1893		2064
1894	my $lock = cf::lock_acquire "map_data:" . $self->path;	2065	my $lock = cf::lock_acquire "map_data:$self->{path}";
1895		2066
1896	$self->{last_save} = $cf::RUNTIME;	2067	$self->{last_save} = $cf::RUNTIME;
1897		2068
1898	return unless $self->dirty;	2069	return unless $self->dirty;
1899		2070
…		…
1905	return if $self->{deny_save};	2076	return if $self->{deny_save};
1906		2077
1907	local $self->{last_access} = $self->last_access;#d#	2078	local $self->{last_access} = $self->last_access;#d#
1908		2079
1909	cf::async {	2080	cf::async {
		2081	$Coro::current->{desc} = "map player save";
1910	$_->contr->save for $self->players;	2082	$_->contr->save for $self->players;
1911	};	2083	};
1912		2084
1913	if ($uniq) {	2085	if ($uniq) {
1914	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2086	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
1922	my ($self) = @_;	2094	my ($self) = @_;
1923		2095
1924	# save first because save cedes	2096	# save first because save cedes
1925	$self->save;	2097	$self->save;
1926		2098
1927	my $lock = cf::lock_acquire "map_data:" . $self->path;	2099	my $lock = cf::lock_acquire "map_data:$self->{path}";
1928		2100
1929	return if $self->players;	2101	return if $self->players;
1930	return if $self->in_memory != cf::MAP_IN_MEMORY;	2102	return if $self->in_memory != cf::MAP_IN_MEMORY;
1931	return if $self->{deny_save};	2103	return if $self->{deny_save};
1932		2104
		2105	$self->in_memory (cf::MAP_SWAPPED);
		2106
		2107	$self->deactivate;
		2108	$_->clear_links_to ($self) for values %cf::MAP;
1933	$self->clear;	2109	$self->clear;
1934	$self->in_memory (cf::MAP_SWAPPED);
1935	}	2110	}
1936		2111
1937	sub reset_at {	2112	sub reset_at {
1938	my ($self) = @_;	2113	my ($self) = @_;
1939		2114
…		…
1971	if $uniq;	2146	if $uniq;
1972	}	2147	}
1973		2148
1974	delete $cf::MAP{$self->path};	2149	delete $cf::MAP{$self->path};
1975		2150
		2151	$self->deactivate;
		2152	$_->clear_links_to ($self) for values %cf::MAP;
1976	$self->clear;	2153	$self->clear;
1977
1978	$_->clear_links_to ($self) for values %cf::MAP;
1979		2154
1980	$self->unlink_save;	2155	$self->unlink_save;
1981	$self->destroy;	2156	$self->destroy;
1982	}	2157	}
1983		2158
1984	my $nuke_counter = "aaaa";	2159	my $nuke_counter = "aaaa";
1985		2160
1986	sub nuke {	2161	sub nuke {
1987	my ($self) = @_;	2162	my ($self) = @_;
1988		2163
		2164	{
		2165	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2166
1989	delete $cf::MAP{$self->path};	2167	delete $cf::MAP{$self->path};
1990		2168
1991	$self->unlink_save;	2169	$self->unlink_save;
1992		2170
1993	bless $self, "cf::map";	2171	bless $self, "cf::map";
1994	delete $self->{deny_reset};	2172	delete $self->{deny_reset};
1995	$self->{deny_save} = 1;	2173	$self->{deny_save} = 1;
1996	$self->reset_timeout (1);	2174	$self->reset_timeout (1);
1997	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2175	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1998		2176
1999	$cf::MAP{$self->path} = $self;	2177	$cf::MAP{$self->path} = $self;
		2178	}
2000		2179
2001	$self->reset; # polite request, might not happen	2180	$self->reset; # polite request, might not happen
2002	}	2181	}
2003		2182
2004	=item $maps = cf::map::tmp_maps	2183	=item $maps = cf::map::tmp_maps
…		…
2080		2259
2081	sub inv_recursive {	2260	sub inv_recursive {
2082	inv_recursive_ inv $_[0]	2261	inv_recursive_ inv $_[0]
2083	}	2262	}
2084		2263
		2264	=item $ref = $ob->ref
		2265
		2266	creates and returns a persistent reference to an objetc that can be stored as a string.
		2267
		2268	=item $ob = cf::object::deref ($refstring)
		2269
		2270	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2271	even if the object actually exists. May block.
		2272
		2273	=cut
		2274
		2275	sub deref {
		2276	my ($ref) = @_;
		2277
		2278	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2279	my ($uuid, $name) = ($1, $2);
		2280	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2281	or return;
		2282	$pl->ob->uuid eq $uuid
		2283	or return;
		2284
		2285	$pl->ob
		2286	} else {
		2287	warn "$ref: cannot resolve object reference\n";
		2288	undef
		2289	}
		2290	}
		2291
2085	package cf;	2292	package cf;
2086		2293
2087	=back	2294	=back
2088		2295
2089	=head3 cf::object::player	2296	=head3 cf::object::player
…		…
2111		2318
2112	} else {	2319	} else {
2113	my $pl = $self->contr;	2320	my $pl = $self->contr;
2114		2321
2115	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2322	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2116	my $diag = $pl->{npc_dialog};	2323	my $dialog = $pl->{npc_dialog};
2117	$diag->{pl}->ext_reply (	2324	$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		2325
2124	} else {	2326	} else {
2125	$msg = $npc->name . " says: $msg" if $npc;	2327	$msg = $npc->name . " says: $msg" if $npc;
2126	$self->message ($msg, $flags);	2328	$self->message ($msg, $flags);
2127	}	2329	}
2128	}	2330	}
		2331	}
		2332
		2333	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2334
		2335	=cut
		2336
		2337	sub cf::object::send_msg {
		2338	my $pl = shift->contr
		2339	or return;
		2340	$pl->send_msg (@_);
2129	}	2341	}
2130		2342
2131	=item $player_object->may ("access")	2343	=item $player_object->may ("access")
2132		2344
2133	Returns wether the given player is authorized to access resource "access"	2345	Returns wether the given player is authorized to access resource "access"
…		…
2212	# use -1 or undef as default coordinates, not 0, 0	2424	# use -1 or undef as default coordinates, not 0, 0
2213	($x, $y) = ($map->enter_x, $map->enter_y)	2425	($x, $y) = ($map->enter_x, $map->enter_y)
2214	if $x <=0 && $y <= 0;	2426	if $x <=0 && $y <= 0;
2215		2427
2216	$map->load;	2428	$map->load;
2217	$map->load_diag;	2429	$map->load_neighbours;
2218		2430
2219	return unless $self->contr->active;	2431	return unless $self->contr->active;
2220	$self->activate_recursive;	2432	$self->activate_recursive;
2221		2433
2222	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2434	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223	$self->enter_map ($map, $x, $y);	2435	$self->enter_map ($map, $x, $y);
2224	}	2436	}
2225		2437
2226	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2438	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2227		2439
2228	Moves the player to the given map-path and coordinates by first freezing	2440	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	2441	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	2442	that has to return the map if sucecssful, and then unfreezes the player on
2231	the new (success) or old (failed) map position.	2443	the new (success) or old (failed) map position. In either case, $done will
		2444	be called at the end of this process.
2232		2445
2233	=cut	2446	=cut
2234		2447
2235	our $GOTOGEN;	2448	our $GOTOGEN;
2236		2449
2237	sub cf::object::player::goto {	2450	sub cf::object::player::goto {
2238	my ($self, $path, $x, $y, $check) = @_;	2451	my ($self, $path, $x, $y, $check, $done) = @_;
2239		2452
2240	# do generation counting so two concurrent goto's will be executed in-order	2453	# do generation counting so two concurrent goto's will be executed in-order
2241	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2454	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242		2455
2243	$self->enter_link;	2456	$self->enter_link;
2244		2457
2245	(async {	2458	(async {
		2459	$Coro::current->{desc} = "player::goto $path $x $y";
		2460
		2461	# *tag paths override both path and x|y
		2462	if ($path =~ /^\*(.*)$/) {
		2463	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2464	my $ob = $obs[rand @obs];
		2465
		2466	# see if we actually can go there
		2467	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2468	$ob = $obs[rand @obs];
		2469	} else {
		2470	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2471	}
		2472	# else put us there anyways for now #d#
		2473
		2474	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2475	} else {
		2476	($path, $x, $y) = (undef, undef, undef);
		2477	}
		2478	}
		2479
2246	my $map = eval {	2480	my $map = eval {
2247	my $map = cf::map::find $path;	2481	my $map = defined $path ? cf::map::find $path : undef;
2248		2482
2249	if ($map) {	2483	if ($map) {
2250	$map = $map->customise_for ($self);	2484	$map = $map->customise_for ($self);
2251	$map = $check->($map) if $check && $map;	2485	$map = $check->($map) if $check && $map;
2252	} else {	2486	} else {
2253	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2487	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2254	}	2488	}
2255		2489
2256	$map	2490	$map
2257	};	2491	};
2258		2492
…		…
2263		2497
2264	if ($gen == $self->{_goto_generation}) {	2498	if ($gen == $self->{_goto_generation}) {
2265	delete $self->{_goto_generation};	2499	delete $self->{_goto_generation};
2266	$self->leave_link ($map, $x, $y);	2500	$self->leave_link ($map, $x, $y);
2267	}	2501	}
		2502
		2503	$done->() if $done;
2268	})->prio (1);	2504	})->prio (1);
2269	}	2505	}
2270		2506
2271	=item $player_object->enter_exit ($exit_object)	2507	=item $player_object->enter_exit ($exit_object)
2272		2508
…		…
2341	my $hp = $exit->stats->hp;	2577	my $hp = $exit->stats->hp;
2342	my $sp = $exit->stats->sp;	2578	my $sp = $exit->stats->sp;
2343		2579
2344	$self->enter_link;	2580	$self->enter_link;
2345		2581
		2582	# if exit is damned, update players death & WoR home-position
		2583	$self->contr->savebed ($slaying, $hp, $sp)
		2584	if $exit->flag (FLAG_DAMNED);
		2585
2346	(async {	2586	(async {
		2587	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2588
2347	$self->deactivate_recursive; # just to be sure	2589	$self->deactivate_recursive; # just to be sure
2348	unless (eval {	2590	unless (eval {
2349	$self->goto ($slaying, $hp, $sp);	2591	$self->goto ($slaying, $hp, $sp);
2350		2592
2351	1;	2593	1;
…		…
2377		2619
2378	utf8::encode $text;	2620	utf8::encode $text;
2379	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2621	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2380	}	2622	}
2381		2623
2382	=item $client->send_msg ($color, $type, $msg, [extra...])	2624	=item $client->send_msg ($channel, $msg, $color, [extra...])
2383		2625
2384	Send a drawinfo or msg packet to the client, formatting the msg for the	2626	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	2627	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	2628	the message, with C<log> being the default. If C<$color> is negative, suppress
2387	the message unless the client supports the msg packet.	2629	the message unless the client supports the msg packet.
2388		2630
2389	=cut	2631	=cut
2390		2632
		2633	our %CHANNEL = (
		2634	"c/identify" => {
		2635	id => "infobox",
		2636	title => "Identify",
		2637	reply => undef,
		2638	tooltip => "Items recently identified",
		2639	},
		2640	"c/examine" => {
		2641	id => "infobox",
		2642	title => "Examine",
		2643	reply => undef,
		2644	tooltip => "Signs and other items you examined",
		2645	},
		2646	"c/lookat" => {
		2647	id => "infobox",
		2648	title => "Look",
		2649	reply => undef,
		2650	tooltip => "What you saw there",
		2651	},
		2652	);
		2653
2391	sub cf::client::send_msg {	2654	sub cf::client::send_msg {
2392	my ($self, $color, $type, $msg, @extra) = @_;	2655	my ($self, $channel, $msg, $color, @extra) = @_;
2393		2656
2394	$msg = $self->pl->expand_cfpod ($msg);	2657	$msg = $self->pl->expand_cfpod ($msg);
2395		2658
		2659	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2660
		2661	# check predefined channels, for the benefit of C
		2662	if ($CHANNEL{$channel}) {
		2663	$channel = $CHANNEL{$channel};
		2664
		2665	$self->ext_msg (channel_info => $channel)
		2666	if $self->can_msg;
		2667
		2668	$channel = $channel->{id};
		2669
		2670	} elsif (ref $channel) {
		2671	# send meta info to client, if not yet sent
		2672	unless (exists $self->{channel}{$channel->{id}}) {
		2673	$self->{channel}{$channel->{id}} = $channel;
		2674	$self->ext_msg (channel_info => $channel)
		2675	if $self->can_msg;
		2676	}
		2677
		2678	$channel = $channel->{id};
		2679	}
		2680
		2681	return unless @extra || length $msg;
		2682
2396	if ($self->can_msg) {	2683	if ($self->can_msg) {
2397	$self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);	2684	# default colour, mask it out
		2685	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2686	if $color & cf::NDI_DEF;
		2687
		2688	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2689	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2398	} else {	2690	} 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) {	2691	if ($color >= 0) {
		2692	# replace some tags by gcfclient-compatible ones
		2693	for ($msg) {
		2694	1 while
		2695	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2696	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2697	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2698	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2699	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2700	}
		2701
		2702	$color &= cf::NDI_COLOR_MASK;
		2703
		2704	utf8::encode $msg;
		2705
2410	if (0 && $msg =~ /\[/) {	2706	if (0 && $msg =~ /\[/) {
		2707	# COMMAND/INFO
2411	$self->send_packet ("drawextinfo $color 4 0 $msg")	2708	$self->send_packet ("drawextinfo $color 10 8 $msg")
2412	} else {	2709	} else {
2413	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	2710	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2414	$self->send_packet ("drawinfo $color $msg")	2711	$self->send_packet ("drawinfo $color $msg")
2415	}	2712	}
2416	}	2713	}
2417	}	2714	}
2418	}	2715	}
2419		2716
2420	=item $client->ext_event ($type, %msg)	2717	=item $client->ext_msg ($type, @msg)
2421		2718
2422	Sends an ext event to the client.	2719	Sends an ext event to the client.
2423		2720
2424	=cut	2721	=cut
2425		2722
2426	sub cf::client::ext_event($$%) {	2723	sub cf::client::ext_msg($$@) {
2427	my ($self, $type, %msg) = @_;	2724	my ($self, $type, @msg) = @_;
2428		2725
		2726	if ($self->extcmd == 2) {
		2727	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2728	} elsif ($self->extcmd == 1) { # TODO: remove
2429	$msg{msgtype} = "event_$type";	2729	push @msg, msgtype => "event_$type";
2430	$self->send_packet ("ext " . cf::to_json \%msg);	2730	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2731	}
		2732	}
		2733
		2734	=item $client->ext_reply ($msgid, @msg)
		2735
		2736	Sends an ext reply to the client.
		2737
		2738	=cut
		2739
		2740	sub cf::client::ext_reply($$@) {
		2741	my ($self, $id, @msg) = @_;
		2742
		2743	if ($self->extcmd == 2) {
		2744	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2745	} elsif ($self->extcmd == 1) {
		2746	#TODO: version 1, remove
		2747	unshift @msg, msgtype => "reply", msgid => $id;
		2748	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2749	}
2431	}	2750	}
2432		2751
2433	=item $success = $client->query ($flags, "text", \&cb)	2752	=item $success = $client->query ($flags, "text", \&cb)
2434		2753
2435	Queues a query to the client, calling the given callback with	2754	Queues a query to the client, calling the given callback with
…		…
2458		2777
2459	1	2778	1
2460	}	2779	}
2461		2780
2462	cf::client->attach (	2781	cf::client->attach (
		2782	on_connect => sub {
		2783	my ($ns) = @_;
		2784
		2785	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2786	},
2463	on_reply => sub {	2787	on_reply => sub {
2464	my ($ns, $msg) = @_;	2788	my ($ns, $msg) = @_;
2465		2789
2466	# this weird shuffling is so that direct followup queries	2790	# this weird shuffling is so that direct followup queries
2467	# get handled first	2791	# get handled first
…		…
2482	}	2806	}
2483	},	2807	},
2484	on_exticmd => sub {	2808	on_exticmd => sub {
2485	my ($ns, $buf) = @_;	2809	my ($ns, $buf) = @_;
2486		2810
2487	my $msg = eval { from_json $buf };	2811	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488		2812
2489	if (ref $msg) {	2813	if (ref $msg) {
		2814	my ($type, $reply, @payload) =
		2815	"ARRAY" eq ref $msg
		2816	? @$msg
		2817	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2818
		2819	my @reply;
		2820
2490	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2821	if (my $cb = $EXTICMD{$type}) {
2491	if (my %reply = $cb->($ns, $msg)) {	2822	@reply = $cb->($ns, @payload);
2492	$reply{msgid} = $msg->{msgid};
2493	$ns->send ("ext " . cf::to_json \%reply);
2494	}
2495	}	2823	}
		2824
		2825	$ns->ext_reply ($reply, @reply)
		2826	if $reply;
		2827
2496	} else {	2828	} else {
2497	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2829	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2498	}	2830	}
2499		2831
2500	cf::override;	2832	cf::override;
…		…
2547	our $safe = new Safe "safe";	2879	our $safe = new Safe "safe";
2548	our $safe_hole = new Safe::Hole;	2880	our $safe_hole = new Safe::Hole;
2549		2881
2550	$SIG{FPE} = 'IGNORE';	2882	$SIG{FPE} = 'IGNORE';
2551		2883
2552	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2884	$safe->permit_only (Opcode::opset qw(
		2885	:base_core :base_mem :base_orig :base_math
		2886	grepstart grepwhile mapstart mapwhile
		2887	sort time
		2888	));
2553		2889
2554	# here we export the classes and methods available to script code	2890	# here we export the classes and methods available to script code
2555		2891
2556	=pod	2892	=pod
2557		2893
2558	The following functions and methods are available within a safe environment:	2894	The following functions and methods are available within a safe environment:
2559		2895
2560	cf::object contr pay_amount pay_player map	2896	cf::object
		2897	contr pay_amount pay_player map x y force_find force_add
		2898	insert remove name archname title slaying race decrease_ob_nr
		2899
2561	cf::object::player player	2900	cf::object::player
2562	cf::player peaceful	2901	player
2563	cf::map trigger	2902
		2903	cf::player
		2904	peaceful
		2905
		2906	cf::map
		2907	trigger
2564		2908
2565	=cut	2909	=cut
2566		2910
2567	for (	2911	for (
2568	["cf::object" => qw(contr pay_amount pay_player map)],	2912	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2913	insert remove inv name archname title slaying race
		2914	decrease_ob_nr)],
2569	["cf::object::player" => qw(player)],	2915	["cf::object::player" => qw(player)],
2570	["cf::player" => qw(peaceful)],	2916	["cf::player" => qw(peaceful)],
2571	["cf::map" => qw(trigger)],	2917	["cf::map" => qw(trigger)],
2572	) {	2918	) {
2573	no strict 'refs';	2919	no strict 'refs';
…		…
2649	# the server's init and main functions	2995	# the server's init and main functions
2650		2996
2651	sub load_facedata($) {	2997	sub load_facedata($) {
2652	my ($path) = @_;	2998	my ($path) = @_;
2653		2999
		3000	# HACK to clear player env face cache, we need some signal framework
		3001	# for this (global event?)
		3002	%ext::player_env::MUSIC_FACE_CACHE = ();
		3003
		3004	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3005
2654	warn "loading facedata from $path\n";	3006	warn "loading facedata from $path\n";
2655		3007
2656	my $facedata;	3008	my $facedata;
2657	0 < aio_load $path, $facedata	3009	0 < aio_load $path, $facedata
2658	or die "$path: $!";	3010	or die "$path: $!";
…		…
2660	$facedata = Coro::Storable::thaw $facedata;	3012	$facedata = Coro::Storable::thaw $facedata;
2661		3013
2662	$facedata->{version} == 2	3014	$facedata->{version} == 2
2663	or cf::cleanup "$path: version mismatch, cannot proceed.";	3015	or cf::cleanup "$path: version mismatch, cannot proceed.";
2664		3016
		3017	# patch in the exptable
		3018	$facedata->{resource}{"res/exp_table"} = {
		3019	type => FT_RSRC,
		3020	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3021	};
		3022	cf::cede_to_tick;
		3023
2665	{	3024	{
2666	my $faces = $facedata->{faceinfo};	3025	my $faces = $facedata->{faceinfo};
2667		3026
2668	while (my ($face, $info) = each %$faces) {	3027	while (my ($face, $info) = each %$faces) {
2669	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3028	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2670	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3029	cf::face::set_visibility $idx, $info->{visibility};
		3030	cf::face::set_magicmap $idx, $info->{magicmap};
2671	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3031	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2672	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3032	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2673	Coro::cede;	3033
		3034	cf::cede_to_tick;
2674	}	3035	}
2675		3036
2676	while (my ($face, $info) = each %$faces) {	3037	while (my ($face, $info) = each %$faces) {
2677	next unless $info->{smooth};	3038	next unless $info->{smooth};
2678	my $idx = cf::face::find $face	3039	my $idx = cf::face::find $face
2679	or next;	3040	or next;
2680	if (my $smooth = cf::face::find $info->{smooth}) {	3041	if (my $smooth = cf::face::find $info->{smooth}) {
		3042	cf::face::set_smooth $idx, $smooth;
2681	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3043	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682	} else {	3044	} else {
2683	warn "smooth face '$info->{smooth}' not found for face '$face'";	3045	warn "smooth face '$info->{smooth}' not found for face '$face'";
2684	}	3046	}
2685	Coro::cede;	3047
		3048	cf::cede_to_tick;
2686	}	3049	}
2687	}	3050	}
2688		3051
2689	{	3052	{
2690	my $anims = $facedata->{animinfo};	3053	my $anims = $facedata->{animinfo};
2691		3054
2692	while (my ($anim, $info) = each %$anims) {	3055	while (my ($anim, $info) = each %$anims) {
2693	cf::anim::set $anim, $info->{frames}, $info->{facings};	3056	cf::anim::set $anim, $info->{frames}, $info->{facings};
2694	Coro::cede;	3057	cf::cede_to_tick;
2695	}	3058	}
2696		3059
2697	cf::anim::invalidate_all; # d'oh	3060	cf::anim::invalidate_all; # d'oh
2698	}	3061	}
2699		3062
		3063	{
		3064	# TODO: for gcfclient pleasure, we should give resources
		3065	# that gcfclient doesn't grok a >10000 face index.
		3066	my $res = $facedata->{resource};
		3067
		3068	my $soundconf = delete $res->{"res/sound.conf"};
		3069
		3070	while (my ($name, $info) = each %$res) {
		3071	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3072	my $data;
		3073
		3074	if ($info->{type} & 1) {
		3075	# prepend meta info
		3076
		3077	my $meta = $enc->encode ({
		3078	name => $name,
		3079	%{ $info->{meta} || {} },
		3080	});
		3081
		3082	$data = pack "(w/a*)*", $meta, $info->{data};
		3083	} else {
		3084	$data = $info->{data};
		3085	}
		3086
		3087	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3088	cf::face::set_type $idx, $info->{type};
		3089
		3090	cf::cede_to_tick;
		3091	}
		3092
		3093	if ($soundconf) {
		3094	$soundconf = $enc->decode (delete $soundconf->{data});
		3095
		3096	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3097	my $sound = $soundconf->{compat}[$_]
		3098	or next;
		3099
		3100	my $face = cf::face::find "sound/$sound->[1]";
		3101	cf::sound::set $sound->[0] => $face;
		3102	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3103	}
		3104
		3105	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3106	my $face = cf::face::find "sound/$v";
		3107	cf::sound::set $k => $face;
		3108	}
		3109	}
		3110	}
		3111
2700	1	3112	1
2701	}	3113	}
2702		3114
		3115	register_exticmd fx_want => sub {
		3116	my ($ns, $want) = @_;
		3117
		3118	while (my ($k, $v) = each %$want) {
		3119	$ns->fx_want ($k, $v);
		3120	}
		3121	};
		3122
2703	sub reload_regions {	3123	sub reload_regions {
		3124	# HACK to clear player env face cache, we need some signal framework
		3125	# for this (global event?)
		3126	%ext::player_env::MUSIC_FACE_CACHE = ();
		3127
2704	load_resource_file "$MAPDIR/regions"	3128	load_resource_file "$MAPDIR/regions"
2705	or die "unable to load regions file\n";	3129	or die "unable to load regions file\n";
		3130
		3131	for (cf::region::list) {
		3132	$_->{match} = qr/$_->{match}/
		3133	if exists $_->{match};
		3134	}
2706	}	3135	}
2707		3136
2708	sub reload_facedata {	3137	sub reload_facedata {
2709	load_facedata "$DATADIR/facedata"	3138	load_facedata "$DATADIR/facedata"
2710	or die "unable to load facedata\n";	3139	or die "unable to load facedata\n";
2711	}	3140	}
2712		3141
2713	sub reload_archetypes {	3142	sub reload_archetypes {
		3143	load_resource_file "$DATADIR/archetypes"
		3144	or die "unable to load archetypes\n";
		3145	#d# NEED to laod twice to resolve forward references
		3146	# this really needs to be done in an extra post-pass
		3147	# (which needs to be synchronous, so solve it differently)
2714	load_resource_file "$DATADIR/archetypes"	3148	load_resource_file "$DATADIR/archetypes"
2715	or die "unable to load archetypes\n";	3149	or die "unable to load archetypes\n";
2716	}	3150	}
2717		3151
2718	sub reload_treasures {	3152	sub reload_treasures {
…		…
2734		3168
2735	sub init {	3169	sub init {
2736	reload_resources;	3170	reload_resources;
2737	}	3171	}
2738		3172
2739	sub cfg_load {	3173	sub reload_config {
2740	open my $fh, "<:utf8", "$CONFDIR/config"	3174	open my $fh, "<:utf8", "$CONFDIR/config"
2741	or return;	3175	or return;
2742		3176
2743	local $/;	3177	local $/;
2744	*CFG = YAML::Syck::Load <$fh>;	3178	*CFG = YAML::Syck::Load <$fh>;
…		…
2760	sub main {	3194	sub main {
2761	# we must not ever block the main coroutine	3195	# we must not ever block the main coroutine
2762	local $Coro::idle = sub {	3196	local $Coro::idle = sub {
2763	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3197	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2764	(async {	3198	(async {
		3199	$Coro::current->{desc} = "IDLE BUG HANDLER";
2765	Event::one_event;	3200	Event::one_event;
2766	})->prio (Coro::PRIO_MAX);	3201	})->prio (Coro::PRIO_MAX);
2767	};	3202	};
2768		3203
2769	cfg_load;	3204	reload_config;
2770	db_init;	3205	db_init;
2771	load_extensions;	3206	load_extensions;
2772		3207
2773	$TICK_WATCHER->start;	3208	$TICK_WATCHER->start;
2774	Event::loop;	3209	Event::loop;
…		…
2967	warn "reloading cf.pm";	3402	warn "reloading cf.pm";
2968	require cf;	3403	require cf;
2969	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3404	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2970		3405
2971	warn "loading config and database again";	3406	warn "loading config and database again";
2972	cf::cfg_load;	3407	cf::reload_config;
2973		3408
2974	warn "loading extensions";	3409	warn "loading extensions";
2975	cf::load_extensions;	3410	cf::load_extensions;
2976		3411
2977	warn "reattaching attachments to objects/players";	3412	warn "reattaching attachments to objects/players";
…		…
3013	register_command "reload" => sub {	3448	register_command "reload" => sub {
3014	my ($who, $arg) = @_;	3449	my ($who, $arg) = @_;
3015		3450
3016	if ($who->flag (FLAG_WIZ)) {	3451	if ($who->flag (FLAG_WIZ)) {
3017	$who->message ("reloading server.");	3452	$who->message ("reloading server.");
		3453	async {
		3454	$Coro::current->{desc} = "perl_reload";
3018	async { reload_perl };	3455	reload_perl;
		3456	};
3019	}	3457	}
3020	};	3458	};
3021		3459
3022	unshift @INC, $LIBDIR;	3460	unshift @INC, $LIBDIR;
3023		3461
…		…
3042	my $signal = new Coro::Signal;	3480	my $signal = new Coro::Signal;
3043	push @WAIT_FOR_TICK_BEGIN, $signal;	3481	push @WAIT_FOR_TICK_BEGIN, $signal;
3044	$signal->wait;	3482	$signal->wait;
3045	}	3483	}
3046		3484
3047	my $min = 1e6;#d#
3048	my $avg = 10;
3049	$TICK_WATCHER = Event->timer (	3485	$TICK_WATCHER = Event->timer (
3050	reentrant => 0,	3486	reentrant => 0,
3051	parked => 1,	3487	parked => 1,
3052	prio => 0,	3488	prio => 0,
3053	at => $NEXT_TICK || $TICK,	3489	at => $NEXT_TICK || $TICK,
…		…
3061		3497
3062	$NOW = $tick_start = Event::time;	3498	$NOW = $tick_start = Event::time;
3063		3499
3064	cf::server_tick; # one server iteration	3500	cf::server_tick; # one server iteration
3065		3501
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;	3502	$RUNTIME += $TICK;
3090	$NEXT_TICK += $TICK;	3503	$NEXT_TICK += $TICK;
3091		3504
3092	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3505	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3093	$NEXT_RUNTIME_WRITE = $NOW + 10;	3506	$NEXT_RUNTIME_WRITE = $NOW + 10;
3094	Coro::async_pool {	3507	Coro::async_pool {
		3508	$Coro::current->{desc} = "runtime saver";
3095	write_runtime	3509	write_runtime
3096	or warn "ERROR: unable to write runtime file: $!";	3510	or warn "ERROR: unable to write runtime file: $!";
3097	};	3511	};
3098	}	3512	}
3099		3513
3100	# my $AFTER = Event::time;
3101	# warn $AFTER - $NOW;#d#
3102
3103	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3514	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3104	$sig->send;	3515	$sig->send;
3105	}	3516	}
3106	while (my $sig = shift @WAIT_FOR_TICK) {	3517	while (my $sig = shift @WAIT_FOR_TICK) {
3107	$sig->send;	3518	$sig->send;
…		…
3117		3528
3118	$LOAD = ($NOW - $tick_start) / $TICK;	3529	$LOAD = ($NOW - $tick_start) / $TICK;
3119	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3530	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3120		3531
3121	_post_tick;	3532	_post_tick;
3122
3123
3124	},	3533	},
3125	);	3534	);
3126		3535
3127	{	3536	{
		3537	BDB::min_parallel 8;
3128	BDB::max_poll_time $TICK * 0.1;	3538	BDB::max_poll_time $TICK * 0.1;
3129	$BDB_POLL_WATCHER = Event->io (	3539	$BDB_POLL_WATCHER = Event->io (
3130	reentrant => 0,	3540	reentrant => 0,
3131	fd => BDB::poll_fileno,	3541	fd => BDB::poll_fileno,
3132	poll => 'r',	3542	poll => 'r',
3133	prio => 0,	3543	prio => 0,
3134	data => WF_AUTOCANCEL,	3544	data => WF_AUTOCANCEL,
3135	cb => \&BDB::poll_cb,	3545	cb => \&BDB::poll_cb,
3136	);	3546	);
3137	BDB::min_parallel 8;
3138		3547
3139	BDB::set_sync_prepare {	3548	BDB::set_sync_prepare {
3140	my $status;	3549	my $status;
3141	my $current = $Coro::current;	3550	my $current = $Coro::current;
3142	(	3551	(
…		…
3151	)	3560	)
3152	};	3561	};
3153		3562
3154	unless ($DB_ENV) {	3563	unless ($DB_ENV) {
3155	$DB_ENV = BDB::db_env_create;	3564	$DB_ENV = BDB::db_env_create;
		3565	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3566	| BDB::LOG_AUTOREMOVE, 1);
		3567	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3568	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3156		3569
3157	cf::sync_job {	3570	cf::sync_job {
3158	eval {	3571	eval {
3159	BDB::db_env_open	3572	BDB::db_env_open
3160	$DB_ENV,	3573	$DB_ENV,
…		…
3162	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3575	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3163	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3576	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3164	0666;	3577	0666;
3165		3578
3166	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3579	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	};	3580	};
3171		3581
3172	cf::cleanup "db_env_open(db): $@" if $@;	3582	cf::cleanup "db_env_open(db): $@" if $@;
3173	};	3583	};
3174	}	3584	}
		3585
		3586	$BDB_DEADLOCK_WATCHER = Event->timer (
		3587	after => 3,
		3588	interval => 1,
		3589	hard => 1,
		3590	prio => 0,
		3591	data => WF_AUTOCANCEL,
		3592	cb => sub {
		3593	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3594	},
		3595	);
		3596	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3597	after => 11,
		3598	interval => 60,
		3599	hard => 1,
		3600	prio => 0,
		3601	data => WF_AUTOCANCEL,
		3602	cb => sub {
		3603	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3604	},
		3605	);
		3606	$BDB_TRICKLE_WATCHER = Event->timer (
		3607	after => 5,
		3608	interval => 10,
		3609	hard => 1,
		3610	prio => 0,
		3611	data => WF_AUTOCANCEL,
		3612	cb => sub {
		3613	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3614	},
		3615	);
3175	}	3616	}
3176		3617
3177	{	3618	{
3178	IO::AIO::min_parallel 8;	3619	IO::AIO::min_parallel 8;
3179		3620
…		…
3182	$AIO_POLL_WATCHER = Event->io (	3623	$AIO_POLL_WATCHER = Event->io (
3183	reentrant => 0,	3624	reentrant => 0,
3184	data => WF_AUTOCANCEL,	3625	data => WF_AUTOCANCEL,
3185	fd => IO::AIO::poll_fileno,	3626	fd => IO::AIO::poll_fileno,
3186	poll => 'r',	3627	poll => 'r',
3187	prio => 6,	3628	prio => 0,
3188	cb => \&IO::AIO::poll_cb,	3629	cb => \&IO::AIO::poll_cb,
3189	);	3630	);
3190	}	3631	}
3191		3632
3192	my $_log_backtrace;	3633	my $_log_backtrace;
…		…
3198		3639
3199	# limit the # of concurrent backtraces	3640	# limit the # of concurrent backtraces
3200	if ($_log_backtrace < 2) {	3641	if ($_log_backtrace < 2) {
3201	++$_log_backtrace;	3642	++$_log_backtrace;
3202	async {	3643	async {
		3644	$Coro::current->{desc} = "abt $msg";
		3645
3203	my @bt = fork_call {	3646	my @bt = fork_call {
3204	@addr = map { sprintf "%x", $_ } @addr;	3647	@addr = map { sprintf "%x", $_ } @addr;
3205	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3648	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3206	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	3649	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3207	or die "addr2line: $!";	3650	or die "addr2line: $!";

Diff Legend

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