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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.298 by root, Sun Jul 8 14:50:07 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	warn "pst<$res>" unless $res =~ /^pst/;
427	$res = Coro::Storable::thaw $res;
428
429	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431	Carp::confess $$res unless "ARRAY" eq ref $res;
432
433	return wantarray ? @$res : $res->[-1];
434	} else {
435	reset_signals;	504	reset_signals;
436	local $SIG{__WARN__};	505	&$cb
437	local $SIG{__DIE__};	506	}, @args;
438	local $Coro::idle;
439	$Coro::current->prio (Coro::PRIO_MAX);
440	eval {
441	close $fh1;
442		507
443	my @res = eval { $cb->(@args) };	508	wantarray ? @res : $res[-1]
444
445	open my $fh, ">", \my $buf
446	or die "fork_call: cannot open fh-to-buf in child : $!";
447	Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448	close $fh;
449
450	warn "writing ", length $buf;
451	my $x;
452	(length $buf) == ($x = syswrite $fh2, $buf)
453	or warn "error writing ".(length $buf)." != $x\n";
454	close $fh2;
455	};
456
457	warn $@ if $@;
458	_exit 0;
459	}
460	}	509	}
461		510
462	=item $value = cf::db_get $family => $key	511	=item $value = cf::db_get $family => $key
463		512
464	Returns a single value from the environment database.	513	Returns a single value from the environment database.
…		…
466	=item cf::db_put $family => $key => $value	515	=item cf::db_put $family => $key => $value
467		516
468	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
469	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).
470		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
471	=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	}
472		543
473	our $DB;	544	our $DB;
474		545
475	sub db_init {	546	sub db_init {
476	unless ($DB) {
477	$DB = BDB::db_create $DB_ENV;
478
479	cf::sync_job {	547	cf::sync_job {
480	eval {	548	$DB \|\|= db_table "db";
481	$DB->set_flags (BDB::CHKSUM);
482
483	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
484	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
485	cf::cleanup "db_open(db): $!" if $!;
486	};
487	cf::cleanup "db_open(db): $@" if $@;
488	};
489	}	549	};
490	}	550	}
491		551
492	sub db_get($$) {	552	sub db_get($$) {
493	my $key = "$_[0]/$_[1]";	553	my $key = "$_[0]/$_[1]";
494		554
…		…
544	if (1) {	604	if (1) {
545	$md5 =	605	$md5 =
546	join "\x00",	606	join "\x00",
547	$processversion,	607	$processversion,
548	map {	608	map {
549	Coro::cede;	609	cf::cede_to_tick;
550	($src->[$_], Digest::MD5::md5_hex $data[$_])	610	($src->[$_], Digest::MD5::md5_hex $data[$_])
551	} 0.. $#$src;	611	} 0.. $#$src;
552		612
553		613
554	my $dbmd5 = db_get cache => "$id/md5";	614	my $dbmd5 = db_get cache => "$id/md5";
…		…
860	";	920	";
861	die if $@;	921	die if $@;
862	}	922	}
863		923
864	our $override;	924	our $override;
865	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?
866		926
867	sub override {	927	sub override {
868	$override = 1;	928	$override = 1;
869	@invoke_results = ();	929	@INVOKE_RESULTS = (@_);
870	}	930	}
871		931
872	sub do_invoke {	932	sub do_invoke {
873	my $event = shift;	933	my $event = shift;
874	my $callbacks = shift;	934	my $callbacks = shift;
875		935
876	@invoke_results = ();	936	@INVOKE_RESULTS = ();
877		937
878	local $override;	938	local $override;
879		939
880	for (@$callbacks) {	940	for (@$callbacks) {
881	eval { &{$_->[1]} };	941	eval { &{$_->[1]} };
…		…
898		958
899	Generate an object-specific event with the given arguments.	959	Generate an object-specific event with the given arguments.
900		960
901	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
902	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
903	results (if you must, access C<@cf::invoke_results> directly).	963	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904		964
905	=back	965	=back
906		966
907	=cut	967	=cut
908		968
909	#############################################################################	969	#############################################################################
910	# 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	}
911		982
912	sub reattach {	983	sub reattach {
913	# basically do the same as instantiate, without calling instantiate	984	# basically do the same as instantiate, without calling instantiate
914	my ($obj) = @_;	985	my ($obj) = @_;
915		986
…		…
962	sub object_freezer_save {	1033	sub object_freezer_save {
963	my ($filename, $rdata, $objs) = @_;	1034	my ($filename, $rdata, $objs) = @_;
964		1035
965	sync_job {	1036	sync_job {
966	if (length $$rdata) {	1037	if (length $$rdata) {
		1038	utf8::decode (my $decname = $filename);
967	warn sprintf "saving %s (%d,%d)\n",	1039	warn sprintf "saving %s (%d,%d)\n",
968	$filename, length $$rdata, scalar @$objs;	1040	$decname, length $$rdata, scalar @$objs;
969		1041
970	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1042	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
971	chmod SAVE_MODE, $fh;	1043	chmod SAVE_MODE, $fh;
972	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1044	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
973	aio_fsync $fh if $cf::USE_FSYNC;	1045	aio_fsync $fh if $cf::USE_FSYNC;
…		…
992	}	1064	}
993	} else {	1065	} else {
994	aio_unlink $filename;	1066	aio_unlink $filename;
995	aio_unlink "$filename.pst";	1067	aio_unlink "$filename.pst";
996	}	1068	}
997	}	1069	};
998	}	1070	}
999		1071
1000	sub object_freezer_as_string {	1072	sub object_freezer_as_string {
1001	my ($rdata, $objs) = @_;	1073	my ($rdata, $objs) = @_;
1002		1074
…		…
1014	or return;	1086	or return;
1015		1087
1016	unless (aio_stat "$filename.pst") {	1088	unless (aio_stat "$filename.pst") {
1017	(aio_load "$filename.pst", $av) >= 0	1089	(aio_load "$filename.pst", $av) >= 0
1018	or return;	1090	or return;
		1091
1019	$av = eval { (Storable::thaw $av)->{objs} };	1092	$av = eval { (Storable::thaw $av)->{objs} };
1020	}	1093	}
1021		1094
		1095	utf8::decode (my $decname = $filename);
1022	warn sprintf "loading %s (%d)\n",	1096	warn sprintf "loading %s (%d,%d)\n",
1023	$filename, length $data, scalar @{$av \|\| []};	1097	$decname, length $data, scalar @{$av \|\| []};
		1098
1024	return ($data, $av);	1099	($data, $av)
1025	}	1100	}
1026		1101
1027	=head2 COMMAND CALLBACKS	1102	=head2 COMMAND CALLBACKS
1028		1103
1029	=over 4	1104	=over 4
…		…
1102	my ($pl, $buf) = @_;	1177	my ($pl, $buf) = @_;
1103		1178
1104	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1179	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105		1180
1106	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
1107	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1189	if (my $cb = $EXTCMD{$type}) {
1108	if (my %reply = $cb->($pl, $msg)) {	1190	@reply = $cb->($pl, @payload);
1109	$pl->ext_reply ($msg->{msgid}, %reply);
1110	}
1111	}	1191	}
		1192
		1193	$pl->ext_reply ($reply, @reply)
		1194	if $reply;
		1195
1112	} else {	1196	} else {
1113	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1197	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114	}	1198	}
1115		1199
1116	cf::override;	1200	cf::override;
…		…
1206		1290
1207	=head3 cf::player	1291	=head3 cf::player
1208		1292
1209	=over 4	1293	=over 4
1210		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
1211	=item cf::player::find $login	1309	=item cf::player::find $login
1212		1310
1213	Returns the given player object, loading it if necessary (might block).	1311	Returns the given player object, loading it if necessary (might block).
1214		1312
1215	=cut	1313	=cut
…		…
1250	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1348	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1251	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1349	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1252	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1350	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1253	aio_unlink +(playerdir $login) . "/$login.pl";	1351	aio_unlink +(playerdir $login) . "/$login.pl";
1254		1352
1255	my $pl = load_pl path $login	1353	my $f = new_from_file cf::object::thawer path $login
1256	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;
1257	$cf::PLAYER{$login} = $pl	1360	$cf::PLAYER{$login} = $pl
1258	}	1361	}
1259	}	1362	}
1260	}	1363	}
1261		1364
…		…
1271		1374
1272	aio_mkdir playerdir $pl, 0770;	1375	aio_mkdir playerdir $pl, 0770;
1273	$pl->{last_save} = $cf::RUNTIME;	1376	$pl->{last_save} = $cf::RUNTIME;
1274		1377
1275	$pl->save_pl ($path);	1378	$pl->save_pl ($path);
1276	Coro::cede;	1379	cf::cede_to_tick;
1277	}	1380	}
1278		1381
1279	sub new($) {	1382	sub new($) {
1280	my ($login) = @_;	1383	my ($login) = @_;
1281		1384
…		…
1285	$self->{deny_save} = 1;	1388	$self->{deny_save} = 1;
1286		1389
1287	$cf::PLAYER{$login} = $self;	1390	$cf::PLAYER{$login} = $self;
1288		1391
1289	$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 (@_);
1290	}	1403	}
1291		1404
1292	=item $pl->quit_character	1405	=item $pl->quit_character
1293		1406
1294	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
…		…
1349	or return [];	1462	or return [];
1350		1463
1351	my @logins;	1464	my @logins;
1352		1465
1353	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") {
1354	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1471	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1355	aio_read $fh, 0, 512, my $buf, 0 or next;	1472	aio_read $fh, 0, 512, my $buf, 0 or next;
1356	$buf !~ /^password -------------$/m or next; # official not-valid tag	1473	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1474	}
1357		1475
1358	utf8::decode $login;	1476	utf8::decode $login;
1359	push @logins, $login;	1477	push @logins, $login;
1360	}	1478	}
1361		1479
…		…
1399	sub expand_cfpod {	1517	sub expand_cfpod {
1400	((my $self), (local $_)) = @_;	1518	((my $self), (local $_)) = @_;
1401		1519
1402	# escape & and <	1520	# escape & and <
1403	s/&/&/g;	1521	s/&/&/g;
1404	s/(?<![BIUGH])</</g;	1522	s/(?<![BIUGHT])</</g;
1405		1523
1406	# 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
1407		1525
1408	1 while	1526	1 while
1409	# replace B<>, I<>, U<> etc.	1527	# replace B<>, I<>, U<> etc.
1410	s/B<([^\>]*)>/<b>$1<\/b>/	1528	s/B<([^\>]*)>/<b>$1<\/b>/
1411	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1529	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1412	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1530	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1531	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1413	# replace G<male\|female> tags	1532	# replace G<male\|female> tags
1414	\|\| s{G<([^>\|])\\|([^>])>}{	1533	\|\| s{G<([^>\|])\\|([^>])>}{
1415	$self->gender ? $2 : $1	1534	$self->gender ? $2 : $1
1416	}ge	1535	}ge
1417	# replace H<hint text>	1536	# replace H<hint text>
…		…
1438	sub hintmode {	1557	sub hintmode {
1439	$_[0]{hintmode} = $_[1] if @_ > 1;	1558	$_[0]{hintmode} = $_[1] if @_ > 1;
1440	$_[0]{hintmode}	1559	$_[0]{hintmode}
1441	}	1560	}
1442		1561
1443	=item $player->ext_reply ($msgid, %msg)	1562	=item $player->ext_reply ($msgid, @msg)
1444		1563
1445	Sends an ext reply to the player.	1564	Sends an ext reply to the player.
1446		1565
1447	=cut	1566	=cut
1448		1567
1449	sub ext_reply($$%) {	1568	sub ext_reply($$@) {
1450	my ($self, $id, %msg) = @_;	1569	my ($self, $id, @msg) = @_;
1451		1570
1452	$msg{msgid} = $id;	1571	$self->ns->ext_reply ($id, @msg)
1453	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1454	}	1572	}
1455		1573
1456	=item $player->ext_event ($type, %msg)	1574	=item $player->ext_msg ($type, @msg)
1457		1575
1458	Sends an ext event to the client.	1576	Sends an ext event to the client.
1459		1577
1460	=cut	1578	=cut
1461		1579
1462	sub ext_event($$%) {	1580	sub ext_msg($$@) {
1463	my ($self, $type, %msg) = @_;	1581	my ($self, $type, @msg) = @_;
1464		1582
1465	$self->ns->ext_event ($type, %msg);	1583	$self->ns->ext_msg ($type, @msg);
1466	}	1584	}
1467		1585
1468	=head3 cf::region	1586	=head3 cf::region
1469		1587
1470	=over 4	1588	=over 4
…		…
1483	my ($path) = @_;	1601	my ($path) = @_;
1484		1602
1485	my ($match, $specificity);	1603	my ($match, $specificity);
1486		1604
1487	for my $region (list) {	1605	for my $region (list) {
1488	if ($region->match && $path =~ $region->match) {	1606	if ($region->{match} && $path =~ $region->{match}) {
1489	($match, $specificity) = ($region, $region->specificity)	1607	($match, $specificity) = ($region, $region->specificity)
1490	if $region->specificity > $specificity;	1608	if $region->specificity > $specificity;
1491	}	1609	}
1492	}	1610	}
1493		1611
…		…
1613	$self->init; # pass $1 etc.	1731	$self->init; # pass $1 etc.
1614	return $self;	1732	return $self;
1615	}	1733	}
1616	}	1734	}
1617		1735
1618	Carp::carp "unable to resolve path '$path' (base '$base').";	1736	Carp::cluck "unable to resolve path '$path' (base '$base').";
1619	()	1737	()
1620	}	1738	}
1621		1739
1622	sub init {	1740	sub init {
1623	my ($self) = @_;	1741	my ($self) = @_;
…		…
1686		1804
1687	sub load_header_from($) {	1805	sub load_header_from($) {
1688	my ($self, $path) = @_;	1806	my ($self, $path) = @_;
1689		1807
1690	utf8::encode $path;	1808	utf8::encode $path;
1691	#aio_open $path, O_RDONLY, 0	1809	my $f = new_from_file cf::object::thawer $path
1692	# or return;
1693
1694	$self->_load_header ($path)
1695	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;
1696		1817
1697	$self->{load_path} = $path;	1818	$self->{load_path} = $path;
1698		1819
1699	1	1820	1
1700	}	1821	}
…		…
1754	sub find {	1875	sub find {
1755	my ($path, $origin) = @_;	1876	my ($path, $origin) = @_;
1756		1877
1757	$path = normalise $path, $origin && $origin->path;	1878	$path = normalise $path, $origin && $origin->path;
1758		1879
		1880	cf::lock_wait "map_data:$path";#d#remove
1759	cf::lock_wait "map_find:$path";	1881	cf::lock_wait "map_find:$path";
1760		1882
1761	$cf::MAP{$path} \|\| do {	1883	$cf::MAP{$path} \|\| do {
1762	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
1763	my $map = new_from_path cf::map $path	1887	my $map = new_from_path cf::map $path
1764	or return;	1888	or return;
1765		1889
1766	$map->{last_save} = $cf::RUNTIME;	1890	$map->{last_save} = $cf::RUNTIME;
1767		1891
…		…
1769	or return;	1893	or return;
1770		1894
1771	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1895	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1772	# doing this can freeze the server in a sync job, obviously	1896	# doing this can freeze the server in a sync job, obviously
1773	#$cf::WAIT_FOR_TICK->wait;	1897	#$cf::WAIT_FOR_TICK->wait;
		1898	undef $guard1;
		1899	undef $guard2;
1774	$map->reset;	1900	$map->reset;
1775	undef $guard;
1776	return find $path;	1901	return find $path;
1777	}	1902	}
1778		1903
1779	$cf::MAP{$path} = $map	1904	$cf::MAP{$path} = $map
1780	}	1905	}
…		…
1789	local $self->{deny_reset} = 1; # loading can take a long time	1914	local $self->{deny_reset} = 1; # loading can take a long time
1790		1915
1791	my $path = $self->{path};	1916	my $path = $self->{path};
1792		1917
1793	{	1918	{
1794	my $guard = cf::lock_acquire "map_load:$path";	1919	my $guard = cf::lock_acquire "map_data:$path";
1795		1920
		1921	return unless $self->valid;
1796	return if $self->in_memory != cf::MAP_SWAPPED;	1922	return unless $self->in_memory == cf::MAP_SWAPPED;
1797		1923
1798	$self->in_memory (cf::MAP_LOADING);	1924	$self->in_memory (cf::MAP_LOADING);
1799		1925
1800	$self->alloc;	1926	$self->alloc;
1801		1927
1802	$self->pre_load;	1928	$self->pre_load;
1803	Coro::cede;	1929	cf::cede_to_tick;
1804		1930
		1931	my $f = new_from_file cf::object::thawer $self->{load_path};
		1932	$f->skip_block;
1805	$self->_load_objects ($self->{load_path}, 1)	1933	$self->_load_objects ($f)
1806	or return;	1934	or return;
1807		1935
1808	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1936	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1809	if delete $self->{load_original};	1937	if delete $self->{load_original};
1810		1938
1811	if (my $uniq = $self->uniq_path) {	1939	if (my $uniq = $self->uniq_path) {
1812	utf8::encode $uniq;	1940	utf8::encode $uniq;
1813	if (aio_open $uniq, O_RDONLY, 0) {	1941	unless (aio_stat $uniq) {
		1942	if (my $f = new_from_file cf::object::thawer $uniq) {
1814	$self->clear_unique_items;	1943	$self->clear_unique_items;
1815	$self->_load_objects ($uniq, 0);	1944	$self->_load_objects ($f);
		1945	$f->resolve_delayed_derefs;
		1946	}
1816	}	1947	}
1817	}	1948	}
1818		1949
1819	Coro::cede;	1950	$f->resolve_delayed_derefs;
		1951
		1952	cf::cede_to_tick;
1820	# now do the right thing for maps	1953	# now do the right thing for maps
1821	$self->link_multipart_objects;	1954	$self->link_multipart_objects;
1822	$self->difficulty ($self->estimate_difficulty)	1955	$self->difficulty ($self->estimate_difficulty)
1823	unless $self->difficulty;	1956	unless $self->difficulty;
1824	Coro::cede;	1957	cf::cede_to_tick;
1825		1958
1826	unless ($self->{deny_activate}) {	1959	unless ($self->{deny_activate}) {
1827	$self->decay_objects;	1960	$self->decay_objects;
1828	$self->fix_auto_apply;	1961	$self->fix_auto_apply;
1829	$self->update_buttons;	1962	$self->update_buttons;
1830	Coro::cede;	1963	cf::cede_to_tick;
1831	$self->set_darkness_map;	1964	$self->set_darkness_map;
1832	Coro::cede;	1965	cf::cede_to_tick;
1833	$self->activate;	1966	$self->activate;
1834	}	1967	}
		1968
		1969	$self->{last_save} = $cf::RUNTIME;
		1970	$self->last_access ($cf::RUNTIME);
1835		1971
1836	$self->in_memory (cf::MAP_IN_MEMORY);	1972	$self->in_memory (cf::MAP_IN_MEMORY);
1837	}	1973	}
1838		1974
1839	$self->post_load;	1975	$self->post_load;
…		…
1850		1986
1851	$self	1987	$self
1852	}	1988	}
1853		1989
1854	# 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
1855	sub load_diag {	1991	sub load_neighbours {
1856	my ($map) = @_;	1992	my ($map) = @_;
1857		1993
1858	my @diag; # diagonal neighbours	1994	my @neigh; # diagonal neighbours
1859		1995
1860	for (0 .. 3) {	1996	for (0 .. 3) {
1861	my $neigh = $map->tile_path ($_)	1997	my $neigh = $map->tile_path ($_)
1862	or next;	1998	or next;
1863	$neigh = find $neigh, $map	1999	$neigh = find $neigh, $map
1864	or next;	2000	or next;
1865	$neigh->load;	2001	$neigh->load;
1866		2002
		2003	push @neigh,
1867	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2004	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1868	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2005	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1869	}	2006	}
1870		2007
1871	for (@diag) {	2008	for (grep defined $_->[0], @neigh) {
		2009	my ($path, $origin) = @$_;
1872	my $neigh = find @$_	2010	my $neigh = find $path, $origin
1873	or next;	2011	or next;
1874	$neigh->load;	2012	$neigh->load;
1875	}	2013	}
1876	}	2014	}
1877		2015
…		…
1882	}	2020	}
1883		2021
1884	sub do_load_sync {	2022	sub do_load_sync {
1885	my ($map) = @_;	2023	my ($map) = @_;
1886		2024
		2025	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2026	if $Coro::current == $Coro::main;
		2027
1887	cf::sync_job { $map->load };	2028	cf::sync_job { $map->load };
1888	}	2029	}
1889		2030
1890	our %MAP_PREFETCH;	2031	our %MAP_PREFETCH;
1891	our $MAP_PREFETCHER = undef;	2032	our $MAP_PREFETCHER = undef;
1892		2033
1893	sub find_async {	2034	sub find_async {
1894	my ($path, $origin) = @_;	2035	my ($path, $origin, $load) = @_;
1895		2036
1896	$path = normalise $path, $origin && $origin->{path};	2037	$path = normalise $path, $origin && $origin->{path};
1897		2038
1898	if (my $map = $cf::MAP{$path}) {	2039	if (my $map = $cf::MAP{$path}) {
1899	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2040	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1900	}	2041	}
1901		2042
1902	undef $MAP_PREFETCH{$path};	2043	$MAP_PREFETCH{$path} \|= $load;
		2044
1903	$MAP_PREFETCHER \|\|= cf::async {	2045	$MAP_PREFETCHER \|\|= cf::async {
		2046	$Coro::current->{desc} = "map prefetcher";
		2047
1904	while (%MAP_PREFETCH) {	2048	while (%MAP_PREFETCH) {
1905	for my $path (keys %MAP_PREFETCH) {	2049	while (my ($k, $v) = each %MAP_PREFETCH) {
1906	my $map = find $path	2050	if (my $map = find $k) {
1907	or next;
1908	$map->load;	2051	$map->load if $v;
		2052	}
1909		2053
1910	delete $MAP_PREFETCH{$path};	2054	delete $MAP_PREFETCH{$k};
1911	}	2055	}
1912	}	2056	}
1913	undef $MAP_PREFETCHER;	2057	undef $MAP_PREFETCHER;
1914	};	2058	};
1915	$MAP_PREFETCHER->prio (6);	2059	$MAP_PREFETCHER->prio (6);
…		…
1918	}	2062	}
1919		2063
1920	sub save {	2064	sub save {
1921	my ($self) = @_;	2065	my ($self) = @_;
1922		2066
1923	my $lock = cf::lock_acquire "map_data:" . $self->path;	2067	my $lock = cf::lock_acquire "map_data:$self->{path}";
1924		2068
1925	$self->{last_save} = $cf::RUNTIME;	2069	$self->{last_save} = $cf::RUNTIME;
1926		2070
1927	return unless $self->dirty;	2071	return unless $self->dirty;
1928		2072
…		…
1934	return if $self->{deny_save};	2078	return if $self->{deny_save};
1935		2079
1936	local $self->{last_access} = $self->last_access;#d#	2080	local $self->{last_access} = $self->last_access;#d#
1937		2081
1938	cf::async {	2082	cf::async {
		2083	$Coro::current->{desc} = "map player save";
1939	$_->contr->save for $self->players;	2084	$_->contr->save for $self->players;
1940	};	2085	};
1941		2086
1942	if ($uniq) {	2087	if ($uniq) {
1943	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	2088	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
…		…
1951	my ($self) = @_;	2096	my ($self) = @_;
1952		2097
1953	# save first because save cedes	2098	# save first because save cedes
1954	$self->save;	2099	$self->save;
1955		2100
1956	my $lock = cf::lock_acquire "map_data:" . $self->path;	2101	my $lock = cf::lock_acquire "map_data:$self->{path}";
1957		2102
1958	return if $self->players;	2103	return if $self->players;
1959	return if $self->in_memory != cf::MAP_IN_MEMORY;	2104	return if $self->in_memory != cf::MAP_IN_MEMORY;
1960	return if $self->{deny_save};	2105	return if $self->{deny_save};
1961		2106
		2107	$self->in_memory (cf::MAP_SWAPPED);
		2108
		2109	$self->deactivate;
		2110	$_->clear_links_to ($self) for values %cf::MAP;
1962	$self->clear;	2111	$self->clear;
1963	$self->in_memory (cf::MAP_SWAPPED);
1964	}	2112	}
1965		2113
1966	sub reset_at {	2114	sub reset_at {
1967	my ($self) = @_;	2115	my ($self) = @_;
1968		2116
…		…
2000	if $uniq;	2148	if $uniq;
2001	}	2149	}
2002		2150
2003	delete $cf::MAP{$self->path};	2151	delete $cf::MAP{$self->path};
2004		2152
		2153	$self->deactivate;
		2154	$_->clear_links_to ($self) for values %cf::MAP;
2005	$self->clear;	2155	$self->clear;
2006
2007	$_->clear_links_to ($self) for values %cf::MAP;
2008		2156
2009	$self->unlink_save;	2157	$self->unlink_save;
2010	$self->destroy;	2158	$self->destroy;
2011	}	2159	}
2012		2160
2013	my $nuke_counter = "aaaa";	2161	my $nuke_counter = "aaaa";
2014		2162
2015	sub nuke {	2163	sub nuke {
2016	my ($self) = @_;	2164	my ($self) = @_;
2017		2165
		2166	{
		2167	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2168
2018	delete $cf::MAP{$self->path};	2169	delete $cf::MAP{$self->path};
2019		2170
2020	$self->unlink_save;	2171	$self->unlink_save;
2021		2172
2022	bless $self, "cf::map";	2173	bless $self, "cf::map";
2023	delete $self->{deny_reset};	2174	delete $self->{deny_reset};
2024	$self->{deny_save} = 1;	2175	$self->{deny_save} = 1;
2025	$self->reset_timeout (1);	2176	$self->reset_timeout (1);
2026	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2177	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2027		2178
2028	$cf::MAP{$self->path} = $self;	2179	$cf::MAP{$self->path} = $self;
		2180	}
2029		2181
2030	$self->reset; # polite request, might not happen	2182	$self->reset; # polite request, might not happen
2031	}	2183	}
2032		2184
2033	=item $maps = cf::map::tmp_maps	2185	=item $maps = cf::map::tmp_maps
…		…
2109		2261
2110	sub inv_recursive {	2262	sub inv_recursive {
2111	inv_recursive_ inv $_[0]	2263	inv_recursive_ inv $_[0]
2112	}	2264	}
2113		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
2114	package cf;	2294	package cf;
2115		2295
2116	=back	2296	=back
2117		2297
2118	=head3 cf::object::player	2298	=head3 cf::object::player
…		…
2140		2320
2141	} else {	2321	} else {
2142	my $pl = $self->contr;	2322	my $pl = $self->contr;
2143		2323
2144	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2324	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145	my $diag = $pl->{npc_dialog};	2325	my $dialog = $pl->{npc_dialog};
2146	$diag->{pl}->ext_reply (	2326	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2147	$diag->{id},
2148	msgtype => "reply",
2149	msg => $diag->{pl}->expand_cfpod ($msg),
2150	add_topics => []
2151	);
2152		2327
2153	} else {	2328	} else {
2154	$msg = $npc->name . " says: $msg" if $npc;	2329	$msg = $npc->name . " says: $msg" if $npc;
2155	$self->message ($msg, $flags);	2330	$self->message ($msg, $flags);
2156	}	2331	}
2157	}	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 (@_);
2158	}	2343	}
2159		2344
2160	=item $player_object->may ("access")	2345	=item $player_object->may ("access")
2161		2346
2162	Returns wether the given player is authorized to access resource "access"	2347	Returns wether the given player is authorized to access resource "access"
…		…
2241	# use -1 or undef as default coordinates, not 0, 0	2426	# use -1 or undef as default coordinates, not 0, 0
2242	($x, $y) = ($map->enter_x, $map->enter_y)	2427	($x, $y) = ($map->enter_x, $map->enter_y)
2243	if $x <=0 && $y <= 0;	2428	if $x <=0 && $y <= 0;
2244		2429
2245	$map->load;	2430	$map->load;
2246	$map->load_diag;	2431	$map->load_neighbours;
2247		2432
2248	return unless $self->contr->active;	2433	return unless $self->contr->active;
2249	$self->activate_recursive;	2434	$self->activate_recursive;
2250		2435
2251	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2436	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252	$self->enter_map ($map, $x, $y);	2437	$self->enter_map ($map, $x, $y);
2253	}	2438	}
2254		2439
2255	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2440	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256		2441
2257	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
2258	her, loading and preparing them map, calling the provided $check callback	2443	her, loading and preparing them map, calling the provided $check callback
2259	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
2260	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.
2261		2447
2262	=cut	2448	=cut
2263		2449
2264	our $GOTOGEN;	2450	our $GOTOGEN;
2265		2451
2266	sub cf::object::player::goto {	2452	sub cf::object::player::goto {
2267	my ($self, $path, $x, $y, $check) = @_;	2453	my ($self, $path, $x, $y, $check, $done) = @_;
2268		2454
2269	# 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
2270	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2456	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271		2457
2272	$self->enter_link;	2458	$self->enter_link;
2273		2459
2274	(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
2275	my $map = eval {	2482	my $map = eval {
2276	my $map = cf::map::find $path;	2483	my $map = defined $path ? cf::map::find $path : undef;
2277		2484
2278	if ($map) {	2485	if ($map) {
2279	$map = $map->customise_for ($self);	2486	$map = $map->customise_for ($self);
2280	$map = $check->($map) if $check && $map;	2487	$map = $check->($map) if $check && $map;
2281	} else {	2488	} else {
2282	$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);
2283	}	2490	}
2284		2491
2285	$map	2492	$map
2286	};	2493	};
2287		2494
…		…
2292		2499
2293	if ($gen == $self->{_goto_generation}) {	2500	if ($gen == $self->{_goto_generation}) {
2294	delete $self->{_goto_generation};	2501	delete $self->{_goto_generation};
2295	$self->leave_link ($map, $x, $y);	2502	$self->leave_link ($map, $x, $y);
2296	}	2503	}
		2504
		2505	$done->() if $done;
2297	})->prio (1);	2506	})->prio (1);
2298	}	2507	}
2299		2508
2300	=item $player_object->enter_exit ($exit_object)	2509	=item $player_object->enter_exit ($exit_object)
2301		2510
…		…
2375	# if exit is damned, update players death & WoR home-position	2584	# if exit is damned, update players death & WoR home-position
2376	$self->contr->savebed ($slaying, $hp, $sp)	2585	$self->contr->savebed ($slaying, $hp, $sp)
2377	if $exit->flag (FLAG_DAMNED);	2586	if $exit->flag (FLAG_DAMNED);
2378		2587
2379	(async {	2588	(async {
		2589	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2590
2380	$self->deactivate_recursive; # just to be sure	2591	$self->deactivate_recursive; # just to be sure
2381	unless (eval {	2592	unless (eval {
2382	$self->goto ($slaying, $hp, $sp);	2593	$self->goto ($slaying, $hp, $sp);
2383		2594
2384	1;	2595	1;
…		…
2410		2621
2411	utf8::encode $text;	2622	utf8::encode $text;
2412	$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);
2413	}	2624	}
2414		2625
2415	=item $client->send_msg ($color, $type, $msg, [extra...])	2626	=item $client->send_msg ($channel, $msg, $color, [extra...])
2416		2627
2417	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
2418	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
2419	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
2420	the message unless the client supports the msg packet.	2631	the message unless the client supports the msg packet.
2421		2632
2422	=cut	2633	=cut
2423		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
2424	sub cf::client::send_msg {	2656	sub cf::client::send_msg {
2425	my ($self, $color, $type, $msg, @extra) = @_;	2657	my ($self, $channel, $msg, $color, @extra) = @_;
2426		2658
2427	$msg = $self->pl->expand_cfpod ($msg);	2659	$msg = $self->pl->expand_cfpod ($msg);
2428		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
2429	return unless @extra \|\| length $msg;	2683	return unless @extra \|\| length $msg;
2430		2684
2431	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
2432	$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]));
2433	} else {	2692	} else {
2434	# replace some tags by gcfclient-compatible ones
2435	for ($msg) {
2436	1 while
2437	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2438	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2439	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2440	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2441	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2442	}
2443
2444	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
2445	if (0 && $msg =~ /\[/) {	2708	if (0 && $msg =~ /\[/) {
		2709	# COMMAND/INFO
2446	$self->send_packet ("drawextinfo $color 4 0 $msg")	2710	$self->send_packet ("drawextinfo $color 10 8 $msg")
2447	} else {	2711	} else {
2448	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2712	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2449	$self->send_packet ("drawinfo $color $msg")	2713	$self->send_packet ("drawinfo $color $msg")
2450	}	2714	}
2451	}	2715	}
2452	}	2716	}
2453	}	2717	}
2454		2718
2455	=item $client->ext_event ($type, %msg)	2719	=item $client->ext_msg ($type, @msg)
2456		2720
2457	Sends an ext event to the client.	2721	Sends an ext event to the client.
2458		2722
2459	=cut	2723	=cut
2460		2724
2461	sub cf::client::ext_event($$%) {	2725	sub cf::client::ext_msg($$@) {
2462	my ($self, $type, %msg) = @_;	2726	my ($self, $type, @msg) = @_;
2463		2727
		2728	if ($self->extcmd == 2) {
		2729	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2730	} elsif ($self->extcmd == 1) { # TODO: remove
2464	$msg{msgtype} = "event_$type";	2731	push @msg, msgtype => "event_$type";
2465	$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	}
2466	}	2752	}
2467		2753
2468	=item $success = $client->query ($flags, "text", \&cb)	2754	=item $success = $client->query ($flags, "text", \&cb)
2469		2755
2470	Queues a query to the client, calling the given callback with	2756	Queues a query to the client, calling the given callback with
…		…
2525	my ($ns, $buf) = @_;	2811	my ($ns, $buf) = @_;
2526		2812
2527	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2813	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528		2814
2529	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
2530	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2823	if (my $cb = $EXTICMD{$type}) {
2531	if (my %reply = $cb->($ns, $msg)) {	2824	@reply = $cb->($ns, @payload);
2532	$reply{msgid} = $msg->{msgid};
2533	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534	}
2535	}	2825	}
		2826
		2827	$ns->ext_reply ($reply, @reply)
		2828	if $reply;
		2829
