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

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