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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.291 by root, Tue Jul 3 00:54:44 2007 UTC vs.
Revision 1.379 by root, Thu Oct 4 23:59:07 2007 UTC

…		…
10	use Event;	10	use Event;
11	use Opcode;	11	use Opcode;
12	use Safe;	12	use Safe;
13	use Safe::Hole;	13	use Safe::Hole;
14		14
15	use Coro 3.61 ();	15	use Coro 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
25	use JSON::XS 1.4 ();	26	use JSON::XS ();
26	use BDB ();	27	use BDB ();
27	use Data::Dumper;	28	use Data::Dumper;
28	use Digest::MD5;	29	use Digest::MD5;
29	use Fcntl;	30	use Fcntl;
30	use YAML::Syck ();	31	use YAML::Syck ();
31	use IO::AIO 2.32 ();	32	use IO::AIO 2.32 ();
32	use Time::HiRes;	33	use Time::HiRes;
33	use Compress::LZF;	34	use Compress::LZF;
		35	use Digest::MD5 ();
34		36
35	# configure various modules to our taste	37	# configure various modules to our taste
36	#	38	#
37	$Storable::canonical = 1; # reduce rsync transfers	39	$Storable::canonical = 1; # reduce rsync transfers
38	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	40	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
…		…
78	our $NEXT_TICK;	80	our $NEXT_TICK;
79	our $NOW;	81	our $NOW;
80	our $USE_FSYNC = 1; # use fsync to write maps - default off	82	our $USE_FSYNC = 1; # use fsync to write maps - default off
81		83
82	our $BDB_POLL_WATCHER;	84	our $BDB_POLL_WATCHER;
		85	our $BDB_DEADLOCK_WATCHER;
		86	our $BDB_CHECKPOINT_WATCHER;
		87	our $BDB_TRICKLE_WATCHER;
83	our $DB_ENV;	88	our $DB_ENV;
84		89
85	our %CFG;	90	our %CFG;
86		91
87	our $UPTIME; $UPTIME \|\|= time;	92	our $UPTIME; $UPTIME \|\|= time;
88	our $RUNTIME;	93	our $RUNTIME;
89		94
90	our %PLAYER; # all users	95	our (%PLAYER, %PLAYER_LOADING); # all users
91	our %MAP; # all maps	96	our (%MAP, %MAP_LOADING ); # all maps
92	our $LINK_MAP; # the special {link} map, which is always available	97	our $LINK_MAP; # the special {link} map, which is always available
93		98
94	# used to convert map paths into valid unix filenames by replacing / by ∕	99	# used to convert map paths into valid unix filenames by replacing / by ∕
95	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	100	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96		101
…		…
166		171
167	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	172	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168	returns directly I<after> the tick processing (and consequently, can only wake one process	173	returns directly I<after> the tick processing (and consequently, can only wake one process
169	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	174	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170		175
		176	=item @cf::INVOKE_RESULTS
		177
		178	This array contains the results of the last C<invoke ()> call. When
		179	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		180	that call.
		181
171	=back	182	=back
172		183
173	=cut	184	=cut
174		185
175	BEGIN {	186	BEGIN {
…		…
179	$msg .= "\n"	190	$msg .= "\n"
180	unless $msg =~ /\n$/;	191	unless $msg =~ /\n$/;
181		192
182	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	193	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183		194
184	utf8::encode $msg;
185	LOG llevError, $msg;	195	LOG llevError, $msg;
186	};	196	};
187	}	197	}
188		198
189	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	199	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
264	Wait until the given lock is available and then acquires it and returns	274	Wait until the given lock is available and then acquires it and returns
265	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	275	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
266	for example when the coroutine gets canceled), the lock is automatically	276	for example when the coroutine gets canceled), the lock is automatically
267	returned.	277	returned.
268		278
		279	Locks are not recursive, locking from the same coro twice results in a
		280	deadlocked coro.
		281
269	Lock names should begin with a unique identifier (for example, cf::map::find	282	Lock names should begin with a unique identifier (for example, cf::map::find
270	uses map_find and cf::map::load uses map_load).	283	uses map_find and cf::map::load uses map_load).
271		284
272	=item $locked = cf::lock_active $string	285	=item $locked = cf::lock_active $string
273		286
274	Return true if the lock is currently active, i.e. somebody has locked it.	287	Return true if the lock is currently active, i.e. somebody has locked it.
275		288
276	=cut	289	=cut
277		290
278	our %LOCK;	291	our %LOCK;
		292	our %LOCKER;#d#
279		293
280	sub lock_wait($) {	294	sub lock_wait($) {
281	my ($key) = @_;	295	my ($key) = @_;
		296
		297	if ($LOCKER{$key} == $Coro::current) {#d#
		298	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		299	return;#d#
		300	}#d#
282		301
283	# wait for lock, if any	302	# wait for lock, if any
284	while ($LOCK{$key}) {	303	while ($LOCK{$key}) {
285	push @{ $LOCK{$key} }, $Coro::current;	304	push @{ $LOCK{$key} }, $Coro::current;
286	Coro::schedule;	305	Coro::schedule;
…		…
292		311
293	# wait, to be sure we are not locked	312	# wait, to be sure we are not locked
294	lock_wait $key;	313	lock_wait $key;
295		314
296	$LOCK{$key} = [];	315	$LOCK{$key} = [];
		316	$LOCKER{$key} = $Coro::current;#d#
297		317
298	Coro::guard {	318	Coro::guard {
		319	delete $LOCKER{$key};#d#
299	# wake up all waiters, to be on the safe side	320	# wake up all waiters, to be on the safe side
300	$_->ready for @{ delete $LOCK{$key} };	321	$_->ready for @{ delete $LOCK{$key} };
301	}	322	}
302	}	323	}
303		324
…		…
315	};	336	};
316	$TICK_WATCHER->stop;	337	$TICK_WATCHER->stop;
317	$guard	338	$guard
318	}	339	}
319		340
		341	=item cf::get_slot $time[, $priority[, $name]]
		342
		343	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		344	This call blocks and returns only when you have at least C<$time> seconds
		345	of cpu time till the next tick. The slot is only valid till the next cede.
		346
		347	The optional C<$name> can be used to identify the job to run. It might be
		348	used for statistical purposes and should identify the same time-class.
		349
		350	Useful for short background jobs.
		351
		352	=cut
		353
		354	our @SLOT_QUEUE;
		355	our $SLOT_QUEUE;
		356
		357	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		358	$SLOT_QUEUE = Coro::async {
		359	$Coro::current->desc ("timeslot manager");
		360
		361	my $signal = new Coro::Signal;
		362
		363	while () {
		364	next_job:
		365	my $avail = cf::till_tick;
		366	if ($avail > 0.01) {
		367	for (0 .. $#SLOT_QUEUE) {
		368	if ($SLOT_QUEUE[$_][0] < $avail) {
		369	my $job = splice @SLOT_QUEUE, $_, 1, ();
		370	$job->[2]->send;
		371	Coro::cede;
		372	goto next_job;
		373	}
		374	}
		375	}
		376
		377	if (@SLOT_QUEUE) {
		378	# we do not use wait_For_tick() as it returns immediately when tick is inactive
		379	push @cf::WAIT_FOR_TICK, $signal;
		380	$signal->wait;
		381	} else {
		382	Coro::schedule;
		383	}
		384	}
		385	};
		386
		387	sub get_slot($;$$) {
		388	my ($time, $pri, $name) = @_;
		389
		390	$time = $TICK * .6 if $time > $TICK * .6;
		391	my $sig = new Coro::Signal;
		392
		393	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		394	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		395	$SLOT_QUEUE->ready;
		396	$sig->wait;
		397	}
		398
320	=item cf::async { BLOCK }	399	=item cf::async { BLOCK }
321		400
322	Currently the same as Coro::async_pool, meaning you cannot use	401	Currently the same as Coro::async_pool, meaning you cannot use
323	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only	402	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
324	thing you are allowed to do is call C<prio> on it.	403	thing you are allowed to do is call C<prio> on it.
…		…
348	my $time = Event::time;	427	my $time = Event::time;
349		428
350	# this is the main coro, too bad, we have to block	429	# this is the main coro, too bad, we have to block
351	# till the operation succeeds, freezing the server :/	430	# till the operation succeeds, freezing the server :/
352		431
		432	LOG llevError \| logBacktrace, Carp::longmess "sync job";#d#
		433
