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.373 by root, Sat Sep 15 15:58:06 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
…		…
950	sub object_freezer_save {	1028	sub object_freezer_save {
951	my ($filename, $rdata, $objs) = @_;	1029	my ($filename, $rdata, $objs) = @_;
952		1030
953	sync_job {	1031	sync_job {
954	if (length $$rdata) {	1032	if (length $$rdata) {
		1033	utf8::decode (my $decname = $filename);
955	warn sprintf "saving %s (%d,%d)\n",	1034	warn sprintf "saving %s (%d,%d)\n",
956	$filename, length $$rdata, scalar @$objs;	1035	$decname, length $$rdata, scalar @$objs;
957		1036
958	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1037	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
959	chmod SAVE_MODE, $fh;	1038	chmod SAVE_MODE, $fh;
960	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1039	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
961	aio_fsync $fh if $cf::USE_FSYNC;	1040	aio_fsync $fh if $cf::USE_FSYNC;
…		…
980	}	1059	}
981	} else {	1060	} else {
982	aio_unlink $filename;	1061	aio_unlink $filename;
983	aio_unlink "$filename.pst";	1062	aio_unlink "$filename.pst";
984	}	1063	}
985	}	1064	};
986	}	1065	}
987		1066
988	sub object_freezer_as_string {	1067	sub object_freezer_as_string {
989	my ($rdata, $objs) = @_;	1068	my ($rdata, $objs) = @_;
990		1069
…		…
1002	or return;	1081	or return;
1003		1082
1004	unless (aio_stat "$filename.pst") {	1083	unless (aio_stat "$filename.pst") {
1005	(aio_load "$filename.pst", $av) >= 0	1084	(aio_load "$filename.pst", $av) >= 0
1006	or return;	1085	or return;
		1086
1007	$av = eval { (Storable::thaw $av)->{objs} };	1087	$av = eval { (Storable::thaw $av)->{objs} };
1008	}	1088	}
1009		1089
		1090	utf8::decode (my $decname = $filename);
1010	warn sprintf "loading %s (%d)\n",	1091	warn sprintf "loading %s (%d,%d)\n",
1011	$filename, length $data, scalar @{$av || []};	1092	$decname, length $data, scalar @{$av || []};
		1093
1012	return ($data, $av);	1094	($data, $av)
1013	}	1095	}
1014		1096
1015	=head2 COMMAND CALLBACKS	1097	=head2 COMMAND CALLBACKS
1016		1098
1017	=over 4	1099	=over 4
…		…
1087	cf::override;	1169	cf::override;
1088	},	1170	},
1089	on_extcmd => sub {	1171	on_extcmd => sub {
1090	my ($pl, $buf) = @_;	1172	my ($pl, $buf) = @_;
1091		1173
1092	my $msg = eval { from_json $buf };	1174	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1093		1175
1094	if (ref $msg) {	1176	if (ref $msg) {
		1177	my ($type, $reply, @payload) =
		1178	"ARRAY" eq ref $msg
		1179	? @$msg
		1180	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1181
		1182	my @reply;
		1183
1095	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1184	if (my $cb = $EXTCMD{$type}) {
1096	if (my %reply = $cb->($pl, $msg)) {	1185	@reply = $cb->($pl, @payload);
1097	$pl->ext_reply ($msg->{msgid}, %reply);
1098	}
1099	}	1186	}
		1187
		1188	$pl->ext_reply ($reply, @reply)
		1189	if $reply;
		1190
1100	} else {	1191	} else {
1101	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1192	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1102	}	1193	}
1103		1194
1104	cf::override;	1195	cf::override;
…		…
1194		1285
1195	=head3 cf::player	1286	=head3 cf::player
1196		1287
1197	=over 4	1288	=over 4
1198		1289
		1290	=item cf::player::num_playing
		1291
		1292	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1293
		1294	=cut
		1295
		1296	sub num_playing {
		1297	scalar grep
		1298	$_->ob->map
		1299	&& !$_->hidden
		1300	&& !$_->ob->flag (cf::FLAG_WIZ),
		1301	cf::player::list
		1302	}
		1303
1199	=item cf::player::find $login	1304	=item cf::player::find $login
1200		1305
1201	Returns the given player object, loading it if necessary (might block).	1306	Returns the given player object, loading it if necessary (might block).
1202		1307
1203	=cut	1308	=cut
…		…
1238	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1343	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1239	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1344	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1240	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1345	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1241	aio_unlink +(playerdir $login) . "/$login.pl";	1346	aio_unlink +(playerdir $login) . "/$login.pl";
1242		1347
1243	my $pl = load_pl path $login	1348	my $f = new_from_file cf::object::thawer path $login
1244	or return;	1349	or return;
		1350
		1351	my $pl = cf::player::load_pl $f
		1352	or return;
		1353	local $cf::PLAYER_LOADING{$login} = $pl;
		1354	$f->resolve_delayed_derefs;
1245	$cf::PLAYER{$login} = $pl	1355	$cf::PLAYER{$login} = $pl
1246	}	1356	}
1247	}	1357	}
1248	}	1358	}
1249		1359
…		…
1259		1369
1260	aio_mkdir playerdir $pl, 0770;	1370	aio_mkdir playerdir $pl, 0770;
1261	$pl->{last_save} = $cf::RUNTIME;	1371	$pl->{last_save} = $cf::RUNTIME;
1262		1372
1263	$pl->save_pl ($path);	1373	$pl->save_pl ($path);
1264	Coro::cede;	1374	cf::cede_to_tick;
1265	}	1375	}
1266		1376
1267	sub new($) {	1377	sub new($) {
1268	my ($login) = @_;	1378	my ($login) = @_;
1269		1379
…		…
1273	$self->{deny_save} = 1;	1383	$self->{deny_save} = 1;
1274		1384
1275	$cf::PLAYER{$login} = $self;	1385	$cf::PLAYER{$login} = $self;
1276		1386
1277	$self	1387	$self
		1388	}
		1389
		1390	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1391
		1392	=cut
		1393
		1394	sub send_msg {
		1395	my $ns = shift->ns
		1396	or return;
		1397	$ns->send_msg (@_);
1278	}	1398	}
1279		1399
1280	=item $pl->quit_character	1400	=item $pl->quit_character
1281		1401
1282	Nukes the player without looking back. If logged in, the connection will	1402	Nukes the player without looking back. If logged in, the connection will
…		…
1337	or return [];	1457	or return [];
1338		1458
1339	my @logins;	1459	my @logins;
1340		1460
1341	for my $login (@$dirs) {	1461	for my $login (@$dirs) {
		1462	my $path = path $login;
		1463
		1464	# a .pst is a dead give-away for a valid player
		1465	unless (-e "$path.pst") {
1342	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1466	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1343	aio_read $fh, 0, 512, my $buf, 0 or next;	1467	aio_read $fh, 0, 512, my $buf, 0 or next;
1344	$buf !~ /^password -------------$/m or next; # official not-valid tag	1468	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1469	}
1345		1470
1346	utf8::decode $login;	1471	utf8::decode $login;
1347	push @logins, $login;	1472	push @logins, $login;
1348	}	1473	}
1349		1474
…		…
1387	sub expand_cfpod {	1512	sub expand_cfpod {
1388	((my $self), (local $_)) = @_;	1513	((my $self), (local $_)) = @_;
1389		1514
1390	# escape & and <	1515	# escape & and <
1391	s/&/&amp;/g;	1516	s/&/&amp;/g;
1392	s/(?<![BIUGH])</&lt;/g;	1517	s/(?<![BIUGHT])</&lt;/g;
1393		1518
1394	# this is buggy, it needs to properly take care of nested <'s	1519	# this is buggy, it needs to properly take care of nested <'s
1395		1520
1396	1 while	1521	1 while
1397	# replace B<>, I<>, U<> etc.	1522	# replace B<>, I<>, U<> etc.
1398	s/B<([^\>]*)>/<b>$1<\/b>/	1523	s/B<([^\>]*)>/<b>$1<\/b>/
1399	|| s/I<([^\>]*)>/<i>$1<\/i>/	1524	|| s/I<([^\>]*)>/<i>$1<\/i>/
1400	|| s/U<([^\>]*)>/<u>$1<\/u>/	1525	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1526	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1401	# replace G<male|female> tags	1527	# replace G<male|female> tags
1402	|| s{G<([^>|]*)\|([^>]*)>}{	1528	|| s{G<([^>|]*)\|([^>]*)>}{
1403	$self->gender ? $2 : $1	1529	$self->gender ? $2 : $1
1404	}ge	1530	}ge
1405	# replace H<hint text>	1531	# replace H<hint text>
1406	|| s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;	1532	|| s{H<([^\>]*)>}
		1533	{
		1534	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1535	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1536	"")
		1537	[$self->{hintmode}]
		1538	}ge;
1407		1539
1408	# create single paragraphs (very hackish)	1540	# create single paragraphs (very hackish)
1409	s/(?<=\S)\n(?=\w)/ /g;	1541	s/(?<=\S)\n(?=\w)/ /g;
1410		1542
		1543	# compress some whitespace
		1544	s/\s+\n/\n/g; # ws line-ends
		1545	s/\n\n+/\n/g; # double lines
		1546	s/^\n+//; # beginning lines
		1547	s/\n+$//; # ending lines
		1548
1411	$_	1549	$_
1412	}	1550	}
1413		1551
		1552	sub hintmode {
		1553	$_[0]{hintmode} = $_[1] if @_ > 1;
		1554	$_[0]{hintmode}
		1555	}
		1556