2536	} else {	2830	} else {
2537	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";
2538	}	2832	}
2539		2833
2540	cf::override;	2834	cf::override;
…		…
2587	our $safe = new Safe "safe";	2881	our $safe = new Safe "safe";
2588	our $safe_hole = new Safe::Hole;	2882	our $safe_hole = new Safe::Hole;
2589		2883
2590	$SIG{FPE} = 'IGNORE';	2884	$SIG{FPE} = 'IGNORE';
2591		2885
2592	$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	));
2593		2891
2594	# here we export the classes and methods available to script code	2892	# here we export the classes and methods available to script code
2595		2893
2596	=pod	2894	=pod
2597		2895
2598	The following functions and methods are available within a safe environment:	2896	The following functions and methods are available within a safe environment:
2599		2897
2600	cf::object	2898	cf::object
2601	contr pay_amount pay_player map x y force_find force_add	2899	contr pay_amount pay_player map x y force_find force_add
2602	insert remove	2900	insert remove name archname title slaying race decrease_ob_nr
2603		2901
2604	cf::object::player	2902	cf::object::player
2605	player	2903	player
2606		2904
2607	cf::player	2905	cf::player
…		…
2612		2910
2613	=cut	2911	=cut
2614		2912
2615	for (	2913	for (
2616	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	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
2617	insert remove)],	2916	decrease_ob_nr)],
2618	["cf::object::player" => qw(player)],	2917	["cf::object::player" => qw(player)],
2619	["cf::player" => qw(peaceful)],	2918	["cf::player" => qw(peaceful)],
2620	["cf::map" => qw(trigger)],	2919	["cf::map" => qw(trigger)],
2621	) {	2920	) {
2622	no strict 'refs';	2921	no strict 'refs';
…		…
2698	# the server's init and main functions	2997	# the server's init and main functions
2699		2998
2700	sub load_facedata($) {	2999	sub load_facedata($) {
2701	my ($path) = @_;	3000	my ($path) = @_;
2702		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
2703	warn "loading facedata from $path\n";	3008	warn "loading facedata from $path\n";
2704		3009
2705	my $facedata;	3010	my $facedata;
2706	0 < aio_load $path, $facedata	3011	0 < aio_load $path, $facedata
2707	or die "$path: $!";	3012	or die "$path: $!";
…		…
2709	$facedata = Coro::Storable::thaw $facedata;	3014	$facedata = Coro::Storable::thaw $facedata;
2710		3015
2711	$facedata->{version} == 2	3016	$facedata->{version} == 2
2712	or cf::cleanup "$path: version mismatch, cannot proceed.";	3017	or cf::cleanup "$path: version mismatch, cannot proceed.";
2713		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
2714	{	3026	{
2715	my $faces = $facedata->{faceinfo};	3027	my $faces = $facedata->{faceinfo};
2716		3028
2717	while (my ($face, $info) = each %$faces) {	3029	while (my ($face, $info) = each %$faces) {
2718	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3030	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2719	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3031	cf::face::set_visibility $idx, $info->{visibility};
		3032	cf::face::set_magicmap $idx, $info->{magicmap};
2720	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3033	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2721	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3034	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2722	Coro::cede;	3035
		3036	cf::cede_to_tick;
2723	}	3037	}
2724		3038
2725	while (my ($face, $info) = each %$faces) {	3039	while (my ($face, $info) = each %$faces) {
2726	next unless $info->{smooth};	3040	next unless $info->{smooth};
2727	my $idx = cf::face::find $face	3041	my $idx = cf::face::find $face
2728	or next;	3042	or next;
2729	if (my $smooth = cf::face::find $info->{smooth}) {	3043	if (my $smooth = cf::face::find $info->{smooth}) {
		3044	cf::face::set_smooth $idx, $smooth;
2730	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3045	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731	} else {	3046	} else {
2732	warn "smooth face '$info->{smooth}' not found for face '$face'";	3047	warn "smooth face '$info->{smooth}' not found for face '$face'";
2733	}	3048	}
2734	Coro::cede;	3049
		3050	cf::cede_to_tick;
2735	}	3051	}
2736	}	3052	}
2737		3053
2738	{	3054	{
2739	my $anims = $facedata->{animinfo};	3055	my $anims = $facedata->{animinfo};
2740		3056
2741	while (my ($anim, $info) = each %$anims) {	3057	while (my ($anim, $info) = each %$anims) {
2742	cf::anim::set $anim, $info->{frames}, $info->{facings};	3058	cf::anim::set $anim, $info->{frames}, $info->{facings};
2743	Coro::cede;	3059	cf::cede_to_tick;
2744	}	3060	}
2745		3061
2746	cf::anim::invalidate_all; # d'oh	3062	cf::anim::invalidate_all; # d'oh
2747	}	3063	}
2748		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
2749	1	3114	1
2750	}	3115	}
2751		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
2752	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
2753	load_resource_file "$MAPDIR/regions"	3130	load_resource_file "$MAPDIR/regions"
2754	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	}
2755	}	3137	}
2756		3138
2757	sub reload_facedata {	3139	sub reload_facedata {
2758	load_facedata "$DATADIR/facedata"	3140	load_facedata "$DATADIR/facedata"
2759	or die "unable to load facedata\n";	3141	or die "unable to load facedata\n";
…		…
2788		3170
2789	sub init {	3171	sub init {
2790	reload_resources;	3172	reload_resources;
2791	}	3173	}
2792		3174
2793	sub cfg_load {	3175	sub reload_config {
2794	open my $fh, "<:utf8", "$CONFDIR/config"	3176	open my $fh, "<:utf8", "$CONFDIR/config"
2795	or return;	3177	or return;
2796		3178
2797	local $/;	3179	local $/;
2798	*CFG = YAML::Syck::Load <$fh>;	3180	*CFG = YAML::Syck::Load <$fh>;
…		…
2814	sub main {	3196	sub main {
2815	# we must not ever block the main coroutine	3197	# we must not ever block the main coroutine
2816	local $Coro::idle = sub {	3198	local $Coro::idle = sub {
2817	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#
2818	(async {	3200	(async {
		3201	$Coro::current->{desc} = "IDLE BUG HANDLER";
2819	Event::one_event;	3202	Event::one_event;
2820	})->prio (Coro::PRIO_MAX);	3203	})->prio (Coro::PRIO_MAX);
2821	};	3204	};
2822		3205
2823	cfg_load;	3206	reload_config;
2824	db_init;	3207	db_init;
2825	load_extensions;	3208	load_extensions;
2826		3209
2827	$TICK_WATCHER->start;	3210	$TICK_WATCHER->start;
2828	Event::loop;	3211	Event::loop;
…		…
3021	warn "reloading cf.pm";	3404	warn "reloading cf.pm";
3022	require cf;	3405	require cf;
3023	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3406	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3024		3407
3025	warn "loading config and database again";	3408	warn "loading config and database again";
3026	cf::cfg_load;	3409	cf::reload_config;
3027		3410
3028	warn "loading extensions";	3411	warn "loading extensions";
3029	cf::load_extensions;	3412	cf::load_extensions;
3030		3413
3031	warn "reattaching attachments to objects/players";	3414	warn "reattaching attachments to objects/players";
…		…
3067	register_command "reload" => sub {	3450	register_command "reload" => sub {
3068	my ($who, $arg) = @_;	3451	my ($who, $arg) = @_;
3069		3452
3070	if ($who->flag (FLAG_WIZ)) {	3453	if ($who->flag (FLAG_WIZ)) {
3071	$who->message ("reloading server.");	3454	$who->message ("reloading server.");
		3455	async {
		3456	$Coro::current->{desc} = "perl_reload";
3072	async { reload_perl };	3457	reload_perl;
		3458	};
3073	}	3459	}
3074	};	3460	};
3075		3461
3076	unshift @INC, $LIBDIR;	3462	unshift @INC, $LIBDIR;
3077		3463
…		…
3096	my $signal = new Coro::Signal;	3482	my $signal = new Coro::Signal;
3097	push @WAIT_FOR_TICK_BEGIN, $signal;	3483	push @WAIT_FOR_TICK_BEGIN, $signal;
3098	$signal->wait;	3484	$signal->wait;
3099	}	3485	}
3100		3486
3101	my $min = 1e6;#d#
3102	my $avg = 10;
3103	$TICK_WATCHER = Event->timer (	3487	$TICK_WATCHER = Event->timer (
3104	reentrant => 0,	3488	reentrant => 0,
3105	parked => 1,	3489	parked => 1,
3106	prio => 0,	3490	prio => 0,
3107	at => $NEXT_TICK \|\| $TICK,	3491	at => $NEXT_TICK \|\| $TICK,
…		…
3115		3499
3116	$NOW = $tick_start = Event::time;	3500	$NOW = $tick_start = Event::time;
3117		3501
3118	cf::server_tick; # one server iteration	3502	cf::server_tick; # one server iteration
3119		3503
3120	0 && sync_job {#d#
3121	for(1..10) {
3122	my $t = Event::time;
3123	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3124	or die;
3125
3126	$map->width (50);
3127	$map->height (50);
3128	$map->alloc;
3129	$map->_load_objects ("/tmp/x.map", 1);
3130	my $t = Event::time - $t;
3131
3132	#next unless $t < 0.0013;#d#
3133	if ($t < $min) {
3134	$min = $t;
3135	}
3136	$avg = $avg * 0.99 + $t * 0.01;
3137	}
3138	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3139	exit 0;
3140	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3141	};
3142
3143	$RUNTIME += $TICK;	3504	$RUNTIME += $TICK;
3144	$NEXT_TICK += $TICK;	3505	$NEXT_TICK += $TICK;
3145		3506
3146	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3507	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3147	$NEXT_RUNTIME_WRITE = $NOW + 10;	3508	$NEXT_RUNTIME_WRITE = $NOW + 10;
3148	Coro::async_pool {	3509	Coro::async_pool {
		3510	$Coro::current->{desc} = "runtime saver";
3149	write_runtime	3511	write_runtime
3150	or warn "ERROR: unable to write runtime file: $!";	3512	or warn "ERROR: unable to write runtime file: $!";
3151	};	3513	};
3152	}	3514	}
3153		3515
3154	# my $AFTER = Event::time;
3155	# warn $AFTER - $NOW;#d#
3156
3157	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3516	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3158	$sig->send;	3517	$sig->send;
3159	}	3518	}
3160	while (my $sig = shift @WAIT_FOR_TICK) {	3519	while (my $sig = shift @WAIT_FOR_TICK) {
3161	$sig->send;	3520	$sig->send;
…		…
3171		3530
3172	$LOAD = ($NOW - $tick_start) / $TICK;	3531	$LOAD = ($NOW - $tick_start) / $TICK;
3173	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3532	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3174		3533
3175	_post_tick;	3534	_post_tick;
3176
3177
3178	},	3535	},
3179	);	3536	);
3180		3537
3181	{	3538	{
		3539	BDB::min_parallel 8;
3182	BDB::max_poll_time $TICK * 0.1;	3540	BDB::max_poll_time $TICK * 0.1;
3183	$BDB_POLL_WATCHER = Event->io (	3541	$BDB_POLL_WATCHER = Event->io (
3184	reentrant => 0,	3542	reentrant => 0,
3185	fd => BDB::poll_fileno,	3543	fd => BDB::poll_fileno,
3186	poll => 'r',	3544	poll => 'r',
3187	prio => 0,	3545	prio => 0,
3188	data => WF_AUTOCANCEL,	3546	data => WF_AUTOCANCEL,
3189	cb => \&BDB::poll_cb,	3547	cb => \&BDB::poll_cb,
3190	);	3548	);
3191	BDB::min_parallel 8;
3192		3549
3193	BDB::set_sync_prepare {	3550	BDB::set_sync_prepare {
3194	my $status;	3551	my $status;
3195	my $current = $Coro::current;	3552	my $current = $Coro::current;
3196	(	3553	(
…		…
3205	)	3562	)
3206	};	3563	};
3207		3564
3208	unless ($DB_ENV) {	3565	unless ($DB_ENV) {
3209	$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);
3210		3571
3211	cf::sync_job {	3572	cf::sync_job {
3212	eval {	3573	eval {
3213	BDB::db_env_open	3574	BDB::db_env_open
3214	$DB_ENV,	3575	$DB_ENV,
…		…
3216	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
3217	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3578	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3218	0666;	3579	0666;
3219		3580
3220	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3581	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3221
3222	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
3223	$DB_ENV->set_lk_detect;
3224	};	3582	};
3225		3583
3226	cf::cleanup "db_env_open(db): $@" if $@;	3584	cf::cleanup "db_env_open(db): $@" if $@;
3227	};	3585	};
3228	}	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	);
3229	}	3618	}
3230		3619
3231	{	3620	{
3232	IO::AIO::min_parallel 8;	3621	IO::AIO::min_parallel 8;
3233		3622
…		…
3236	$AIO_POLL_WATCHER = Event->io (	3625	$AIO_POLL_WATCHER = Event->io (
3237	reentrant => 0,	3626	reentrant => 0,
3238	data => WF_AUTOCANCEL,	3627	data => WF_AUTOCANCEL,
3239	fd => IO::AIO::poll_fileno,	3628	fd => IO::AIO::poll_fileno,
3240	poll => 'r',	3629	poll => 'r',
3241	prio => 6,	3630	prio => 0,
3242	cb => \&IO::AIO::poll_cb,	3631	cb => \&IO::AIO::poll_cb,
3243	);	3632	);
3244	}	3633	}
3245		3634
3246	my $_log_backtrace;	3635	my $_log_backtrace;
…		…
3252		3641
3253	# limit the # of concurrent backtraces	3642	# limit the # of concurrent backtraces
3254	if ($_log_backtrace < 2) {	3643	if ($_log_backtrace < 2) {
3255	++$_log_backtrace;	3644	++$_log_backtrace;
3256	async {	3645	async {
		3646	$Coro::current->{desc} = "abt $msg";
		3647
3257	my @bt = fork_call {	3648	my @bt = fork_call {
3258	@addr = map { sprintf "%x", $_ } @addr;	3649	@addr = map { sprintf "%x", $_ } @addr;
3259	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3650	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3260	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 \|"
3261	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.298 by root, Sun Jul 8 14:50:07 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.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.379 by root, Thu Oct 4 23:59:07 2007 UTC