353	# TODO: use suspend/resume instead	434	# TODO: use suspend/resume instead
354	# (but this is cancel-safe)	435	# (but this is cancel-safe)
355	my $freeze_guard = freeze_mainloop;	436	my $freeze_guard = freeze_mainloop;
356		437
357	my $busy = 1;	438	my $busy = 1;
358	my @res;	439	my @res;
359		440
360	(async {	441	(async {
		442	$Coro::current->desc ("sync job coro");
361	@res = eval { $job->() };	443	@res = eval { $job->() };
362	warn $@ if $@;	444	warn $@ if $@;
363	undef $busy;	445	undef $busy;
364	})->prio (Coro::PRIO_MAX);	446	})->prio (Coro::PRIO_MAX);
365		447
…		…
412	=cut	494	=cut
413		495
414	sub fork_call(&@) {	496	sub fork_call(&@) {
415	my ($cb, @args) = @_;	497	my ($cb, @args) = @_;
416		498
417	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	499	# we seemingly have to make a local copy of the whole thing,
418	# or die "socketpair: $!";	500	# otherwise perl prematurely frees the stuff :/
419	pipe my $fh1, my $fh2	501	# TODO: investigate and fix (likely this will be rather laborious)
420	or die "pipe: $!";
421		502
422	if (my $pid = fork) {	503	my @res = Coro::Util::fork_eval {
423	close $fh2;
424
425	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426	$res = Coro::Storable::thaw $res;
427
428	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430	die $$res unless "ARRAY" eq ref $res;
431
432	return wantarray ? @$res : $res->[-1];
433	} else {
434	reset_signals;	504	reset_signals;
435	local $SIG{__WARN__};	505	&$cb
436	local $SIG{__DIE__};	506	}, @args;
437	eval {
438	close $fh1;
439		507
440	my @res = eval { $cb->(@args) };	508	wantarray ? @res : $res[-1]
441	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442	};
443
444	warn $@ if $@;
445	_exit 0;
446	}
447	}	509	}
448		510
449	=item $value = cf::db_get $family => $key	511	=item $value = cf::db_get $family => $key
450		512
451	Returns a single value from the environment database.	513	Returns a single value from the environment database.
…		…
453	=item cf::db_put $family => $key => $value	515	=item cf::db_put $family => $key => $value
454		516
455	Stores the given C<$value> in the family. It can currently store binary	517	Stores the given C<$value> in the family. It can currently store binary
456	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).	518	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
457		519
		520	=item $db = cf::db_table "name"
		521
		522	Create and/or open a new database table. The string must not be "db" and must be unique
		523	within each server.
		524
458	=cut	525	=cut
		526
		527	sub db_table($) {
		528	my ($name) = @_;
		529	my $db = BDB::db_create $DB_ENV;
		530
		531	eval {
		532	$db->set_flags (BDB::CHKSUM);
		533
		534	utf8::encode $name;
		535	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		536	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
		537	cf::cleanup "db_open(db): $!" if $!;
		538	};
		539	cf::cleanup "db_open(db): $@" if $@;
		540
		541	$db
		542	}