1414	=item $player->ext_reply ($msgid, %msg)	1557	=item $player->ext_reply ($msgid, @msg)
1415		1558
1416	Sends an ext reply to the player.	1559	Sends an ext reply to the player.
1417		1560
1418	=cut	1561	=cut
1419		1562
1420	sub ext_reply($$%) {	1563	sub ext_reply($$@) {
1421	my ($self, $id, %msg) = @_;	1564	my ($self, $id, @msg) = @_;
1422		1565
1423	$msg{msgid} = $id;	1566	$self->ns->ext_reply ($id, @msg)
1424	$self->send ("ext " . cf::to_json \%msg);
1425	}	1567	}
1426		1568
1427	=item $player->ext_event ($type, %msg)	1569	=item $player->ext_msg ($type, @msg)
1428		1570
1429	Sends an ext event to the client.	1571	Sends an ext event to the client.
1430		1572
1431	=cut	1573	=cut
1432		1574
1433	sub ext_event($$%) {	1575	sub ext_msg($$@) {
1434	my ($self, $type, %msg) = @_;	1576	my ($self, $type, @msg) = @_;
1435		1577
1436	$self->ns->ext_event ($type, %msg);	1578	$self->ns->ext_msg ($type, @msg);
1437	}	1579	}
1438		1580
1439	=head3 cf::region	1581	=head3 cf::region
1440		1582
1441	=over 4	1583	=over 4
…		…
1454	my ($path) = @_;	1596	my ($path) = @_;
1455		1597
1456	my ($match, $specificity);	1598	my ($match, $specificity);
1457		1599
1458	for my $region (list) {	1600	for my $region (list) {
1459	if ($region->match && $path =~ $region->match) {	1601	if ($region->{match} && $path =~ $region->{match}) {
1460	($match, $specificity) = ($region, $region->specificity)	1602	($match, $specificity) = ($region, $region->specificity)
1461	if $region->specificity > $specificity;	1603	if $region->specificity > $specificity;
1462	}	1604	}
1463	}	1605	}
1464		1606
…		…
1584	$self->init; # pass $1 etc.	1726	$self->init; # pass $1 etc.
1585	return $self;	1727	return $self;
1586	}	1728	}
1587	}	1729	}
1588		1730
1589	Carp::carp "unable to resolve path '$path' (base '$base').";	1731	Carp::cluck "unable to resolve path '$path' (base '$base').";
1590	()	1732	()
1591	}	1733	}
1592		1734
1593	sub init {	1735	sub init {
1594	my ($self) = @_;	1736	my ($self) = @_;
…		…
1657		1799
1658	sub load_header_from($) {	1800	sub load_header_from($) {
1659	my ($self, $path) = @_;	1801	my ($self, $path) = @_;
1660		1802
1661	utf8::encode $path;	1803	utf8::encode $path;
1662	#aio_open $path, O_RDONLY, 0	1804	my $f = new_from_file cf::object::thawer $path
1663	# or return;
1664
1665	$self->_load_header ($path)
1666	or return;	1805	or return;
		1806
		1807	$self->_load_header ($f)
		1808	or return;
		1809
		1810	local $MAP_LOADING{$self->{path}} = $self;
		1811	$f->resolve_delayed_derefs;
1667		1812
1668	$self->{load_path} = $path;	1813	$self->{load_path} = $path;
1669		1814
1670	1	1815	1
1671	}	1816	}
…		…
1725	sub find {	1870	sub find {
1726	my ($path, $origin) = @_;	1871	my ($path, $origin) = @_;
1727		1872
1728	$path = normalise $path, $origin && $origin->path;	1873	$path = normalise $path, $origin && $origin->path;
1729		1874
		1875	cf::lock_wait "map_data:$path";#d#remove
1730	cf::lock_wait "map_find:$path";	1876	cf::lock_wait "map_find:$path";
1731		1877
1732	$cf::MAP{$path} || do {	1878	$cf::MAP{$path} || do {
1733	my $guard = cf::lock_acquire "map_find:$path";	1879	my $guard1 = cf::lock_acquire "map_find:$path";
		1880	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1881
1734	my $map = new_from_path cf::map $path	1882	my $map = new_from_path cf::map $path
1735	or return;	1883	or return;
1736		1884
1737	$map->{last_save} = $cf::RUNTIME;	1885	$map->{last_save} = $cf::RUNTIME;
1738		1886
…		…
1740	or return;	1888	or return;
1741		1889
1742	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1890	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1743	# doing this can freeze the server in a sync job, obviously	1891	# doing this can freeze the server in a sync job, obviously
1744	#$cf::WAIT_FOR_TICK->wait;	1892	#$cf::WAIT_FOR_TICK->wait;
		1893	undef $guard1;
		1894	undef $guard2;
1745	$map->reset;	1895	$map->reset;
1746	undef $guard;
1747	return find $path;	1896	return find $path;
1748	}	1897	}
1749		1898
1750	$cf::MAP{$path} = $map	1899	$cf::MAP{$path} = $map
1751	}	1900	}
…		…
1760	local $self->{deny_reset} = 1; # loading can take a long time	1909	local $self->{deny_reset} = 1; # loading can take a long time
1761		1910
1762	my $path = $self->{path};	1911	my $path = $self->{path};
1763		1912
1764	{	1913	{
1765	my $guard = cf::lock_acquire "map_load:$path";	1914	my $guard = cf::lock_acquire "map_data:$path";
1766		1915
		1916	return unless $self->valid;
1767	return if $self->in_memory != cf::MAP_SWAPPED;	1917	return unless $self->in_memory == cf::MAP_SWAPPED;
1768		1918
1769	$self->in_memory (cf::MAP_LOADING);	1919	$self->in_memory (cf::MAP_LOADING);
1770		1920
1771	$self->alloc;	1921	$self->alloc;
1772		1922
1773	$self->pre_load;	1923	$self->pre_load;
1774	Coro::cede;	1924	cf::cede_to_tick;
1775		1925
		1926	my $f = new_from_file cf::object::thawer $self->{load_path};
		1927	$f->skip_block;
1776	$self->_load_objects ($self->{load_path}, 1)	1928	$self->_load_objects ($f)
1777	or return;	1929	or return;
1778		1930
1779	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1931	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1780	if delete $self->{load_original};	1932	if delete $self->{load_original};
1781		1933
1782	if (my $uniq = $self->uniq_path) {	1934	if (my $uniq = $self->uniq_path) {
1783	utf8::encode $uniq;	1935	utf8::encode $uniq;
1784	if (aio_open $uniq, O_RDONLY, 0) {	1936	unless (aio_stat $uniq) {
		1937	if (my $f = new_from_file cf::object::thawer $uniq) {
1785	$self->clear_unique_items;	1938	$self->clear_unique_items;
1786	$self->_load_objects ($uniq, 0);	1939	$self->_load_objects ($f);
		1940	$f->resolve_delayed_derefs;
		1941	}
1787	}	1942	}
1788	}	1943	}
1789		1944
1790	Coro::cede;	1945	$f->resolve_delayed_derefs;
		1946
		1947	cf::cede_to_tick;
1791	# now do the right thing for maps	1948	# now do the right thing for maps
1792	$self->link_multipart_objects;	1949	$self->link_multipart_objects;
1793	$self->difficulty ($self->estimate_difficulty)	1950	$self->difficulty ($self->estimate_difficulty)
1794	unless $self->difficulty;	1951	unless $self->difficulty;
1795	Coro::cede;	1952	cf::cede_to_tick;
1796		1953
1797	unless ($self->{deny_activate}) {	1954	unless ($self->{deny_activate}) {
1798	$self->decay_objects;	1955	$self->decay_objects;
1799	$self->fix_auto_apply;	1956	$self->fix_auto_apply;
1800	$self->update_buttons;	1957	$self->update_buttons;
1801	Coro::cede;	1958	cf::cede_to_tick;
1802	$self->set_darkness_map;	1959	$self->set_darkness_map;
1803	Coro::cede;	1960	cf::cede_to_tick;
1804	$self->activate;	1961	$self->activate;
1805	}	1962	}
		1963
		1964	$self->{last_save} = $cf::RUNTIME;
		1965	$self->last_access ($cf::RUNTIME);
1806		1966
1807	$self->in_memory (cf::MAP_IN_MEMORY);	1967	$self->in_memory (cf::MAP_IN_MEMORY);
1808	}	1968	}
1809		1969
1810	$self->post_load;	1970	$self->post_load;
…		…
1821		1981
1822	$self	1982	$self
1823	}	1983	}
1824		1984
1825	# find and load all maps in the 3x3 area around a map	1985	# find and load all maps in the 3x3 area around a map
1826	sub load_diag {	1986	sub load_neighbours {
1827	my ($map) = @_;	1987	my ($map) = @_;
1828		1988
1829	my @diag; # diagonal neighbours	1989	my @neigh; # diagonal neighbours
1830		1990
1831	for (0 .. 3) {	1991	for (0 .. 3) {
1832	my $neigh = $map->tile_path ($_)	1992	my $neigh = $map->tile_path ($_)
1833	or next;	1993	or next;
1834	$neigh = find $neigh, $map	1994	$neigh = find $neigh, $map
1835	or next;	1995	or next;
1836	$neigh->load;	1996	$neigh->load;
1837		1997
		1998	push @neigh,
1838	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	1999	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1839	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2000	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1840	}	2001	}
1841		2002
1842	for (@diag) {	2003	for (grep defined $_->[0], @neigh) {
		2004	my ($path, $origin) = @$_;
1843	my $neigh = find @$_	2005	my $neigh = find $path, $origin
1844	or next;	2006	or next;
1845	$neigh->load;	2007	$neigh->load;
1846	}	2008	}
1847	}	2009	}
1848		2010
…		…
1853	}	2015	}
1854		2016
1855	sub do_load_sync {	2017	sub do_load_sync {
1856	my ($map) = @_;	2018	my ($map) = @_;
1857		2019
		2020	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2021	if $Coro::current == $Coro::main;
		2022
1858	cf::sync_job { $map->load };	2023	cf::sync_job { $map->load };
1859	}	2024	}
1860		2025
1861	our %MAP_PREFETCH;	2026	our %MAP_PREFETCH;
1862	our $MAP_PREFETCHER = undef;	2027	our $MAP_PREFETCHER = undef;
1863		2028
1864	sub find_async {	2029	sub find_async {
1865	my ($path, $origin) = @_;	2030	my ($path, $origin, $load) = @_;
1866		2031
1867	$path = normalise $path, $origin && $origin->{path};	2032	$path = normalise $path, $origin && $origin->{path};
1868		2033
1869	if (my $map = $cf::MAP{$path}) {	2034	if (my $map = $cf::MAP{$path}) {
1870	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2035	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1871	}	2036	}
1872		2037
1873	undef $MAP_PREFETCH{$path};	2038	$MAP_PREFETCH{$path} |= $load;
		2039
1874	$MAP_PREFETCHER ||= cf::async {	2040	$MAP_PREFETCHER ||= cf::async {
1875	while (%MAP_PREFETCH) {	2041	while (%MAP_PREFETCH) {
1876	for my $path (keys %MAP_PREFETCH) {	2042	while (my ($k, $v) = each %MAP_PREFETCH) {
1877	my $map = find $path	2043	if (my $map = find $k) {
1878	or next;
1879	$map->load;	2044	$map->load if $v;
		2045	}
1880		2046
1881	delete $MAP_PREFETCH{$path};	2047	delete $MAP_PREFETCH{$k};
1882	}	2048	}
1883	}	2049	}
1884	undef $MAP_PREFETCHER;	2050	undef $MAP_PREFETCHER;
1885	};	2051	};
1886	$MAP_PREFETCHER->prio (6);	2052	$MAP_PREFETCHER->prio (6);
…		…
1889	}	2055	}
1890		2056
1891	sub save {	2057	sub save {
1892	my ($self) = @_;	2058	my ($self) = @_;
1893		2059
1894	my $lock = cf::lock_acquire "map_data:" . $self->path;	2060	my $lock = cf::lock_acquire "map_data:$self->{path}";
1895		2061
1896	$self->{last_save} = $cf::RUNTIME;	2062	$self->{last_save} = $cf::RUNTIME;
1897		2063
1898	return unless $self->dirty;	2064	return unless $self->dirty;
1899		2065
…		…
1922	my ($self) = @_;	2088	my ($self) = @_;
1923		2089
1924	# save first because save cedes	2090	# save first because save cedes
1925	$self->save;	2091	$self->save;
1926		2092
1927	my $lock = cf::lock_acquire "map_data:" . $self->path;	2093	my $lock = cf::lock_acquire "map_data:$self->{path}";
1928		2094
1929	return if $self->players;	2095	return if $self->players;
1930	return if $self->in_memory != cf::MAP_IN_MEMORY;	2096	return if $self->in_memory != cf::MAP_IN_MEMORY;
1931	return if $self->{deny_save};	2097	return if $self->{deny_save};
1932		2098
		2099	$self->in_memory (cf::MAP_SWAPPED);
		2100
		2101	$self->deactivate;
		2102	$_->clear_links_to ($self) for values %cf::MAP;
1933	$self->clear;	2103	$self->clear;
1934	$self->in_memory (cf::MAP_SWAPPED);
1935	}	2104	}
1936		2105
1937	sub reset_at {	2106	sub reset_at {
1938	my ($self) = @_;	2107	my ($self) = @_;
1939		2108
…		…
1971	if $uniq;	2140	if $uniq;
1972	}	2141	}
1973		2142
1974	delete $cf::MAP{$self->path};	2143	delete $cf::MAP{$self->path};
1975		2144
		2145	$self->deactivate;
		2146	$_->clear_links_to ($self) for values %cf::MAP;
1976	$self->clear;	2147	$self->clear;
1977
1978	$_->clear_links_to ($self) for values %cf::MAP;
1979		2148
1980	$self->unlink_save;	2149	$self->unlink_save;
1981	$self->destroy;	2150	$self->destroy;
1982	}	2151	}
1983		2152
1984	my $nuke_counter = "aaaa";	2153	my $nuke_counter = "aaaa";
1985		2154
1986	sub nuke {	2155	sub nuke {
1987	my ($self) = @_;	2156	my ($self) = @_;
1988		2157
		2158	{
		2159	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2160
1989	delete $cf::MAP{$self->path};	2161	delete $cf::MAP{$self->path};
1990		2162
1991	$self->unlink_save;	2163	$self->unlink_save;
1992		2164
1993	bless $self, "cf::map";	2165	bless $self, "cf::map";
1994	delete $self->{deny_reset};	2166	delete $self->{deny_reset};
1995	$self->{deny_save} = 1;	2167	$self->{deny_save} = 1;
1996	$self->reset_timeout (1);	2168	$self->reset_timeout (1);
1997	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2169	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1998		2170
1999	$cf::MAP{$self->path} = $self;	2171	$cf::MAP{$self->path} = $self;
		2172	}
2000		2173
2001	$self->reset; # polite request, might not happen	2174	$self->reset; # polite request, might not happen
2002	}	2175	}
2003		2176
2004	=item $maps = cf::map::tmp_maps	2177	=item $maps = cf::map::tmp_maps
…		…
2080		2253
2081	sub inv_recursive {	2254	sub inv_recursive {
2082	inv_recursive_ inv $_[0]	2255	inv_recursive_ inv $_[0]
2083	}	2256	}
2084		2257
		2258	=item $ref = $ob->ref
		2259
		2260	creates and returns a persistent reference to an objetc that can be stored as a string.
		2261
		2262	=item $ob = cf::object::deref ($refstring)
		2263
		2264	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2265	even if the object actually exists. May block.
		2266
		2267	=cut
		2268
		2269	sub deref {
		2270	my ($ref) = @_;
		2271
		2272	# temporary compatibility#TODO#remove
		2273	$ref =~ s{^<}{player/<};
		2274
		2275	if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
		2276	my ($uuid, $name) = ($1, $2);
		2277	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2278	or return;
		2279	$pl->ob->uuid eq $uuid
		2280	or return;
		2281
		2282	$pl->ob
		2283	} else {
		2284	warn "$ref: cannot resolve object reference\n";
		2285	undef
		2286	}
		2287	}
		2288