459		543
460	our $DB;	544	our $DB;
461		545
462	sub db_init {	546	sub db_init {
463	unless ($DB) {
464	$DB = BDB::db_create $DB_ENV;
465
466	cf::sync_job {	547	cf::sync_job {
467	eval {	548	$DB \|\|= db_table "db";
468	$DB->set_flags (BDB::CHKSUM);
469
470	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
472	cf::cleanup "db_open(db): $!" if $!;
473	};
474	cf::cleanup "db_open(db): $@" if $@;
475	};
476	}	549	};
477	}	550	}
478		551
479	sub db_get($$) {	552	sub db_get($$) {
480	my $key = "$_[0]/$_[1]";	553	my $key = "$_[0]/$_[1]";
481		554
…		…
531	if (1) {	604	if (1) {
532	$md5 =	605	$md5 =
533	join "\x00",	606	join "\x00",
534	$processversion,	607	$processversion,
535	map {	608	map {
536	Coro::cede;	609	cf::cede_to_tick;
537	($src->[$_], Digest::MD5::md5_hex $data[$_])	610	($src->[$_], Digest::MD5::md5_hex $data[$_])
538	} 0.. $#$src;	611	} 0.. $#$src;
539		612
540		613
541	my $dbmd5 = db_get cache => "$id/md5";	614	my $dbmd5 = db_get cache => "$id/md5";
…		…
847	";	920	";
848	die if $@;	921	die if $@;
849	}	922	}
850		923
851	our $override;	924	our $override;
852	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	925	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
853		926
854	sub override {	927	sub override {
855	$override = 1;	928	$override = 1;
856	@invoke_results = ();	929	@INVOKE_RESULTS = (@_);
857	}	930	}
858		931
859	sub do_invoke {	932	sub do_invoke {
860	my $event = shift;	933	my $event = shift;
861	my $callbacks = shift;	934	my $callbacks = shift;
862		935
863	@invoke_results = ();	936	@INVOKE_RESULTS = ();
864		937
865	local $override;	938	local $override;
866		939
867	for (@$callbacks) {	940	for (@$callbacks) {
868	eval { &{$_->[1]} };	941	eval { &{$_->[1]} };
…		…
885		958
886	Generate an object-specific event with the given arguments.	959	Generate an object-specific event with the given arguments.
887		960
888	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	961	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
889	removed in future versions), and there is no public API to access override	962	removed in future versions), and there is no public API to access override
890	results (if you must, access C<@cf::invoke_results> directly).	963	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891		964
892	=back	965	=back
893		966
894	=cut	967	=cut
895		968
896	#############################################################################	969	#############################################################################
897	# object support	970	# object support
		971	#
		972
		973	sub _can_merge {
		974	my ($ob1, $ob2) = @_;
		975
		976	local $Storable::canonical = 1;
		977	my $fob1 = Storable::freeze $ob1;
		978	my $fob2 = Storable::freeze $ob2;
		979
		980	$fob1 eq $fob2
		981	}
898		982
899	sub reattach {	983	sub reattach {
900	# basically do the same as instantiate, without calling instantiate	984	# basically do the same as instantiate, without calling instantiate
901	my ($obj) = @_;	985	my ($obj) = @_;
902		986
…		…
949	sub object_freezer_save {	1033	sub object_freezer_save {
950	my ($filename, $rdata, $objs) = @_;	1034	my ($filename, $rdata, $objs) = @_;
951		1035
952	sync_job {	1036	sync_job {
953	if (length $$rdata) {	1037	if (length $$rdata) {
		1038	utf8::decode (my $decname = $filename);
954	warn sprintf "saving %s (%d,%d)\n",	1039	warn sprintf "saving %s (%d,%d)\n",
955	$filename, length $$rdata, scalar @$objs;	1040	$decname, length $$rdata, scalar @$objs;
956		1041
957	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1042	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
958	chmod SAVE_MODE, $fh;	1043	chmod SAVE_MODE, $fh;
959	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1044	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960	aio_fsync $fh if $cf::USE_FSYNC;	1045	aio_fsync $fh if $cf::USE_FSYNC;
…		…
979	}	1064	}
980	} else {	1065	} else {
981	aio_unlink $filename;	1066	aio_unlink $filename;
982	aio_unlink "$filename.pst";	1067	aio_unlink "$filename.pst";
983	}	1068	}
984	}	1069	};
985	}	1070	}
986		1071
987	sub object_freezer_as_string {	1072	sub object_freezer_as_string {
988	my ($rdata, $objs) = @_;	1073	my ($rdata, $objs) = @_;
989		1074
…		…
1001	or return;	1086	or return;
1002		1087
1003	unless (aio_stat "$filename.pst") {	1088	unless (aio_stat "$filename.pst") {
1004	(aio_load "$filename.pst", $av) >= 0	1089	(aio_load "$filename.pst", $av) >= 0
1005	or return;	1090	or return;
		1091
1006	$av = eval { (Storable::thaw $av)->{objs} };	1092	$av = eval { (Storable::thaw $av)->{objs} };
1007	}	1093	}
1008		1094
		1095	utf8::decode (my $decname = $filename);
1009	warn sprintf "loading %s (%d)\n",	1096	warn sprintf "loading %s (%d,%d)\n",
1010	$filename, length $data, scalar @{$av \|\| []};	1097	$decname, length $data, scalar @{$av \|\| []};
		1098
1011	return ($data, $av);	1099	($data, $av)
1012	}	1100	}
1013		1101
1014	=head2 COMMAND CALLBACKS	1102	=head2 COMMAND CALLBACKS
1015		1103
1016	=over 4	1104	=over 4
…		…
1089	my ($pl, $buf) = @_;	1177	my ($pl, $buf) = @_;
1090		1178
1091	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1179	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092		1180
1093	if (ref $msg) {	1181	if (ref $msg) {
		1182	my ($type, $reply, @payload) =
		1183	"ARRAY" eq ref $msg
		1184	? @$msg
		1185	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1186
		1187	my @reply;
		1188
1094	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1189	if (my $cb = $EXTCMD{$type}) {
1095	if (my %reply = $cb->($pl, $msg)) {	1190	@reply = $cb->($pl, @payload);
1096	$pl->ext_reply ($msg->{msgid}, %reply);
1097	}
1098	}	1191	}
		1192
		1193	$pl->ext_reply ($reply, @reply)
		1194	if $reply;
		1195
1099	} else {	1196	} else {
1100	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1197	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101	}	1198	}
1102		1199
1103	cf::override;	1200	cf::override;
…		…
1193		1290
1194	=head3 cf::player	1291	=head3 cf::player
1195		1292
1196	=over 4	1293	=over 4
1197		1294
		1295	=item cf::player::num_playing
		1296
		1297	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1298
		1299	=cut
		1300
		1301	sub num_playing {
		1302	scalar grep
		1303	$_->ob->map
		1304	&& !$_->hidden
		1305	&& !$_->ob->flag (cf::FLAG_WIZ),
		1306	cf::player::list
		1307	}
		1308
1198	=item cf::player::find $login	1309	=item cf::player::find $login
1199		1310
1200	Returns the given player object, loading it if necessary (might block).	1311	Returns the given player object, loading it if necessary (might block).
1201		1312
1202	=cut	1313	=cut
…		…
1237	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1348	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1349	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1350	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240	aio_unlink +(playerdir $login) . "/$login.pl";	1351	aio_unlink +(playerdir $login) . "/$login.pl";
1241		1352
1242	my $pl = load_pl path $login	1353	my $f = new_from_file cf::object::thawer path $login
1243	or return;	1354	or return;
		1355
		1356	my $pl = cf::player::load_pl $f
		1357	or return;
		1358	local $cf::PLAYER_LOADING{$login} = $pl;
		1359	$f->resolve_delayed_derefs;
1244	$cf::PLAYER{$login} = $pl	1360	$cf::PLAYER{$login} = $pl
1245	}	1361	}
1246	}	1362	}
1247	}	1363	}
1248		1364
…		…
1258		1374
1259	aio_mkdir playerdir $pl, 0770;	1375	aio_mkdir playerdir $pl, 0770;
1260	$pl->{last_save} = $cf::RUNTIME;	1376	$pl->{last_save} = $cf::RUNTIME;
1261		1377
1262	$pl->save_pl ($path);	1378	$pl->save_pl ($path);
1263	Coro::cede;	1379	cf::cede_to_tick;
1264	}	1380	}
1265		1381
1266	sub new($) {	1382	sub new($) {
1267	my ($login) = @_;	1383	my ($login) = @_;
1268		1384
…		…
1272	$self->{deny_save} = 1;	1388	$self->{deny_save} = 1;
1273		1389
1274	$cf::PLAYER{$login} = $self;	1390	$cf::PLAYER{$login} = $self;
1275		1391
1276	$self	1392	$self
		1393	}
		1394
		1395	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1396
		1397	=cut
		1398
		1399	sub send_msg {
		1400	my $ns = shift->ns
		1401	or return;
		1402	$ns->send_msg (@_);
1277	}	1403	}
1278		1404
1279	=item $pl->quit_character	1405	=item $pl->quit_character
1280		1406
1281	Nukes the player without looking back. If logged in, the connection will	1407	Nukes the player without looking back. If logged in, the connection will
…		…
1336	or return [];	1462	or return [];
1337		1463
1338	my @logins;	1464	my @logins;
1339		1465
1340	for my $login (@$dirs) {	1466	for my $login (@$dirs) {
		1467	my $path = path $login;
		1468
		1469	# a .pst is a dead give-away for a valid player
		1470	unless (-e "$path.pst") {
1341	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1471	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342	aio_read $fh, 0, 512, my $buf, 0 or next;	1472	aio_read $fh, 0, 512, my $buf, 0 or next;
1343	$buf !~ /^password -------------$/m or next; # official not-valid tag	1473	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1474	}
1344		1475
1345	utf8::decode $login;	1476	utf8::decode $login;
1346	push @logins, $login;	1477	push @logins, $login;
1347	}	1478	}
1348		1479
…		…
1386	sub expand_cfpod {	1517	sub expand_cfpod {
1387	((my $self), (local $_)) = @_;	1518	((my $self), (local $_)) = @_;
1388		1519
1389	# escape & and <	1520	# escape & and <
1390	s/&/&/g;	1521	s/&/&/g;
1391	s/(?<![BIUGH])</</g;	1522	s/(?<![BIUGHT])</</g;
1392		1523
1393	# this is buggy, it needs to properly take care of nested <'s	1524	# this is buggy, it needs to properly take care of nested <'s
1394		1525
1395	1 while	1526	1 while
1396	# replace B<>, I<>, U<> etc.	1527	# replace B<>, I<>, U<> etc.
1397	s/B<([^\>]*)>/<b>$1<\/b>/	1528	s/B<([^\>]*)>/<b>$1<\/b>/
1398	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1529	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1399	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1530	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1531	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1400	# replace G<male\|female> tags	1532	# replace G<male\|female> tags
1401	\|\| s{G<([^>\|])\\|([^>])>}{	1533	\|\| s{G<([^>\|])\\|([^>])>}{
1402	$self->gender ? $2 : $1	1534	$self->gender ? $2 : $1
1403	}ge	1535	}ge
1404	# replace H<hint text>	1536	# replace H<hint text>
…		…
1412		1544
1413	# create single paragraphs (very hackish)	1545	# create single paragraphs (very hackish)
1414	s/(?<=\S)\n(?=\w)/ /g;	1546	s/(?<=\S)\n(?=\w)/ /g;
1415		1547
1416	# compress some whitespace	1548	# compress some whitespace
1417	1 while s/\s\n\s\n\s*/\n/;	1549	s/\s+\n/\n/g; # ws line-ends
		1550	s/\n\n+/\n/g; # double lines
		1551	s/^\n+//; # beginning lines
		1552	s/\n+$//; # ending lines
1418		1553
1419	$_	1554	$_
1420	}	1555	}
1421		1556
1422	sub hintmode {	1557	sub hintmode {
1423	warn "hm<$_[0] $_[1]>\n";#d#
1424	$_[0]{hintmode} = $_[1] if @_ > 1;	1558	$_[0]{hintmode} = $_[1] if @_ > 1;
1425	$_[0]{hintmode}	1559	$_[0]{hintmode}
1426	}	1560	}
1427		1561
1428	=item $player->ext_reply ($msgid, %msg)	1562	=item $player->ext_reply ($msgid, @msg)
1429		1563
1430	Sends an ext reply to the player.	1564	Sends an ext reply to the player.
1431		1565
1432	=cut	1566	=cut
1433		1567
1434	sub ext_reply($$%) {	1568	sub ext_reply($$@) {
1435	my ($self, $id, %msg) = @_;	1569	my ($self, $id, @msg) = @_;
1436		1570
1437	$msg{msgid} = $id;	1571	$self->ns->ext_reply ($id, @msg)
1438	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1439	}	1572	}
1440		1573
1441	=item $player->ext_event ($type, %msg)	1574	=item $player->ext_msg ($type, @msg)
1442		1575
1443	Sends an ext event to the client.	1576	Sends an ext event to the client.
1444		1577
1445	=cut	1578	=cut
1446		1579
1447	sub ext_event($$%) {	1580	sub ext_msg($$@) {
1448	my ($self, $type, %msg) = @_;	1581	my ($self, $type, @msg) = @_;
1449		1582
1450	$self->ns->ext_event ($type, %msg);	1583	$self->ns->ext_msg ($type, @msg);
1451	}	1584	}
1452		1585
1453	=head3 cf::region	1586	=head3 cf::region
1454		1587
1455	=over 4	1588	=over 4
…		…
1468	my ($path) = @_;	1601	my ($path) = @_;
1469		1602
1470	my ($match, $specificity);	1603	my ($match, $specificity);
1471		1604
1472	for my $region (list) {	1605	for my $region (list) {
1473	if ($region->match && $path =~ $region->match) {	1606	if ($region->{match} && $path =~ $region->{match}) {
1474	($match, $specificity) = ($region, $region->specificity)	1607	($match, $specificity) = ($region, $region->specificity)
1475	if $region->specificity > $specificity;	1608	if $region->specificity > $specificity;
1476	}	1609	}
1477	}	1610	}
1478		1611
…		…
1598	$self->init; # pass $1 etc.	1731	$self->init; # pass $1 etc.
1599	return $self;	1732	return $self;
1600	}	1733	}
1601	}	1734	}
1602		1735
1603	Carp::carp "unable to resolve path '$path' (base '$base').";	1736	Carp::cluck "unable to resolve path '$path' (base '$base').";
1604	()	1737	()
1605	}	1738	}
1606		1739
1607	sub init {	1740	sub init {
1608	my ($self) = @_;	1741	my ($self) = @_;
…		…
1671		1804
1672	sub load_header_from($) {	1805	sub load_header_from($) {
1673	my ($self, $path) = @_;	1806	my ($self, $path) = @_;
1674		1807
1675	utf8::encode $path;	1808	utf8::encode $path;
1676	#aio_open $path, O_RDONLY, 0	1809	my $f = new_from_file cf::object::thawer $path
1677	# or return;
1678
1679	$self->_load_header ($path)
1680	or return;	1810	or return;
		1811
		1812	$self->_load_header ($f)
		1813	or return;
		1814
		1815	local $MAP_LOADING{$self->{path}} = $self;
		1816	$f->resolve_delayed_derefs;
1681		1817
1682	$self->{load_path} = $path;	1818	$self->{load_path} = $path;
1683		1819
1684	1	1820	1
1685	}	1821	}
…		…
1739	sub find {	1875	sub find {
1740	my ($path, $origin) = @_;	1876	my ($path, $origin) = @_;
1741		1877
1742	$path = normalise $path, $origin && $origin->path;	1878	$path = normalise $path, $origin && $origin->path;
1743		1879
		1880	cf::lock_wait "map_data:$path";#d#remove
1744	cf::lock_wait "map_find:$path";	1881	cf::lock_wait "map_find:$path";
1745		1882
1746	$cf::MAP{$path} \|\| do {	1883	$cf::MAP{$path} \|\| do {
1747	my $guard = cf::lock_acquire "map_find:$path";	1884	my $guard1 = cf::lock_acquire "map_find:$path";
		1885	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1886
1748	my $map = new_from_path cf::map $path	1887	my $map = new_from_path cf::map $path
1749	or return;	1888	or return;
1750		1889
1751	$map->{last_save} = $cf::RUNTIME;	1890	$map->{last_save} = $cf::RUNTIME;
1752		1891
…		…
1754	or return;	1893	or return;
1755		1894
1756	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1895	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1757	# doing this can freeze the server in a sync job, obviously	1896	# doing this can freeze the server in a sync job, obviously
1758	#$cf::WAIT_FOR_TICK->wait;	1897	#$cf::WAIT_FOR_TICK->wait;
		1898	undef $guard1;
		1899	undef $guard2;
1759	$map->reset;	1900	$map->reset;
1760	undef $guard;
1761	return find $path;	1901	return find $path;
1762	}	1902	}
1763		1903
1764	$cf::MAP{$path} = $map	1904	$cf::MAP{$path} = $map
1765	}	1905	}
…		…
1774	local $self->{deny_reset} = 1; # loading can take a long time	1914	local $self->{deny_reset} = 1; # loading can take a long time
1775		1915
1776	my $path = $self->{path};	1916	my $path = $self->{path};
1777		1917
1778	{	1918	{
1779	my $guard = cf::lock_acquire "map_load:$path";	1919	my $guard = cf::lock_acquire "map_data:$path";
1780		1920
		1921	return unless $self->valid;
1781	return if $self->in_memory != cf::MAP_SWAPPED;	1922	return unless $self->in_memory == cf::MAP_SWAPPED;
1782		1923
1783	$self->in_memory (cf::MAP_LOADING);	1924	$self->in_memory (cf::MAP_LOADING);
1784		1925
1785	$self->alloc;	1926	$self->alloc;
1786		1927
1787	$self->pre_load;	1928	$self->pre_load;
1788	Coro::cede;	1929	cf::cede_to_tick;
1789		1930
		1931	my $f = new_from_file cf::object::thawer $self->{load_path};
		1932	$f->skip_block;
1790	$self->_load_objects ($self->{load_path}, 1)	1933	$self->_load_objects ($f)
1791	or return;	1934	or return;
1792		1935
1793	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1936	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1794	if delete $self->{load_original};	1937	if delete $self->{load_original};
1795		1938
1796	if (my $uniq = $self->uniq_path) {	1939	if (my $uniq = $self->uniq_path) {
1797	utf8::encode $uniq;	1940	utf8::encode $uniq;
1798	if (aio_open $uniq, O_RDONLY, 0) {	1941	unless (aio_stat $uniq) {
		1942	if (my $f = new_from_file cf::object::thawer $uniq) {
1799	$self->clear_unique_items;	1943	$self->clear_unique_items;
1800	$self->_load_objects ($uniq, 0);	1944	$self->_load_objects ($f);
		1945	$f->resolve_delayed_derefs;
		1946	}
1801	}	1947	}
1802	}	1948	}
1803		1949
1804	Coro::cede;	1950	$f->resolve_delayed_derefs;
		1951
		1952	cf::cede_to_tick;
1805	# now do the right thing for maps	1953	# now do the right thing for maps
1806	$self->link_multipart_objects;	1954	$self->link_multipart_objects;
1807	$self->difficulty ($self->estimate_difficulty)	1955	$self->difficulty ($self->estimate_difficulty)
1808	unless $self->difficulty;	1956	unless $self->difficulty;
1809	Coro::cede;	1957	cf::cede_to_tick;
1810		1958
1811	unless ($self->{deny_activate}) {	1959	unless ($self->{deny_activate}) {
1812	$self->decay_objects;	1960	$self->decay_objects;
1813	$self->fix_auto_apply;	1961	$self->fix_auto_apply;
1814	$self->update_buttons;	1962	$self->update_buttons;
1815	Coro::cede;	1963	cf::cede_to_tick;
1816	$self->set_darkness_map;	1964	$self->set_darkness_map;
1817	Coro::cede;	1965	cf::cede_to_tick;
1818	$self->activate;	1966	$self->activate;
1819	}	1967	}
		1968
		1969	$self->{last_save} = $cf::RUNTIME;
		1970	$self->last_access ($cf::RUNTIME);
1820		1971
1821	$self->in_memory (cf::MAP_IN_MEMORY);	1972	$self->in_memory (cf::MAP_IN_MEMORY);
1822	}	1973	}
1823		1974
1824	$self->post_load;	1975	$self->post_load;
…		…
1835		1986
1836	$self	1987	$self
1837	}	1988	}
1838		1989
1839	# find and load all maps in the 3x3 area around a map	1990	# find and load all maps in the 3x3 area around a map
1840	sub load_diag {	1991	sub load_neighbours {
1841	my ($map) = @_;	1992	my ($map) = @_;
1842		1993
1843	my @diag; # diagonal neighbours	1994	my @neigh; # diagonal neighbours
1844		1995
1845	for (0 .. 3) {	1996	for (0 .. 3) {
1846	my $neigh = $map->tile_path ($_)	1997	my $neigh = $map->tile_path ($_)
1847	or next;	1998	or next;
1848	$neigh = find $neigh, $map	1999	$neigh = find $neigh, $map
1849	or next;	2000	or next;
1850	$neigh->load;	2001	$neigh->load;
1851		2002
		2003	push @neigh,
1852	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2004	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1853	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2005	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1854	}	2006	}
1855		2007
1856	for (@diag) {	2008	for (grep defined $_->[0], @neigh) {
		2009	my ($path, $origin) = @$_;
1857	my $neigh = find @$_	2010	my $neigh = find $path, $origin
1858	or next;	2011	or next;
1859	$neigh->load;	2012	$neigh->load;
1860	}	2013	}
1861	}	2014	}
1862		2015
…		…
1867	}	2020	}
1868		2021
1869	sub do_load_sync {	2022	sub do_load_sync {
1870	my ($map) = @_;	2023	my ($map) = @_;
1871		2024
		2025	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2026	if $Coro::current == $Coro::main;
		2027
1872	cf::sync_job { $map->load };	2028	cf::sync_job { $map->load };
1873	}	2029	}
1874		2030
1875	our %MAP_PREFETCH;	2031	our %MAP_PREFETCH;
1876	our $MAP_PREFETCHER = undef;	2032	our $MAP_PREFETCHER = undef;
1877		2033
1878	sub find_async {	2034	sub find_async {
1879	my ($path, $origin) = @_;	2035	my ($path, $origin, $load) = @_;
1880		2036
1881	$path = normalise $path, $origin && $origin->{path};	2037	$path = normalise $path, $origin && $origin->{path};
1882		2038
1883	if (my $map = $cf::MAP{$path}) {	2039	if (my $map = $cf::MAP{$path}) {
1884	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2040	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1885	}	2041	}
1886		2042
1887	undef $MAP_PREFETCH{$path};	2043	$MAP_PREFETCH{$path} \|= $load;
		2044
1888	$MAP_PREFETCHER \|\|= cf::async {	2045	$MAP_PREFETCHER \|\|= cf::async {
		2046	$Coro::current->{desc} = "map prefetcher";
		2047
1889	while (%MAP_PREFETCH) {	2048	while (%MAP_PREFETCH) {
1890	for my $path (keys %MAP_PREFETCH) {	2049	while (my ($k, $v) = each %MAP_PREFETCH) {
1891	my $map = find $path	2050	if (my $map = find $k) {
1892	or next;
1893	$map->load;	2051	$map->load if $v;
		2052	}
1894		2053
1895	delete $MAP_PREFETCH{$path};	2054	delete $MAP_PREFETCH{$k};
1896	}	2055	}
1897	}	2056	}
1898	undef $MAP_PREFETCHER;	2057	undef $MAP_PREFETCHER;
1899	};	2058	};
1900	$MAP_PREFETCHER->prio (6);	2059	$MAP_PREFETCHER->prio (6);
…		…
1903	}	2062	}
1904		2063
1905	sub save {	2064	sub save {
1906	my ($self) = @_;	2065	my ($self) = @_;
1907		2066
1908	my $lock = cf::lock_acquire "map_data:" . $self->path;	2067	my $lock = cf::lock_acquire "map_data:$self->{path}";
1909		2068
1910	$self->{last_save} = $cf::RUNTIME;	2069	$self->{last_save} = $cf::RUNTIME;
1911		2070
1912	return unless $self->dirty;	2071	return unless $self->dirty;
1913		2072
…		…
1919	return if $self->{deny_save};	2078	return if $self->{deny_save};
1920		2079
1921	local $self->{last_access} = $self->last_access;#d#	2080	local $self->{last_access} = $self->last_access;#d#
1922		2081
1923	cf::async {	2082	cf::async {
		2083	$Coro::current->{desc} = "map player save";
1924	$_->contr->save for $self->players;	2084	$_->contr->save for $self->players;
1925	};	2085	};
1926		2086
1927	if ($uniq) {	2087	if ($uniq) {
1928	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	2088	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
…		…
1936	my ($self) = @_;	2096	my ($self) = @_;
1937		2097
1938	# save first because save cedes	2098	# save first because save cedes
1939	$self->save;	2099	$self->save;
1940		2100
1941	my $lock = cf::lock_acquire "map_data:" . $self->path;	2101	my $lock = cf::lock_acquire "map_data:$self->{path}";
1942		2102
1943	return if $self->players;	2103	return if $self->players;
1944	return if $self->in_memory != cf::MAP_IN_MEMORY;	2104	return if $self->in_memory != cf::MAP_IN_MEMORY;
1945	return if $self->{deny_save};	2105	return if $self->{deny_save};
1946		2106
		2107	$self->in_memory (cf::MAP_SWAPPED);
		2108
		2109	$self->deactivate;
		2110	$_->clear_links_to ($self) for values %cf::MAP;
1947	$self->clear;	2111	$self->clear;
1948	$self->in_memory (cf::MAP_SWAPPED);
1949	}	2112	}
1950		2113
1951	sub reset_at {	2114	sub reset_at {
1952	my ($self) = @_;	2115	my ($self) = @_;
1953		2116
…		…
1985	if $uniq;	2148	if $uniq;
1986	}	2149	}
1987		2150
1988	delete $cf::MAP{$self->path};	2151	delete $cf::MAP{$self->path};
1989		2152
		2153	$self->deactivate;
		2154	$_->clear_links_to ($self) for values %cf::MAP;
1990	$self->clear;	2155	$self->clear;
1991
1992	$_->clear_links_to ($self) for values %cf::MAP;
1993		2156
1994	$self->unlink_save;	2157	$self->unlink_save;
1995	$self->destroy;	2158	$self->destroy;
1996	}	2159	}
1997		2160
1998	my $nuke_counter = "aaaa";	2161	my $nuke_counter = "aaaa";
1999		2162
2000	sub nuke {	2163	sub nuke {
2001	my ($self) = @_;	2164	my ($self) = @_;
2002		2165
		2166	{
		2167	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2168
2003	delete $cf::MAP{$self->path};	2169	delete $cf::MAP{$self->path};
2004		2170
2005	$self->unlink_save;	2171	$self->unlink_save;
2006		2172
2007	bless $self, "cf::map";	2173	bless $self, "cf::map";
2008	delete $self->{deny_reset};	2174	delete $self->{deny_reset};
2009	$self->{deny_save} = 1;	2175	$self->{deny_save} = 1;
2010	$self->reset_timeout (1);	2176	$self->reset_timeout (1);
2011	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2177	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2012		2178
2013	$cf::MAP{$self->path} = $self;	2179	$cf::MAP{$self->path} = $self;
		2180	}
2014		2181
2015	$self->reset; # polite request, might not happen	2182	$self->reset; # polite request, might not happen
2016	}	2183	}
2017		2184
2018	=item $maps = cf::map::tmp_maps	2185	=item $maps = cf::map::tmp_maps
…		…
2094		2261
2095	sub inv_recursive {	2262	sub inv_recursive {
2096	inv_recursive_ inv $_[0]	2263	inv_recursive_ inv $_[0]
2097	}	2264	}
2098		2265
		2266	=item $ref = $ob->ref
		2267
		2268	creates and returns a persistent reference to an objetc that can be stored as a string.
		2269
		2270	=item $ob = cf::object::deref ($refstring)
		2271
		2272	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2273	even if the object actually exists. May block.
		2274
		2275	=cut
		2276
		2277	sub deref {
		2278	my ($ref) = @_;
		2279
		2280	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2281	my ($uuid, $name) = ($1, $2);
		2282	my $pl = $cf::PLAYER_LOADING{$name} \|\| cf::player::find $name
		2283	or return;
		2284	$pl->ob->uuid eq $uuid
		2285	or return;
		2286
		2287	$pl->ob
		2288	} else {
		2289	warn "$ref: cannot resolve object reference\n";
		2290	undef
		2291	}
		2292	}
		2293
2099	package cf;	2294	package cf;
2100		2295
2101	=back	2296	=back
2102		2297
2103	=head3 cf::object::player	2298	=head3 cf::object::player
…		…
2125		2320
2126	} else {	2321	} else {
2127	my $pl = $self->contr;	2322	my $pl = $self->contr;
2128		2323
2129	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2324	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2130	my $diag = $pl->{npc_dialog};	2325	my $dialog = $pl->{npc_dialog};
2131	$diag->{pl}->ext_reply (	2326	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2132	$diag->{id},
2133	msgtype => "reply",
2134	msg => $diag->{pl}->expand_cfpod ($msg),
2135	add_topics => []
2136	);
2137		2327
2138	} else {	2328	} else {
2139	$msg = $npc->name . " says: $msg" if $npc;	2329	$msg = $npc->name . " says: $msg" if $npc;
2140	$self->message ($msg, $flags);	2330	$self->message ($msg, $flags);
2141	}	2331	}
2142	}	2332	}
		2333	}
		2334
		2335	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2336
		2337	=cut
		2338
		2339	sub cf::object::send_msg {
		2340	my $pl = shift->contr
		2341	or return;
		2342	$pl->send_msg (@_);
2143	}	2343	}
2144		2344
2145	=item $player_object->may ("access")	2345	=item $player_object->may ("access")
2146		2346
2147	Returns wether the given player is authorized to access resource "access"	2347	Returns wether the given player is authorized to access resource "access"
…		…
2226	# use -1 or undef as default coordinates, not 0, 0	2426	# use -1 or undef as default coordinates, not 0, 0
2227	($x, $y) = ($map->enter_x, $map->enter_y)	2427	($x, $y) = ($map->enter_x, $map->enter_y)
2228	if $x <=0 && $y <= 0;	2428	if $x <=0 && $y <= 0;
2229		2429
2230	$map->load;	2430	$map->load;
2231	$map->load_diag;	2431	$map->load_neighbours;
2232		2432
2233	return unless $self->contr->active;	2433	return unless $self->contr->active;
2234	$self->activate_recursive;	2434	$self->activate_recursive;
2235		2435
2236	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2436	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2237	$self->enter_map ($map, $x, $y);	2437	$self->enter_map ($map, $x, $y);
2238	}	2438	}
2239		2439
2240	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2440	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2241		2441
2242	Moves the player to the given map-path and coordinates by first freezing	2442	Moves the player to the given map-path and coordinates by first freezing
2243	her, loading and preparing them map, calling the provided $check callback	2443	her, loading and preparing them map, calling the provided $check callback
2244	that has to return the map if sucecssful, and then unfreezes the player on	2444	that has to return the map if sucecssful, and then unfreezes the player on
2245	the new (success) or old (failed) map position.	2445	the new (success) or old (failed) map position. In either case, $done will
		2446	be called at the end of this process.