2085	package cf;	2289	package cf;
2086		2290
2087	=back	2291	=back
2088		2292
2089	=head3 cf::object::player	2293	=head3 cf::object::player
…		…
2111		2315
2112	} else {	2316	} else {
2113	my $pl = $self->contr;	2317	my $pl = $self->contr;
2114		2318
2115	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2319	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2116	my $diag = $pl->{npc_dialog};	2320	my $dialog = $pl->{npc_dialog};
2117	$diag->{pl}->ext_reply (	2321	$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		2322
2124	} else {	2323	} else {
2125	$msg = $npc->name . " says: $msg" if $npc;	2324	$msg = $npc->name . " says: $msg" if $npc;
2126	$self->message ($msg, $flags);	2325	$self->message ($msg, $flags);
2127	}	2326	}
2128	}	2327	}
		2328	}
		2329
		2330	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2331
		2332	=cut
		2333
		2334	sub cf::object::send_msg {
		2335	my $pl = shift->contr
		2336	or return;
		2337	$pl->send_msg (@_);
2129	}	2338	}
2130		2339
2131	=item $player_object->may ("access")	2340	=item $player_object->may ("access")
2132		2341
2133	Returns wether the given player is authorized to access resource "access"	2342	Returns wether the given player is authorized to access resource "access"
…		…
2212	# use -1 or undef as default coordinates, not 0, 0	2421	# use -1 or undef as default coordinates, not 0, 0
2213	($x, $y) = ($map->enter_x, $map->enter_y)	2422	($x, $y) = ($map->enter_x, $map->enter_y)
2214	if $x <=0 && $y <= 0;	2423	if $x <=0 && $y <= 0;
2215		2424
2216	$map->load;	2425	$map->load;
2217	$map->load_diag;	2426	$map->load_neighbours;
2218		2427
2219	return unless $self->contr->active;	2428	return unless $self->contr->active;
2220	$self->activate_recursive;	2429	$self->activate_recursive;
2221		2430
2222	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2431	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223	$self->enter_map ($map, $x, $y);	2432	$self->enter_map ($map, $x, $y);
2224	}	2433	}
2225		2434
2226	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2435	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2227		2436
2228	Moves the player to the given map-path and coordinates by first freezing	2437	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	2438	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	2439	that has to return the map if sucecssful, and then unfreezes the player on
2231	the new (success) or old (failed) map position.	2440	the new (success) or old (failed) map position. In either case, $done will
		2441	be called at the end of this process.