2246		2447
2247	=cut	2448	=cut
2248		2449
2249	our $GOTOGEN;	2450	our $GOTOGEN;
2250		2451
2251	sub cf::object::player::goto {	2452	sub cf::object::player::goto {
2252	my ($self, $path, $x, $y, $check) = @_;	2453	my ($self, $path, $x, $y, $check, $done) = @_;
2253		2454
2254	# do generation counting so two concurrent goto's will be executed in-order	2455	# do generation counting so two concurrent goto's will be executed in-order
2255	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2456	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2256		2457
2257	$self->enter_link;	2458	$self->enter_link;
2258		2459
2259	(async {	2460	(async {
		2461	$Coro::current->{desc} = "player::goto $path $x $y";
		2462
		2463	# *tag paths override both path and x\|y
		2464	if ($path =~ /^\(.)$/) {
		2465	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2466	my $ob = $obs[rand @obs];
		2467
		2468	# see if we actually can go there
		2469	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2470	$ob = $obs[rand @obs];
		2471	} else {
		2472	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE \| cf::NDI_RED);
		2473	}
		2474	# else put us there anyways for now #d#
		2475
		2476	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2477	} else {
		2478	($path, $x, $y) = (undef, undef, undef);
		2479	}
		2480	}
		2481
2260	my $map = eval {	2482	my $map = eval {
2261	my $map = cf::map::find $path;	2483	my $map = defined $path ? cf::map::find $path : undef;
2262		2484
2263	if ($map) {	2485	if ($map) {
2264	$map = $map->customise_for ($self);	2486	$map = $map->customise_for ($self);
2265	$map = $check->($map) if $check && $map;	2487	$map = $check->($map) if $check && $map;
2266	} else {	2488	} else {
2267	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);	2489	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE \| cf::NDI_RED);
2268	}	2490	}
2269		2491
2270	$map	2492	$map
2271	};	2493	};
2272		2494
…		…
2277		2499
2278	if ($gen == $self->{_goto_generation}) {	2500	if ($gen == $self->{_goto_generation}) {
2279	delete $self->{_goto_generation};	2501	delete $self->{_goto_generation};
2280	$self->leave_link ($map, $x, $y);	2502	$self->leave_link ($map, $x, $y);
2281	}	2503	}
		2504
		2505	$done->() if $done;
2282	})->prio (1);	2506	})->prio (1);
2283	}	2507	}
2284		2508
2285	=item $player_object->enter_exit ($exit_object)	2509	=item $player_object->enter_exit ($exit_object)
2286		2510
…		…
2355	my $hp = $exit->stats->hp;	2579	my $hp = $exit->stats->hp;
2356	my $sp = $exit->stats->sp;	2580	my $sp = $exit->stats->sp;
2357		2581
2358	$self->enter_link;	2582	$self->enter_link;
2359		2583
		2584	# if exit is damned, update players death & WoR home-position
		2585	$self->contr->savebed ($slaying, $hp, $sp)
		2586	if $exit->flag (FLAG_DAMNED);
		2587