2232		2442
2233	=cut	2443	=cut
2234		2444
2235	our $GOTOGEN;	2445	our $GOTOGEN;
2236		2446
2237	sub cf::object::player::goto {	2447	sub cf::object::player::goto {
2238	my ($self, $path, $x, $y, $check) = @_;	2448	my ($self, $path, $x, $y, $check, $done) = @_;
2239		2449
2240	# do generation counting so two concurrent goto's will be executed in-order	2450	# do generation counting so two concurrent goto's will be executed in-order
2241	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2451	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242		2452
2243	$self->enter_link;	2453	$self->enter_link;
2244		2454
2245	(async {	2455	(async {
		2456	# *tag paths override both path and x|y
		2457	if ($path =~ /^\*(.*)$/) {
		2458	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2459	my $ob = $obs[rand @obs];
		2460
		2461	# see if we actually can go there
		2462	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2463	$ob = $obs[rand @obs];
		2464	} else {
		2465	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2466	}
		2467	# else put us there anyways for now #d#
		2468
		2469	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2470	} else {
		2471	($path, $x, $y) = (undef, undef, undef);
		2472	}
		2473	}
		2474
2246	my $map = eval {	2475	my $map = eval {
2247	my $map = cf::map::find $path;	2476	my $map = defined $path ? cf::map::find $path : undef;
2248		2477
2249	if ($map) {	2478	if ($map) {
2250	$map = $map->customise_for ($self);	2479	$map = $map->customise_for ($self);
2251	$map = $check->($map) if $check && $map;	2480	$map = $check->($map) if $check && $map;
2252	} else {	2481	} else {
2253	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2482	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2254	}	2483	}
2255		2484
2256	$map	2485	$map
2257	};	2486	};
2258		2487
…		…
2263		2492
2264	if ($gen == $self->{_goto_generation}) {	2493	if ($gen == $self->{_goto_generation}) {
2265	delete $self->{_goto_generation};	2494	delete $self->{_goto_generation};
2266	$self->leave_link ($map, $x, $y);	2495	$self->leave_link ($map, $x, $y);
2267	}	2496	}
		2497
		2498	$done->() if $done;
2268	})->prio (1);	2499	})->prio (1);
2269	}	2500	}
2270		2501
2271	=item $player_object->enter_exit ($exit_object)	2502	=item $player_object->enter_exit ($exit_object)
2272		2503
…		…
2341	my $hp = $exit->stats->hp;	2572	my $hp = $exit->stats->hp;
2342	my $sp = $exit->stats->sp;	2573	my $sp = $exit->stats->sp;
2343		2574
2344	$self->enter_link;	2575	$self->enter_link;
2345		2576
		2577	# if exit is damned, update players death & WoR home-position
		2578	$self->contr->savebed ($slaying, $hp, $sp)
		2579	if $exit->flag (FLAG_DAMNED);
		2580