2360	(async {	2588	(async {
		2589	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2590
2361	$self->deactivate_recursive; # just to be sure	2591	$self->deactivate_recursive; # just to be sure
2362	unless (eval {	2592	unless (eval {
2363	$self->goto ($slaying, $hp, $sp);	2593	$self->goto ($slaying, $hp, $sp);
2364		2594
2365	1;	2595	1;
…		…
2391		2621
2392	utf8::encode $text;	2622	utf8::encode $text;
2393	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2623	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2394	}	2624	}
2395		2625
2396	=item $client->send_msg ($color, $type, $msg, [extra...])	2626	=item $client->send_msg ($channel, $msg, $color, [extra...])
2397		2627
2398	Send a drawinfo or msg packet to the client, formatting the msg for the	2628	Send a drawinfo or msg packet to the client, formatting the msg for the
2399	client if neccessary. C<$type> should be a string identifying the type of	2629	client if neccessary. C<$type> should be a string identifying the type of
2400	the message, with C<log> being the default. If C<$color> is negative, suppress	2630	the message, with C<log> being the default. If C<$color> is negative, suppress
2401	the message unless the client supports the msg packet.	2631	the message unless the client supports the msg packet.
2402		2632
2403	=cut	2633	=cut
2404		2634
		2635	our %CHANNEL = (
		2636	"c/identify" => {
		2637	id => "infobox",
		2638	title => "Identify",
		2639	reply => undef,
		2640	tooltip => "Items recently identified",
		2641	},
		2642	"c/examine" => {
		2643	id => "infobox",
		2644	title => "Examine",
		2645	reply => undef,
		2646	tooltip => "Signs and other items you examined",
		2647	},
		2648	"c/lookat" => {
		2649	id => "infobox",
		2650	title => "Look",
		2651	reply => undef,
		2652	tooltip => "What you saw there",
		2653	},
		2654	);
		2655
2405	sub cf::client::send_msg {	2656	sub cf::client::send_msg {
2406	my ($self, $color, $type, $msg, @extra) = @_;	2657	my ($self, $channel, $msg, $color, @extra) = @_;
2407		2658
2408	$msg = $self->pl->expand_cfpod ($msg);	2659	$msg = $self->pl->expand_cfpod ($msg);
2409		2660
		2661	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2662
		2663	# check predefined channels, for the benefit of C
		2664	if ($CHANNEL{$channel}) {
		2665	$channel = $CHANNEL{$channel};
		2666
		2667	$self->ext_msg (channel_info => $channel)
		2668	if $self->can_msg;
		2669
		2670	$channel = $channel->{id};
		2671
		2672	} elsif (ref $channel) {
		2673	# send meta info to client, if not yet sent
		2674	unless (exists $self->{channel}{$channel->{id}}) {
		2675	$self->{channel}{$channel->{id}} = $channel;
		2676	$self->ext_msg (channel_info => $channel)
		2677	if $self->can_msg;
		2678	}
		2679
		2680	$channel = $channel->{id};
		2681	}
		2682
		2683	return unless @extra \|\| length $msg;
		2684
2410	if ($self->can_msg) {	2685	if ($self->can_msg) {
		2686	# default colour, mask it out
		2687	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2688	if $color & cf::NDI_DEF;
		2689
2411	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));	2690	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2691	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2412	} else {	2692	} else {
2413	# replace some tags by gcfclient-compatible ones
2414	for ($msg) {
2415	1 while
2416	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2417	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2418	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2419	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2420	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2421	}
2422
2423	if ($color >= 0) {	2693	if ($color >= 0) {
		2694	# replace some tags by gcfclient-compatible ones
		2695	for ($msg) {
		2696	1 while
		2697	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2698	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2699	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2700	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2701	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2702	}
		2703
		2704	$color &= cf::NDI_COLOR_MASK;
		2705
		2706	utf8::encode $msg;
		2707
2424	if (0 && $msg =~ /\[/) {	2708	if (0 && $msg =~ /\[/) {
		2709	# COMMAND/INFO
2425	$self->send_packet ("drawextinfo $color 4 0 $msg")	2710	$self->send_packet ("drawextinfo $color 10 8 $msg")
2426	} else {	2711	} else {
2427	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2712	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2428	$self->send_packet ("drawinfo $color $msg")	2713	$self->send_packet ("drawinfo $color $msg")
2429	}	2714	}
2430	}	2715	}
2431	}	2716	}
2432	}	2717	}
2433		2718
2434	=item $client->ext_event ($type, %msg)	2719	=item $client->ext_msg ($type, @msg)
2435		2720
2436	Sends an ext event to the client.	2721	Sends an ext event to the client.
2437		2722
2438	=cut	2723	=cut
2439		2724
2440	sub cf::client::ext_event($$%) {	2725	sub cf::client::ext_msg($$@) {
2441	my ($self, $type, %msg) = @_;	2726	my ($self, $type, @msg) = @_;
2442		2727
		2728	if ($self->extcmd == 2) {
		2729	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2730	} elsif ($self->extcmd == 1) { # TODO: remove
2443	$msg{msgtype} = "event_$type";	2731	push @msg, msgtype => "event_$type";
2444	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2732	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2733	}
		2734	}
		2735
		2736	=item $client->ext_reply ($msgid, @msg)
		2737
		2738	Sends an ext reply to the client.
		2739
		2740	=cut
		2741
		2742	sub cf::client::ext_reply($$@) {
		2743	my ($self, $id, @msg) = @_;
		2744
		2745	if ($self->extcmd == 2) {
		2746	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2747	} elsif ($self->extcmd == 1) {
		2748	#TODO: version 1, remove
		2749	unshift @msg, msgtype => "reply", msgid => $id;
		2750	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2751	}
2445	}	2752	}
2446		2753
2447	=item $success = $client->query ($flags, "text", \&cb)	2754	=item $success = $client->query ($flags, "text", \&cb)
2448		2755
2449	Queues a query to the client, calling the given callback with	2756	Queues a query to the client, calling the given callback with
…		…
2504	my ($ns, $buf) = @_;	2811	my ($ns, $buf) = @_;
2505		2812
2506	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2813	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2507		2814
2508	if (ref $msg) {	2815	if (ref $msg) {
		2816	my ($type, $reply, @payload) =
		2817	"ARRAY" eq ref $msg
		2818	? @$msg
		2819	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2820
		2821	my @reply;
		2822
2509	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2823	if (my $cb = $EXTICMD{$type}) {
2510	if (my %reply = $cb->($ns, $msg)) {	2824	@reply = $cb->($ns, @payload);
2511	$reply{msgid} = $msg->{msgid};
2512	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2513	}
2514	}	2825	}
		2826
		2827	$ns->ext_reply ($reply, @reply)
		2828	if $reply;
		2829
2515	} else {	2830	} else {
2516	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2831	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2517	}	2832	}
2518		2833
2519	cf::override;	2834	cf::override;
…		…
2566	our $safe = new Safe "safe";	2881	our $safe = new Safe "safe";
2567	our $safe_hole = new Safe::Hole;	2882	our $safe_hole = new Safe::Hole;
2568		2883
2569	$SIG{FPE} = 'IGNORE';	2884	$SIG{FPE} = 'IGNORE';
2570		2885
2571	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2886	$safe->permit_only (Opcode::opset qw(
		2887	:base_core :base_mem :base_orig :base_math
		2888	grepstart grepwhile mapstart mapwhile
		2889	sort time
		2890	));
2572		2891
2573	# here we export the classes and methods available to script code	2892	# here we export the classes and methods available to script code
2574		2893
2575	=pod	2894	=pod
2576		2895
2577	The following functions and methods are available within a safe environment:	2896	The following functions and methods are available within a safe environment:
2578		2897
2579	cf::object contr pay_amount pay_player map	2898	cf::object
		2899	contr pay_amount pay_player map x y force_find force_add
		2900	insert remove name archname title slaying race decrease_ob_nr
		2901
2580	cf::object::player player	2902	cf::object::player
2581	cf::player peaceful	2903	player
2582	cf::map trigger	2904
		2905	cf::player
		2906	peaceful
		2907
		2908	cf::map
		2909	trigger
2583		2910
2584	=cut	2911	=cut
2585		2912
2586	for (	2913	for (
2587	["cf::object" => qw(contr pay_amount pay_player map)],	2914	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2915	insert remove inv name archname title slaying race
		2916	decrease_ob_nr)],
2588	["cf::object::player" => qw(player)],	2917	["cf::object::player" => qw(player)],
2589	["cf::player" => qw(peaceful)],	2918	["cf::player" => qw(peaceful)],
2590	["cf::map" => qw(trigger)],	2919	["cf::map" => qw(trigger)],
2591	) {	2920	) {
2592	no strict 'refs';	2921	no strict 'refs';
…		…
2668	# the server's init and main functions	2997	# the server's init and main functions
2669		2998
2670	sub load_facedata($) {	2999	sub load_facedata($) {
2671	my ($path) = @_;	3000	my ($path) = @_;
2672		3001
		3002	# HACK to clear player env face cache, we need some signal framework
		3003	# for this (global event?)
		3004	%ext::player_env::MUSIC_FACE_CACHE = ();
		3005
		3006	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3007
2673	warn "loading facedata from $path\n";	3008	warn "loading facedata from $path\n";
2674		3009
2675	my $facedata;	3010	my $facedata;
2676	0 < aio_load $path, $facedata	3011	0 < aio_load $path, $facedata
2677	or die "$path: $!";	3012	or die "$path: $!";
…		…
2679	$facedata = Coro::Storable::thaw $facedata;	3014	$facedata = Coro::Storable::thaw $facedata;
2680		3015
2681	$facedata->{version} == 2	3016	$facedata->{version} == 2
2682	or cf::cleanup "$path: version mismatch, cannot proceed.";	3017	or cf::cleanup "$path: version mismatch, cannot proceed.";
2683		3018
		3019	# patch in the exptable
		3020	$facedata->{resource}{"res/exp_table"} = {
		3021	type => FT_RSRC,
		3022	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3023	};
		3024	cf::cede_to_tick;
		3025
2684	{	3026	{
2685	my $faces = $facedata->{faceinfo};	3027	my $faces = $facedata->{faceinfo};
2686		3028
2687	while (my ($face, $info) = each %$faces) {	3029	while (my ($face, $info) = each %$faces) {
2688	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3030	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2689	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3031	cf::face::set_visibility $idx, $info->{visibility};
		3032	cf::face::set_magicmap $idx, $info->{magicmap};
2690	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3033	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2691	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3034	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2692	Coro::cede;	3035
		3036	cf::cede_to_tick;
2693	}	3037	}
2694		3038
2695	while (my ($face, $info) = each %$faces) {	3039	while (my ($face, $info) = each %$faces) {
2696	next unless $info->{smooth};	3040	next unless $info->{smooth};
2697	my $idx = cf::face::find $face	3041	my $idx = cf::face::find $face
2698	or next;	3042	or next;
2699	if (my $smooth = cf::face::find $info->{smooth}) {	3043	if (my $smooth = cf::face::find $info->{smooth}) {
		3044	cf::face::set_smooth $idx, $smooth;
2700	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3045	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2701	} else {	3046	} else {
2702	warn "smooth face '$info->{smooth}' not found for face '$face'";	3047	warn "smooth face '$info->{smooth}' not found for face '$face'";
2703	}	3048	}
2704	Coro::cede;	3049
		3050	cf::cede_to_tick;
2705	}	3051	}
2706	}	3052	}
2707		3053
2708	{	3054	{
2709	my $anims = $facedata->{animinfo};	3055	my $anims = $facedata->{animinfo};
2710		3056
2711	while (my ($anim, $info) = each %$anims) {	3057	while (my ($anim, $info) = each %$anims) {
2712	cf::anim::set $anim, $info->{frames}, $info->{facings};	3058	cf::anim::set $anim, $info->{frames}, $info->{facings};
2713	Coro::cede;	3059	cf::cede_to_tick;
2714	}	3060	}
2715		3061
2716	cf::anim::invalidate_all; # d'oh	3062	cf::anim::invalidate_all; # d'oh
2717	}	3063	}
2718		3064
		3065	{
		3066	# TODO: for gcfclient pleasure, we should give resources
		3067	# that gcfclient doesn't grok a >10000 face index.
		3068	my $res = $facedata->{resource};
		3069
		3070	my $soundconf = delete $res->{"res/sound.conf"};
		3071
		3072	while (my ($name, $info) = each %$res) {
		3073	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3074	my $data;
		3075
		3076	if ($info->{type} & 1) {
		3077	# prepend meta info
		3078
		3079	my $meta = $enc->encode ({
		3080	name => $name,
		3081	%{ $info->{meta} \|\| {} },
		3082	});
		3083
		3084	$data = pack "(w/a)", $meta, $info->{data};
		3085	} else {
		3086	$data = $info->{data};
		3087	}
		3088
		3089	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3090	cf::face::set_type $idx, $info->{type};
		3091
		3092	cf::cede_to_tick;
		3093	}
		3094
		3095	if ($soundconf) {
		3096	$soundconf = $enc->decode (delete $soundconf->{data});
		3097
		3098	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3099	my $sound = $soundconf->{compat}[$_]
		3100	or next;
		3101
		3102	my $face = cf::face::find "sound/$sound->[1]";
		3103	cf::sound::set $sound->[0] => $face;
		3104	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3105	}
		3106
		3107	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3108	my $face = cf::face::find "sound/$v";
		3109	cf::sound::set $k => $face;
		3110	}
		3111	}
		3112	}
		3113
2719	1	3114	1
2720	}	3115	}
2721		3116
		3117	register_exticmd fx_want => sub {
		3118	my ($ns, $want) = @_;
		3119
		3120	while (my ($k, $v) = each %$want) {
		3121	$ns->fx_want ($k, $v);
		3122	}
		3123	};
		3124
2722	sub reload_regions {	3125	sub reload_regions {
		3126	# HACK to clear player env face cache, we need some signal framework
		3127	# for this (global event?)
		3128	%ext::player_env::MUSIC_FACE_CACHE = ();
		3129
2723	load_resource_file "$MAPDIR/regions"	3130	load_resource_file "$MAPDIR/regions"
2724	or die "unable to load regions file\n";	3131	or die "unable to load regions file\n";
		3132
		3133	for (cf::region::list) {
		3134	$_->{match} = qr/$_->{match}/
		3135	if exists $_->{match};
		3136	}
2725	}	3137	}
2726		3138
2727	sub reload_facedata {	3139	sub reload_facedata {
2728	load_facedata "$DATADIR/facedata"	3140	load_facedata "$DATADIR/facedata"
2729	or die "unable to load facedata\n";	3141	or die "unable to load facedata\n";
…		…
2758		3170
2759	sub init {	3171	sub init {
2760	reload_resources;	3172	reload_resources;
2761	}	3173	}
2762		3174
2763	sub cfg_load {	3175	sub reload_config {
2764	open my $fh, "<:utf8", "$CONFDIR/config"	3176	open my $fh, "<:utf8", "$CONFDIR/config"
2765	or return;	3177	or return;
2766		3178
2767	local $/;	3179	local $/;
2768	*CFG = YAML::Syck::Load <$fh>;	3180	*CFG = YAML::Syck::Load <$fh>;
…		…
2784	sub main {	3196	sub main {
2785	# we must not ever block the main coroutine	3197	# we must not ever block the main coroutine
2786	local $Coro::idle = sub {	3198	local $Coro::idle = sub {
2787	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3199	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2788	(async {	3200	(async {
		3201	$Coro::current->{desc} = "IDLE BUG HANDLER";
2789	Event::one_event;	3202	Event::one_event;
2790	})->prio (Coro::PRIO_MAX);	3203	})->prio (Coro::PRIO_MAX);
2791	};	3204	};
2792		3205
2793	cfg_load;	3206	reload_config;
2794	db_init;	3207	db_init;
2795	load_extensions;	3208	load_extensions;
2796		3209
2797	$TICK_WATCHER->start;	3210	$TICK_WATCHER->start;
2798	Event::loop;	3211	Event::loop;
…		…
2991	warn "reloading cf.pm";	3404	warn "reloading cf.pm";
2992	require cf;	3405	require cf;
2993	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3406	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2994		3407
2995	warn "loading config and database again";	3408	warn "loading config and database again";
2996	cf::cfg_load;	3409	cf::reload_config;
2997		3410
2998	warn "loading extensions";	3411	warn "loading extensions";
2999	cf::load_extensions;	3412	cf::load_extensions;
3000		3413
3001	warn "reattaching attachments to objects/players";	3414	warn "reattaching attachments to objects/players";
…		…
3037	register_command "reload" => sub {	3450	register_command "reload" => sub {
3038	my ($who, $arg) = @_;	3451	my ($who, $arg) = @_;
3039		3452
3040	if ($who->flag (FLAG_WIZ)) {	3453	if ($who->flag (FLAG_WIZ)) {
3041	$who->message ("reloading server.");	3454	$who->message ("reloading server.");
		3455	async {
		3456	$Coro::current->{desc} = "perl_reload";
3042	async { reload_perl };	3457	reload_perl;
		3458	};
3043	}	3459	}
3044	};	3460	};
3045		3461
3046	unshift @INC, $LIBDIR;	3462	unshift @INC, $LIBDIR;
3047		3463
…		…
3066	my $signal = new Coro::Signal;	3482	my $signal = new Coro::Signal;
3067	push @WAIT_FOR_TICK_BEGIN, $signal;	3483	push @WAIT_FOR_TICK_BEGIN, $signal;
3068	$signal->wait;	3484	$signal->wait;
3069	}	3485	}
3070		3486
3071	my $min = 1e6;#d#
3072	my $avg = 10;
3073	$TICK_WATCHER = Event->timer (	3487	$TICK_WATCHER = Event->timer (
3074	reentrant => 0,	3488	reentrant => 0,
3075	parked => 1,	3489	parked => 1,
3076	prio => 0,	3490	prio => 0,
3077	at => $NEXT_TICK \|\| $TICK,	3491	at => $NEXT_TICK \|\| $TICK,
…		…
3085		3499
3086	$NOW = $tick_start = Event::time;	3500	$NOW = $tick_start = Event::time;
3087		3501
3088	cf::server_tick; # one server iteration	3502	cf::server_tick; # one server iteration
3089		3503
3090	0 && sync_job {#d#
3091	for(1..10) {
3092	my $t = Event::time;
3093	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3094	or die;
3095
3096	$map->width (50);
3097	$map->height (50);
3098	$map->alloc;
3099	$map->_load_objects ("/tmp/x.map", 1);
3100	my $t = Event::time - $t;
3101
3102	#next unless $t < 0.0013;#d#
3103	if ($t < $min) {
3104	$min = $t;
3105	}
3106	$avg = $avg * 0.99 + $t * 0.01;
3107	}
3108	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3109	exit 0;
3110	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3111	};
3112
3113	$RUNTIME += $TICK;	3504	$RUNTIME += $TICK;
3114	$NEXT_TICK += $TICK;	3505	$NEXT_TICK += $TICK;
3115		3506
3116	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3507	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3117	$NEXT_RUNTIME_WRITE = $NOW + 10;	3508	$NEXT_RUNTIME_WRITE = $NOW + 10;
3118	Coro::async_pool {	3509	Coro::async_pool {
		3510	$Coro::current->{desc} = "runtime saver";
3119	write_runtime	3511	write_runtime
3120	or warn "ERROR: unable to write runtime file: $!";	3512	or warn "ERROR: unable to write runtime file: $!";
3121	};	3513	};
3122	}	3514	}
3123		3515
3124	# my $AFTER = Event::time;
3125	# warn $AFTER - $NOW;#d#
3126
3127	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3516	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3128	$sig->send;	3517	$sig->send;
3129	}	3518	}
3130	while (my $sig = shift @WAIT_FOR_TICK) {	3519	while (my $sig = shift @WAIT_FOR_TICK) {
3131	$sig->send;	3520	$sig->send;
…		…
3141		3530
3142	$LOAD = ($NOW - $tick_start) / $TICK;	3531	$LOAD = ($NOW - $tick_start) / $TICK;
3143	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3532	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3144		3533
3145	_post_tick;	3534	_post_tick;
3146
3147
3148	},	3535	},
3149	);	3536	);
3150		3537
3151	{	3538	{
		3539	BDB::min_parallel 8;
3152	BDB::max_poll_time $TICK * 0.1;	3540	BDB::max_poll_time $TICK * 0.1;
3153	$BDB_POLL_WATCHER = Event->io (	3541	$BDB_POLL_WATCHER = Event->io (
3154	reentrant => 0,	3542	reentrant => 0,
3155	fd => BDB::poll_fileno,	3543	fd => BDB::poll_fileno,
3156	poll => 'r',	3544	poll => 'r',
3157	prio => 0,	3545	prio => 0,
3158	data => WF_AUTOCANCEL,	3546	data => WF_AUTOCANCEL,
3159	cb => \&BDB::poll_cb,	3547	cb => \&BDB::poll_cb,
3160	);	3548	);
3161	BDB::min_parallel 8;
3162		3549
3163	BDB::set_sync_prepare {	3550	BDB::set_sync_prepare {
3164	my $status;	3551	my $status;
3165	my $current = $Coro::current;	3552	my $current = $Coro::current;
3166	(	3553	(
…		…
3175	)	3562	)
3176	};	3563	};
3177		3564
3178	unless ($DB_ENV) {	3565	unless ($DB_ENV) {
3179	$DB_ENV = BDB::db_env_create;	3566	$DB_ENV = BDB::db_env_create;
		3567	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC
		3568	\| BDB::LOG_AUTOREMOVE, 1);
		3569	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3570	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3180		3571
3181	cf::sync_job {	3572	cf::sync_job {
3182	eval {	3573	eval {
3183	BDB::db_env_open	3574	BDB::db_env_open
3184	$DB_ENV,	3575	$DB_ENV,
…		…
3186	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN	3577	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN
3187	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3578	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3188	0666;	3579	0666;
3189		3580
3190	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3581	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3191
3192	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
3193	$DB_ENV->set_lk_detect;
3194	};	3582	};
3195		3583
3196	cf::cleanup "db_env_open(db): $@" if $@;	3584	cf::cleanup "db_env_open(db): $@" if $@;
3197	};	3585	};
3198	}	3586	}
		3587
		3588	$BDB_DEADLOCK_WATCHER = Event->timer (
		3589	after => 3,
		3590	interval => 1,
		3591	hard => 1,
		3592	prio => 0,
		3593	data => WF_AUTOCANCEL,
		3594	cb => sub {
		3595	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3596	},
		3597	);
		3598	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3599	after => 11,
		3600	interval => 60,
		3601	hard => 1,
		3602	prio => 0,
		3603	data => WF_AUTOCANCEL,
		3604	cb => sub {
		3605	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3606	},
		3607	);
		3608	$BDB_TRICKLE_WATCHER = Event->timer (
		3609	after => 5,
		3610	interval => 10,
		3611	hard => 1,
		3612	prio => 0,
		3613	data => WF_AUTOCANCEL,
		3614	cb => sub {
		3615	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3616	},
		3617	);
3199	}	3618	}
3200		3619
3201	{	3620	{
3202	IO::AIO::min_parallel 8;	3621	IO::AIO::min_parallel 8;
3203		3622
…		…
3206	$AIO_POLL_WATCHER = Event->io (	3625	$AIO_POLL_WATCHER = Event->io (
3207	reentrant => 0,	3626	reentrant => 0,
3208	data => WF_AUTOCANCEL,	3627	data => WF_AUTOCANCEL,
3209	fd => IO::AIO::poll_fileno,	3628	fd => IO::AIO::poll_fileno,
3210	poll => 'r',	3629	poll => 'r',
3211	prio => 6,	3630	prio => 0,
3212	cb => \&IO::AIO::poll_cb,	3631	cb => \&IO::AIO::poll_cb,
3213	);	3632	);
3214	}	3633	}
3215		3634
3216	my $_log_backtrace;	3635	my $_log_backtrace;
…		…
3222		3641
3223	# limit the # of concurrent backtraces	3642	# limit the # of concurrent backtraces
3224	if ($_log_backtrace < 2) {	3643	if ($_log_backtrace < 2) {
3225	++$_log_backtrace;	3644	++$_log_backtrace;
3226	async {	3645	async {
		3646	$Coro::current->{desc} = "abt $msg";
		3647
3227	my @bt = fork_call {	3648	my @bt = fork_call {
3228	@addr = map { sprintf "%x", $_ } @addr;	3649	@addr = map { sprintf "%x", $_ } @addr;
3229	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3650	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3230	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"	3651	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"
3231	or die "addr2line: $!";	3652	or die "addr2line: $!";

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.291 by root, Tue Jul 3 00:54:44 2007 UTC vs. Revision 1.379 by root, Thu Oct 4 23:59:07 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.291 by root, Tue Jul 3 00:54:44 2007 UTC vs.
Revision 1.379 by root, Thu Oct 4 23:59:07 2007 UTC