2346	(async {	2581	(async {
2347	$self->deactivate_recursive; # just to be sure	2582	$self->deactivate_recursive; # just to be sure
2348	unless (eval {	2583	unless (eval {
2349	$self->goto ($slaying, $hp, $sp);	2584	$self->goto ($slaying, $hp, $sp);
2350		2585
…		…
2377		2612
2378	utf8::encode $text;	2613	utf8::encode $text;
2379	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2614	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2380	}	2615	}
2381		2616
2382	=item $client->send_msg ($color, $type, $msg, [extra...])	2617	=item $client->send_msg ($channel, $msg, $color, [extra...])
2383		2618
2384	Send a drawinfo or msg packet to the client, formatting the msg for the	2619	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	2620	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	2621	the message, with C<log> being the default. If C<$color> is negative, suppress
2387	the message unless the client supports the msg packet.	2622	the message unless the client supports the msg packet.
2388		2623
2389	=cut	2624	=cut
2390		2625
		2626	our %CHANNEL = (
		2627	"c/identify" => {
		2628	id => "identify",
		2629	title => "Identify",
		2630	reply => undef,
		2631	tooltip => "Items recently identified",
		2632	},
		2633	"c/examine" => {
		2634	id => "examine",
		2635	title => "Examine",
		2636	reply => undef,
		2637	tooltip => "Signs and other items you examined",
		2638	},
		2639	);
		2640
2391	sub cf::client::send_msg {	2641	sub cf::client::send_msg {
2392	my ($self, $color, $type, $msg, @extra) = @_;	2642	my ($self, $channel, $msg, $color, @extra) = @_;
2393		2643
2394	$msg = $self->pl->expand_cfpod ($msg);	2644	$msg = $self->pl->expand_cfpod ($msg);
2395		2645
		2646	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2647
		2648	# check predefined channels, for the benefit of C
		2649	$channel = $CHANNEL{$channel} if $CHANNEL{$channel};
		2650
		2651	if (ref $channel) {
		2652	# send meta info to client, if not yet sent
		2653	unless (exists $self->{channel}{$channel->{id}}) {
		2654	$self->{channel}{$channel->{id}} = $channel;
		2655	$self->ext_msg (channel_info => $channel)
		2656	if $self->can_msg;
		2657	}
		2658
		2659	$channel = $channel->{id};
		2660	}
		2661
		2662	return unless @extra || length $msg;
		2663
2396	if ($self->can_msg) {	2664	if ($self->can_msg) {
2397	$self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);	2665	# default colour, mask it out
		2666	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2667	if $color & cf::NDI_DEF;
		2668
		2669	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2670	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2398	} else {	2671	} 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) {	2672	if ($color >= 0) {
		2673	# replace some tags by gcfclient-compatible ones
		2674	for ($msg) {
		2675	1 while
		2676	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2677	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2678	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2679	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2680	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2681	}
		2682
		2683	$color &= cf::NDI_COLOR_MASK;
		2684
		2685	utf8::encode $msg;
		2686
2410	if (0 && $msg =~ /\[/) {	2687	if (0 && $msg =~ /\[/) {
		2688	# COMMAND/INFO
2411	$self->send_packet ("drawextinfo $color 4 0 $msg")	2689	$self->send_packet ("drawextinfo $color 10 8 $msg")
2412	} else {	2690	} else {
2413	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	2691	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2414	$self->send_packet ("drawinfo $color $msg")	2692	$self->send_packet ("drawinfo $color $msg")
2415	}	2693	}
2416	}	2694	}
2417	}	2695	}
2418	}	2696	}
2419		2697
2420	=item $client->ext_event ($type, %msg)	2698	=item $client->ext_msg ($type, @msg)
2421		2699
2422	Sends an ext event to the client.	2700	Sends an ext event to the client.
2423		2701
2424	=cut	2702	=cut
2425		2703
2426	sub cf::client::ext_event($$%) {	2704	sub cf::client::ext_msg($$@) {
2427	my ($self, $type, %msg) = @_;	2705	my ($self, $type, @msg) = @_;
2428		2706
		2707	if ($self->extcmd == 2) {
		2708	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2709	} elsif ($self->extcmd == 1) { # TODO: remove
2429	$msg{msgtype} = "event_$type";	2710	push @msg, msgtype => "event_$type";
2430	$self->send_packet ("ext " . cf::to_json \%msg);	2711	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2712	}
		2713	}
		2714
		2715	=item $client->ext_reply ($msgid, @msg)
		2716
		2717	Sends an ext reply to the client.
		2718
		2719	=cut
		2720
		2721	sub cf::client::ext_reply($$@) {
		2722	my ($self, $id, @msg) = @_;
		2723
		2724	if ($self->extcmd == 2) {
		2725	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2726	} elsif ($self->extcmd == 1) {
		2727	#TODO: version 1, remove
		2728	unshift @msg, msgtype => "reply", msgid => $id;
		2729	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2730	}
2431	}	2731	}
2432		2732
2433	=item $success = $client->query ($flags, "text", \&cb)	2733	=item $success = $client->query ($flags, "text", \&cb)
2434		2734
2435	Queues a query to the client, calling the given callback with	2735	Queues a query to the client, calling the given callback with
…		…
2458		2758
2459	1	2759	1
2460	}	2760	}
2461		2761
2462	cf::client->attach (	2762	cf::client->attach (
		2763	on_connect => sub {
		2764	my ($ns) = @_;
		2765
		2766	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2767	},
2463	on_reply => sub {	2768	on_reply => sub {
2464	my ($ns, $msg) = @_;	2769	my ($ns, $msg) = @_;
2465		2770
2466	# this weird shuffling is so that direct followup queries	2771	# this weird shuffling is so that direct followup queries
2467	# get handled first	2772	# get handled first
…		…
2482	}	2787	}
2483	},	2788	},
2484	on_exticmd => sub {	2789	on_exticmd => sub {
2485	my ($ns, $buf) = @_;	2790	my ($ns, $buf) = @_;
2486		2791
2487	my $msg = eval { from_json $buf };	2792	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488		2793
2489	if (ref $msg) {	2794	if (ref $msg) {
		2795	my ($type, $reply, @payload) =
		2796	"ARRAY" eq ref $msg
		2797	? @$msg
		2798	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2799
		2800	my @reply;
		2801
2490	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2802	if (my $cb = $EXTICMD{$type}) {
2491	if (my %reply = $cb->($ns, $msg)) {	2803	@reply = $cb->($ns, @payload);
2492	$reply{msgid} = $msg->{msgid};
2493	$ns->send ("ext " . cf::to_json \%reply);
2494	}
2495	}	2804	}
		2805
		2806	$ns->ext_reply ($reply, @reply)
		2807	if $reply;
		2808
2496	} else {	2809	} else {
2497	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2810	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2498	}	2811	}
2499		2812
2500	cf::override;	2813	cf::override;
…		…
2547	our $safe = new Safe "safe";	2860	our $safe = new Safe "safe";
2548	our $safe_hole = new Safe::Hole;	2861	our $safe_hole = new Safe::Hole;
2549		2862
2550	$SIG{FPE} = 'IGNORE';	2863	$SIG{FPE} = 'IGNORE';
2551		2864
2552	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2865	$safe->permit_only (Opcode::opset qw(
		2866	:base_core :base_mem :base_orig :base_math
		2867	grepstart grepwhile mapstart mapwhile
		2868	sort time
		2869	));
2553		2870
2554	# here we export the classes and methods available to script code	2871	# here we export the classes and methods available to script code
2555		2872
2556	=pod	2873	=pod
2557		2874
2558	The following functions and methods are available within a safe environment:	2875	The following functions and methods are available within a safe environment:
2559		2876
2560	cf::object contr pay_amount pay_player map	2877	cf::object
		2878	contr pay_amount pay_player map x y force_find force_add
		2879	insert remove name archname title slaying race decrease_ob_nr
		2880
2561	cf::object::player player	2881	cf::object::player
2562	cf::player peaceful	2882	player
2563	cf::map trigger	2883
		2884	cf::player
		2885	peaceful
		2886
		2887	cf::map
		2888	trigger
2564		2889
2565	=cut	2890	=cut
2566		2891
2567	for (	2892	for (
2568	["cf::object" => qw(contr pay_amount pay_player map)],	2893	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2894	insert remove inv name archname title slaying race
		2895	decrease_ob_nr)],
2569	["cf::object::player" => qw(player)],	2896	["cf::object::player" => qw(player)],
2570	["cf::player" => qw(peaceful)],	2897	["cf::player" => qw(peaceful)],
2571	["cf::map" => qw(trigger)],	2898	["cf::map" => qw(trigger)],
2572	) {	2899	) {
2573	no strict 'refs';	2900	no strict 'refs';
…		…
2649	# the server's init and main functions	2976	# the server's init and main functions
2650		2977
2651	sub load_facedata($) {	2978	sub load_facedata($) {
2652	my ($path) = @_;	2979	my ($path) = @_;
2653		2980
		2981	# HACK to clear player env face cache, we need some signal framework
		2982	# for this (global event?)
		2983	%ext::player_env::MUSIC_FACE_CACHE = ();
		2984
		2985	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		2986
2654	warn "loading facedata from $path\n";	2987	warn "loading facedata from $path\n";
2655		2988
2656	my $facedata;	2989	my $facedata;
2657	0 < aio_load $path, $facedata	2990	0 < aio_load $path, $facedata
2658	or die "$path: $!";	2991	or die "$path: $!";
…		…
2660	$facedata = Coro::Storable::thaw $facedata;	2993	$facedata = Coro::Storable::thaw $facedata;
2661		2994
2662	$facedata->{version} == 2	2995	$facedata->{version} == 2
2663	or cf::cleanup "$path: version mismatch, cannot proceed.";	2996	or cf::cleanup "$path: version mismatch, cannot proceed.";
2664		2997
		2998	# patch in the exptable
		2999	$facedata->{resource}{"res/exp_table"} = {
		3000	type => FT_RSRC,
		3001	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3002	};
		3003	cf::cede_to_tick;
		3004
2665	{	3005	{
2666	my $faces = $facedata->{faceinfo};	3006	my $faces = $facedata->{faceinfo};
2667		3007
2668	while (my ($face, $info) = each %$faces) {	3008	while (my ($face, $info) = each %$faces) {
2669	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3009	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2670	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3010	cf::face::set_visibility $idx, $info->{visibility};
		3011	cf::face::set_magicmap $idx, $info->{magicmap};
2671	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3012	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2672	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3013	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2673	Coro::cede;	3014
		3015	cf::cede_to_tick;
2674	}	3016	}
2675		3017
2676	while (my ($face, $info) = each %$faces) {	3018	while (my ($face, $info) = each %$faces) {
2677	next unless $info->{smooth};	3019	next unless $info->{smooth};
2678	my $idx = cf::face::find $face	3020	my $idx = cf::face::find $face
2679	or next;	3021	or next;
2680	if (my $smooth = cf::face::find $info->{smooth}) {	3022	if (my $smooth = cf::face::find $info->{smooth}) {
		3023	cf::face::set_smooth $idx, $smooth;
2681	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3024	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682	} else {	3025	} else {
2683	warn "smooth face '$info->{smooth}' not found for face '$face'";	3026	warn "smooth face '$info->{smooth}' not found for face '$face'";
2684	}	3027	}
2685	Coro::cede;	3028
		3029	cf::cede_to_tick;
2686	}	3030	}
2687	}	3031	}
2688		3032
2689	{	3033	{
2690	my $anims = $facedata->{animinfo};	3034	my $anims = $facedata->{animinfo};
2691		3035
2692	while (my ($anim, $info) = each %$anims) {	3036	while (my ($anim, $info) = each %$anims) {
2693	cf::anim::set $anim, $info->{frames}, $info->{facings};	3037	cf::anim::set $anim, $info->{frames}, $info->{facings};
2694	Coro::cede;	3038	cf::cede_to_tick;
2695	}	3039	}
2696		3040
2697	cf::anim::invalidate_all; # d'oh	3041	cf::anim::invalidate_all; # d'oh
2698	}	3042	}
2699		3043
		3044	{
		3045	# TODO: for gcfclient pleasure, we should give resources
		3046	# that gcfclient doesn't grok a >10000 face index.
		3047	my $res = $facedata->{resource};
		3048
		3049	my $soundconf = delete $res->{"res/sound.conf"};
		3050
		3051	while (my ($name, $info) = each %$res) {
		3052	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3053	my $data;
		3054
		3055	if ($info->{type} & 1) {
		3056	# prepend meta info
		3057
		3058	my $meta = $enc->encode ({
		3059	name => $name,
		3060	%{ $info->{meta} || {} },
		3061	});
		3062
		3063	$data = pack "(w/a*)*", $meta, $info->{data};
		3064	} else {
		3065	$data = $info->{data};
		3066	}
		3067
		3068	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3069	cf::face::set_type $idx, $info->{type};
		3070
		3071	cf::cede_to_tick;
		3072	}
		3073
		3074	if ($soundconf) {
		3075	$soundconf = $enc->decode (delete $soundconf->{data});
		3076
		3077	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3078	my $sound = $soundconf->{compat}[$_]
		3079	or next;
		3080
		3081	my $face = cf::face::find "sound/$sound->[1]";
		3082	cf::sound::set $sound->[0] => $face;
		3083	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3084	}
		3085
		3086	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3087	my $face = cf::face::find "sound/$v";
		3088	cf::sound::set $k => $face;
		3089	}
		3090	}
		3091	}
		3092
2700	1	3093	1
2701	}	3094	}
2702		3095
		3096	register_exticmd fx_want => sub {
		3097	my ($ns, $want) = @_;
		3098
		3099	while (my ($k, $v) = each %$want) {
		3100	$ns->fx_want ($k, $v);
		3101	}
		3102	};
		3103
2703	sub reload_regions {	3104	sub reload_regions {
		3105	# HACK to clear player env face cache, we need some signal framework
		3106	# for this (global event?)
		3107	%ext::player_env::MUSIC_FACE_CACHE = ();
		3108
2704	load_resource_file "$MAPDIR/regions"	3109	load_resource_file "$MAPDIR/regions"
2705	or die "unable to load regions file\n";	3110	or die "unable to load regions file\n";
		3111
		3112	for (cf::region::list) {
		3113	$_->{match} = qr/$_->{match}/
		3114	if exists $_->{match};
		3115	}
2706	}	3116	}
2707		3117
2708	sub reload_facedata {	3118	sub reload_facedata {
2709	load_facedata "$DATADIR/facedata"	3119	load_facedata "$DATADIR/facedata"
2710	or die "unable to load facedata\n";	3120	or die "unable to load facedata\n";
2711	}	3121	}
2712		3122
2713	sub reload_archetypes {	3123	sub reload_archetypes {
		3124	load_resource_file "$DATADIR/archetypes"
		3125	or die "unable to load archetypes\n";
		3126	#d# NEED to laod twice to resolve forward references
		3127	# this really needs to be done in an extra post-pass
		3128	# (which needs to be synchronous, so solve it differently)
2714	load_resource_file "$DATADIR/archetypes"	3129	load_resource_file "$DATADIR/archetypes"
2715	or die "unable to load archetypes\n";	3130	or die "unable to load archetypes\n";
2716	}	3131	}
2717		3132
2718	sub reload_treasures {	3133	sub reload_treasures {
…		…
2734		3149
2735	sub init {	3150	sub init {
2736	reload_resources;	3151	reload_resources;
2737	}	3152	}
2738		3153
2739	sub cfg_load {	3154	sub reload_config {
2740	open my $fh, "<:utf8", "$CONFDIR/config"	3155	open my $fh, "<:utf8", "$CONFDIR/config"
2741	or return;	3156	or return;
2742		3157
2743	local $/;	3158	local $/;
2744	*CFG = YAML::Syck::Load <$fh>;	3159	*CFG = YAML::Syck::Load <$fh>;
…		…
2764	(async {	3179	(async {
2765	Event::one_event;	3180	Event::one_event;
2766	})->prio (Coro::PRIO_MAX);	3181	})->prio (Coro::PRIO_MAX);
2767	};	3182	};
2768		3183
2769	cfg_load;	3184	reload_config;
2770	db_init;	3185	db_init;
2771	load_extensions;	3186	load_extensions;
2772		3187
2773	$TICK_WATCHER->start;	3188	$TICK_WATCHER->start;
2774	Event::loop;	3189	Event::loop;
…		…
2967	warn "reloading cf.pm";	3382	warn "reloading cf.pm";
2968	require cf;	3383	require cf;
2969	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3384	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2970		3385
2971	warn "loading config and database again";	3386	warn "loading config and database again";
2972	cf::cfg_load;	3387	cf::reload_config;
2973		3388
2974	warn "loading extensions";	3389	warn "loading extensions";
2975	cf::load_extensions;	3390	cf::load_extensions;
2976		3391
2977	warn "reattaching attachments to objects/players";	3392	warn "reattaching attachments to objects/players";
…		…
3042	my $signal = new Coro::Signal;	3457	my $signal = new Coro::Signal;
3043	push @WAIT_FOR_TICK_BEGIN, $signal;	3458	push @WAIT_FOR_TICK_BEGIN, $signal;
3044	$signal->wait;	3459	$signal->wait;
3045	}	3460	}
3046		3461
3047	my $min = 1e6;#d#
3048	my $avg = 10;
3049	$TICK_WATCHER = Event->timer (	3462	$TICK_WATCHER = Event->timer (
3050	reentrant => 0,	3463	reentrant => 0,
3051	parked => 1,	3464	parked => 1,
3052	prio => 0,	3465	prio => 0,
3053	at => $NEXT_TICK || $TICK,	3466	at => $NEXT_TICK || $TICK,
…		…
3061		3474
3062	$NOW = $tick_start = Event::time;	3475	$NOW = $tick_start = Event::time;
3063		3476
3064	cf::server_tick; # one server iteration	3477	cf::server_tick; # one server iteration
3065		3478
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;	3479	$RUNTIME += $TICK;
3090	$NEXT_TICK += $TICK;	3480	$NEXT_TICK += $TICK;
3091		3481
3092	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3482	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3093	$NEXT_RUNTIME_WRITE = $NOW + 10;	3483	$NEXT_RUNTIME_WRITE = $NOW + 10;
…		…
3095	write_runtime	3485	write_runtime
3096	or warn "ERROR: unable to write runtime file: $!";	3486	or warn "ERROR: unable to write runtime file: $!";
3097	};	3487	};
3098	}	3488	}
3099		3489
3100	# my $AFTER = Event::time;
3101	# warn $AFTER - $NOW;#d#
3102
3103	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3490	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3104	$sig->send;	3491	$sig->send;
3105	}	3492	}
3106	while (my $sig = shift @WAIT_FOR_TICK) {	3493	while (my $sig = shift @WAIT_FOR_TICK) {
3107	$sig->send;	3494	$sig->send;
…		…
3117		3504
3118	$LOAD = ($NOW - $tick_start) / $TICK;	3505	$LOAD = ($NOW - $tick_start) / $TICK;
3119	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3506	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3120		3507
3121	_post_tick;	3508	_post_tick;
3122
3123
3124	},	3509	},
3125	);	3510	);
3126		3511
3127	{	3512	{
		3513	BDB::min_parallel 8;
3128	BDB::max_poll_time $TICK * 0.1;	3514	BDB::max_poll_time $TICK * 0.1;
3129	$BDB_POLL_WATCHER = Event->io (	3515	$BDB_POLL_WATCHER = Event->io (
3130	reentrant => 0,	3516	reentrant => 0,
3131	fd => BDB::poll_fileno,	3517	fd => BDB::poll_fileno,
3132	poll => 'r',	3518	poll => 'r',
3133	prio => 0,	3519	prio => 0,
3134	data => WF_AUTOCANCEL,	3520	data => WF_AUTOCANCEL,
3135	cb => \&BDB::poll_cb,	3521	cb => \&BDB::poll_cb,
3136	);	3522	);
3137	BDB::min_parallel 8;
3138		3523
3139	BDB::set_sync_prepare {	3524	BDB::set_sync_prepare {
3140	my $status;	3525	my $status;
3141	my $current = $Coro::current;	3526	my $current = $Coro::current;
3142	(	3527	(
…		…
3151	)	3536	)
3152	};	3537	};
3153		3538
3154	unless ($DB_ENV) {	3539	unless ($DB_ENV) {
3155	$DB_ENV = BDB::db_env_create;	3540	$DB_ENV = BDB::db_env_create;
		3541	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3542	| BDB::LOG_AUTOREMOVE, 1);
		3543	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3544	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3156		3545
3157	cf::sync_job {	3546	cf::sync_job {
3158	eval {	3547	eval {
3159	BDB::db_env_open	3548	BDB::db_env_open
3160	$DB_ENV,	3549	$DB_ENV,
…		…
3162	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3551	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3163	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3552	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3164	0666;	3553	0666;
3165		3554
3166	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3555	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	};	3556	};
3171		3557
3172	cf::cleanup "db_env_open(db): $@" if $@;	3558	cf::cleanup "db_env_open(db): $@" if $@;
3173	};	3559	};
3174	}	3560	}
		3561
		3562	$BDB_DEADLOCK_WATCHER = Event->timer (
		3563	after => 3,
		3564	interval => 1,
		3565	hard => 1,
		3566	prio => 0,
		3567	data => WF_AUTOCANCEL,
		3568	cb => sub {
		3569	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3570	},
		3571	);
		3572	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3573	after => 11,
		3574	interval => 60,
		3575	hard => 1,
		3576	prio => 0,
		3577	data => WF_AUTOCANCEL,
		3578	cb => sub {
		3579	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3580	},
		3581	);
		3582	$BDB_TRICKLE_WATCHER = Event->timer (
		3583	after => 5,
		3584	interval => 10,
		3585	hard => 1,
		3586	prio => 0,
		3587	data => WF_AUTOCANCEL,
		3588	cb => sub {
		3589	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3590	},
		3591	);
3175	}	3592	}
3176		3593
3177	{	3594	{
3178	IO::AIO::min_parallel 8;	3595	IO::AIO::min_parallel 8;
3179		3596

Diff Legend

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