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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.302 by root, Tue Jul 10 16:23:59 2007 UTC vs.
Revision 1.389 by root, Sat Oct 20 04:39:57 2007 UTC

…		…
4	use strict;	4	use strict;
5		5
6	use Symbol;	6	use Symbol;
7	use List::Util;	7	use List::Util;
8	use Socket;	8	use Socket;
9	use Storable;
10	use Event;	9	use Event;
11	use Opcode;	10	use Opcode;
12	use Safe;	11	use Safe;
13	use Safe::Hole;	12	use Safe::Hole;
		13	use Storable ();
14		14
15	use Coro 3.61 ();	15	use Coro 4.1 ();
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.51 ();
32	use Time::HiRes;	33	use Time::HiRes;
33	use Compress::LZF;	34	use Compress::LZF;
34	use Digest::MD5 ();	35	use Digest::MD5 ();
35		36
36	# configure various modules to our taste	37	# configure various modules to our taste
…		…
79	our $NEXT_TICK;	80	our $NEXT_TICK;
80	our $NOW;	81	our $NOW;
81	our $USE_FSYNC = 1; # use fsync to write maps - default off	82	our $USE_FSYNC = 1; # use fsync to write maps - default off
82		83
83	our $BDB_POLL_WATCHER;	84	our $BDB_POLL_WATCHER;
		85	our $BDB_DEADLOCK_WATCHER;
		86	our $BDB_CHECKPOINT_WATCHER;
		87	our $BDB_TRICKLE_WATCHER;
84	our $DB_ENV;	88	our $DB_ENV;
85		89
86	our %CFG;	90	our %CFG;
87		91
88	our $UPTIME; $UPTIME \|\|= time;	92	our $UPTIME; $UPTIME \|\|= time;
89	our $RUNTIME;	93	our $RUNTIME;
90		94
91	our %PLAYER; # all users	95	our (%PLAYER, %PLAYER_LOADING); # all users
92	our %MAP; # all maps	96	our (%MAP, %MAP_LOADING ); # all maps
93	our $LINK_MAP; # the special {link} map, which is always available	97	our $LINK_MAP; # the special {link} map, which is always available
94		98
95	# 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 ∕
96	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	100	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97		101
…		…
167		171
168	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
169	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
170	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.
171		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
172	=back	182	=back
173		183
174	=cut	184	=cut
175		185
176	BEGIN {	186	BEGIN {
…		…
180	$msg .= "\n"	190	$msg .= "\n"
181	unless $msg =~ /\n$/;	191	unless $msg =~ /\n$/;
182		192
183	$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;
184		194
185	utf8::encode $msg;
186	LOG llevError, $msg;	195	LOG llevError, $msg;
187	};	196	};
188	}	197	}
189		198
190	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	199	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
265	Wait until the given lock is available and then acquires it and returns	274	Wait until the given lock is available and then acquires it and returns
266	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	275	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
267	for example when the coroutine gets canceled), the lock is automatically	276	for example when the coroutine gets canceled), the lock is automatically
268	returned.	277	returned.
269		278
		279	Locks are not recursive, locking from the same coro twice results in a
		280	deadlocked coro.
		281
270	Lock names should begin with a unique identifier (for example, cf::map::find	282	Lock names should begin with a unique identifier (for example, cf::map::find
271	uses map_find and cf::map::load uses map_load).	283	uses map_find and cf::map::load uses map_load).
272		284
273	=item $locked = cf::lock_active $string	285	=item $locked = cf::lock_active $string
274		286
275	Return true if the lock is currently active, i.e. somebody has locked it.	287	Return true if the lock is currently active, i.e. somebody has locked it.
276		288
277	=cut	289	=cut
278		290
279	our %LOCK;	291	our %LOCK;
		292	our %LOCKER;#d#
280		293
281	sub lock_wait($) {	294	sub lock_wait($) {
282	my ($key) = @_;	295	my ($key) = @_;
		296
		297	if ($LOCKER{$key} == $Coro::current) {#d#
		298	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		299	return;#d#
		300	}#d#
283		301
284	# wait for lock, if any	302	# wait for lock, if any
285	while ($LOCK{$key}) {	303	while ($LOCK{$key}) {
286	push @{ $LOCK{$key} }, $Coro::current;	304	push @{ $LOCK{$key} }, $Coro::current;
287	Coro::schedule;	305	Coro::schedule;
…		…
293		311
294	# wait, to be sure we are not locked	312	# wait, to be sure we are not locked
295	lock_wait $key;	313	lock_wait $key;
296		314
297	$LOCK{$key} = [];	315	$LOCK{$key} = [];
		316	$LOCKER{$key} = $Coro::current;#d#
298		317
299	Coro::guard {	318	Coro::guard {
		319	delete $LOCKER{$key};#d#
300	# wake up all waiters, to be on the safe side	320	# wake up all waiters, to be on the safe side
301	$_->ready for @{ delete $LOCK{$key} };	321	$_->ready for @{ delete $LOCK{$key} };
302	}	322	}
303	}	323	}
304		324
…		…
316	};	336	};
317	$TICK_WATCHER->stop;	337	$TICK_WATCHER->stop;
318	$guard	338	$guard
319	}	339	}
320		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
321	=item cf::async { BLOCK }	399	=item cf::async { BLOCK }
322		400
323	Currently the same as Coro::async_pool, meaning you cannot use	401	Currently the same as Coro::async_pool, meaning you cannot use
324	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
325	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.
…		…
349	my $time = Event::time;	427	my $time = Event::time;
350		428
351	# this is the main coro, too bad, we have to block	429	# this is the main coro, too bad, we have to block
352	# till the operation succeeds, freezing the server :/	430	# till the operation succeeds, freezing the server :/
353		431
		432	LOG llevError, Carp::longmess "sync job";#d#
		433
354	# TODO: use suspend/resume instead	434	# TODO: use suspend/resume instead
355	# (but this is cancel-safe)	435	# (but this is cancel-safe)
356	my $freeze_guard = freeze_mainloop;	436	my $freeze_guard = freeze_mainloop;
357		437
358	my $busy = 1;	438	my $busy = 1;
359	my @res;	439	my @res;
360		440
361	(async {	441	(async {
		442	$Coro::current->desc ("sync job coro");
362	@res = eval { $job->() };	443	@res = eval { $job->() };
363	warn $@ if $@;	444	warn $@ if $@;
364	undef $busy;	445	undef $busy;
365	})->prio (Coro::PRIO_MAX);	446	})->prio (Coro::PRIO_MAX);
366		447
367	while ($busy) {	448	while ($busy) {
		449	if (Coro::nready) {
		450	Coro::cede_notself;
		451	} else {
368	Coro::cede or Event::one_event;	452	Event::one_event;
		453	}
369	}	454	}
370		455
371	$time = Event::time - $time;	456	$time = Event::time - $time;
372		457
373	LOG llevError \| logBacktrace, Carp::longmess "long sync job"	458	LOG llevError \| logBacktrace, Carp::longmess "long sync job"
…		…
410	Coro::Storable. May, of course, block. Note that the executed sub may	495	Coro::Storable. May, of course, block. Note that the executed sub may
411	never block itself or use any form of Event handling.	496	never block itself or use any form of Event handling.
412		497
413	=cut	498	=cut
414		499
415	sub _store_scalar {
416	open my $fh, ">", \my $buf
417	or die "fork_call: cannot open fh-to-buf in child : $!";
418	Storable::store_fd $_[0], $fh;
419	close $fh;
420
421	$buf
422	}
423
424	sub fork_call(&@) {	500	sub fork_call(&@) {
425	my ($cb, @args) = @_;	501	my ($cb, @args) = @_;
426		502
427	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	503	# we seemingly have to make a local copy of the whole thing,
428	# or die "socketpair: $!";	504	# otherwise perl prematurely frees the stuff :/
429	pipe my $fh1, my $fh2	505	# TODO: investigate and fix (likely this will be rather laborious)
430	or die "pipe: $!";
431		506
432	if (my $pid = fork) {	507	my @res = Coro::Util::fork_eval {
433	close $fh2;
434
435	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436	warn "pst<$res>" unless $res =~ /^pst/;
437	$res = Coro::Storable::thaw $res;
438
439	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
440
441	Carp::confess $$res unless "ARRAY" eq ref $res;
442
443	return wantarray ? @$res : $res->[-1];
444	} else {
445	reset_signals;	508	reset_signals;
446	local $SIG{__WARN__};	509	&$cb
447	local $SIG{__DIE__};	510	}, @args;
448	# just in case, this hack effectively disables event
449	# in the child. cleaner and slower would be canceling all watchers,
450	# but this works for the time being.
451	local $Coro::idle;
452	$Coro::current->prio (Coro::PRIO_MAX);
453		511
454	eval {	512	wantarray ? @res : $res[-1]
455	close $fh1;
456
457	my @res = eval { $cb->(@args) };
458
459	syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
460	close $fh2;
461	};
462
463	warn $@ if $@;
464	_exit 0;
465	}
466	}	513	}
467		514
468	=item $value = cf::db_get $family => $key	515	=item $value = cf::db_get $family => $key
469		516
470	Returns a single value from the environment database.	517	Returns a single value from the environment database.
…		…
472	=item cf::db_put $family => $key => $value	519	=item cf::db_put $family => $key => $value
473		520
474	Stores the given C<$value> in the family. It can currently store binary	521	Stores the given C<$value> in the family. It can currently store binary
475	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).	522	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
476		523
		524	=item $db = cf::db_table "name"
		525
		526	Create and/or open a new database table. The string must not be "db" and must be unique
		527	within each server.
		528
477	=cut	529	=cut
		530
		531	sub db_table($) {
		532	my ($name) = @_;
		533	my $db = BDB::db_create $DB_ENV;
		534
		535	eval {
		536	$db->set_flags (BDB::CHKSUM);
		537
		538	utf8::encode $name;
		539	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		540	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
		541	cf::cleanup "db_open(db): $!" if $!;
		542	};
		543	cf::cleanup "db_open(db): $@" if $@;
		544
		545	$db
		546	}
478		547
479	our $DB;	548	our $DB;
480		549
481	sub db_init {	550	sub db_init {
482	unless ($DB) {
483	$DB = BDB::db_create $DB_ENV;
484
485	cf::sync_job {	551	cf::sync_job {
486	eval {	552	$DB \|\|= db_table "db";
487	$DB->set_flags (BDB::CHKSUM);
488
489	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
490	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
491	cf::cleanup "db_open(db): $!" if $!;
492	};
493	cf::cleanup "db_open(db): $@" if $@;
494	};
495	}	553	};
496	}	554	}
497		555
498	sub db_get($$) {	556	sub db_get($$) {
499	my $key = "$_[0]/$_[1]";	557	my $key = "$_[0]/$_[1]";
500		558
…		…
550	if (1) {	608	if (1) {
551	$md5 =	609	$md5 =
552	join "\x00",	610	join "\x00",
553	$processversion,	611	$processversion,
554	map {	612	map {
555	Coro::cede;	613	cf::cede_to_tick;
556	($src->[$_], Digest::MD5::md5_hex $data[$_])	614	($src->[$_], Digest::MD5::md5_hex $data[$_])
557	} 0.. $#$src;	615	} 0.. $#$src;
558		616
559		617
560	my $dbmd5 = db_get cache => "$id/md5";	618	my $dbmd5 = db_get cache => "$id/md5";
…		…
866	";	924	";
867	die if $@;	925	die if $@;
868	}	926	}
869		927
870	our $override;	928	our $override;
871	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	929	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
872		930
873	sub override {	931	sub override {
874	$override = 1;	932	$override = 1;
875	@invoke_results = ();	933	@INVOKE_RESULTS = (@_);
876	}	934	}
877		935
878	sub do_invoke {	936	sub do_invoke {
879	my $event = shift;	937	my $event = shift;
880	my $callbacks = shift;	938	my $callbacks = shift;
881		939
882	@invoke_results = ();	940	@INVOKE_RESULTS = ();
883		941
884	local $override;	942	local $override;
885		943
886	for (@$callbacks) {	944	for (@$callbacks) {
887	eval { &{$_->[1]} };	945	eval { &{$_->[1]} };
…		…
904		962
905	Generate an object-specific event with the given arguments.	963	Generate an object-specific event with the given arguments.
906		964
907	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	965	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
908	removed in future versions), and there is no public API to access override	966	removed in future versions), and there is no public API to access override
909	results (if you must, access C<@cf::invoke_results> directly).	967	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910		968
911	=back	969	=back
912		970
913	=cut	971	=cut
914		972
915	#############################################################################	973	#############################################################################
916	# object support	974	# object support
		975
		976	sub _object_equal($$);
		977	sub _object_equal($$) {
		978	my ($a, $b) = @_;
		979
		980	return 0 unless (ref $a) eq (ref $b);
		981
		982	if ("HASH" eq ref $a) {
		983	my @ka = keys %$a;
		984	my @kb = keys %$b;
		985
		986	return 0 if @ka != @kb;
		987
		988	for (0 .. $#ka) {
		989	return 0 unless $ka[$_] eq $kb[$_];
		990	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		991	}
		992
		993	} elsif ("ARRAY" eq ref $a) {
		994
		995	return 0 if @$a != @$b;
		996
		997	for (0 .. $#$a) {
		998	return 0 unless _object_equal $a->[$_], $b->[$_];
		999	}
		1000
		1001	} elsif ($a ne $b) {
		1002	return 0;
		1003	}
		1004
		1005	1
		1006	}
		1007
		1008	our $SLOW_MERGES;#d#
		1009	sub _can_merge {
		1010	my ($ob1, $ob2) = @_;
		1011
		1012	++$SLOW_MERGES;#d#
		1013
		1014	# we do the slow way here
		1015	return _object_equal $ob1, $ob2
		1016	}
917		1017
918	sub reattach {	1018	sub reattach {
919	# basically do the same as instantiate, without calling instantiate	1019	# basically do the same as instantiate, without calling instantiate
920	my ($obj) = @_;	1020	my ($obj) = @_;
921		1021
…		…
968	sub object_freezer_save {	1068	sub object_freezer_save {
969	my ($filename, $rdata, $objs) = @_;	1069	my ($filename, $rdata, $objs) = @_;
970		1070
971	sync_job {	1071	sync_job {
972	if (length $$rdata) {	1072	if (length $$rdata) {
		1073	utf8::decode (my $decname = $filename);
973	warn sprintf "saving %s (%d,%d)\n",	1074	warn sprintf "saving %s (%d,%d)\n",
974	$filename, length $$rdata, scalar @$objs;	1075	$decname, length $$rdata, scalar @$objs;
975		1076
976	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1077	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
977	chmod SAVE_MODE, $fh;	1078	chmod SAVE_MODE, $fh;
978	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1079	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
979	aio_fsync $fh if $cf::USE_FSYNC;	1080	aio_fsync $fh if $cf::USE_FSYNC;
980	close $fh;	1081	close $fh;
981		1082
982	if (@$objs) {	1083	if (@$objs) {
983	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {	1084	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {
984	chmod SAVE_MODE, $fh;	1085	chmod SAVE_MODE, $fh;
985	my $data = Storable::nfreeze { version => 1, objs => $objs };	1086	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
986	aio_write $fh, 0, (length $data), $data, 0;	1087	aio_write $fh, 0, (length $data), $data, 0;
987	aio_fsync $fh if $cf::USE_FSYNC;	1088	aio_fsync $fh if $cf::USE_FSYNC;
988	close $fh;	1089	close $fh;
989	aio_rename "$filename.pst~", "$filename.pst";	1090	aio_rename "$filename.pst~", "$filename.pst";
990	}	1091	}
…		…
998	}	1099	}
999	} else {	1100	} else {
1000	aio_unlink $filename;	1101	aio_unlink $filename;
1001	aio_unlink "$filename.pst";	1102	aio_unlink "$filename.pst";
1002	}	1103	}
1003	}	1104	};
1004	}	1105	}
1005		1106
1006	sub object_freezer_as_string {	1107	sub object_freezer_as_string {
1007	my ($rdata, $objs) = @_;	1108	my ($rdata, $objs) = @_;
1008		1109
…		…
1020	or return;	1121	or return;
1021		1122
1022	unless (aio_stat "$filename.pst") {	1123	unless (aio_stat "$filename.pst") {
1023	(aio_load "$filename.pst", $av) >= 0	1124	(aio_load "$filename.pst", $av) >= 0
1024	or return;	1125	or return;
		1126
1025	$av = eval { (Storable::thaw $av)->{objs} };	1127	my $st = eval { Coro::Storable::thaw $av };
		1128	$av = $st->{objs};
1026	}	1129	}
1027		1130
		1131	utf8::decode (my $decname = $filename);
1028	warn sprintf "loading %s (%d)\n",	1132	warn sprintf "loading %s (%d,%d)\n",
1029	$filename, length $data, scalar @{$av \|\| []};	1133	$decname, length $data, scalar @{$av \|\| []};
		1134
1030	return ($data, $av);	1135	($data, $av)
1031	}	1136	}
1032		1137
1033	=head2 COMMAND CALLBACKS	1138	=head2 COMMAND CALLBACKS
1034		1139
1035	=over 4	1140	=over 4
…		…
1108	my ($pl, $buf) = @_;	1213	my ($pl, $buf) = @_;
1109		1214
1110	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1215	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111		1216
1112	if (ref $msg) {	1217	if (ref $msg) {
		1218	my ($type, $reply, @payload) =
		1219	"ARRAY" eq ref $msg
		1220	? @$msg
		1221	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1222
		1223	my @reply;
		1224
1113	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1225	if (my $cb = $EXTCMD{$type}) {
1114	if (my %reply = $cb->($pl, $msg)) {	1226	@reply = $cb->($pl, @payload);
1115	$pl->ext_reply ($msg->{msgid}, %reply);
1116	}
1117	}	1227	}
		1228
		1229	$pl->ext_reply ($reply, @reply)
		1230	if $reply;
		1231
1118	} else {	1232	} else {
1119	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1233	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120	}	1234	}
1121		1235
1122	cf::override;	1236	cf::override;
…		…
1212		1326
1213	=head3 cf::player	1327	=head3 cf::player
1214		1328
1215	=over 4	1329	=over 4
1216		1330
		1331	=item cf::player::num_playing
		1332
		1333	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1334
		1335	=cut
		1336
		1337	sub num_playing {
		1338	scalar grep
		1339	$_->ob->map
		1340	&& !$_->hidden
		1341	&& !$_->ob->flag (cf::FLAG_WIZ),
		1342	cf::player::list
		1343	}
		1344
1217	=item cf::player::find $login	1345	=item cf::player::find $login
1218		1346
1219	Returns the given player object, loading it if necessary (might block).	1347	Returns the given player object, loading it if necessary (might block).
1220		1348
1221	=cut	1349	=cut
…		…
1256	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1384	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1385	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1386	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259	aio_unlink +(playerdir $login) . "/$login.pl";	1387	aio_unlink +(playerdir $login) . "/$login.pl";
1260		1388
1261	my $pl = load_pl path $login	1389	my $f = new_from_file cf::object::thawer path $login
1262	or return;	1390	or return;
		1391
		1392	my $pl = cf::player::load_pl $f
		1393	or return;
		1394	local $cf::PLAYER_LOADING{$login} = $pl;
		1395	$f->resolve_delayed_derefs;
1263	$cf::PLAYER{$login} = $pl	1396	$cf::PLAYER{$login} = $pl
1264	}	1397	}
1265	}	1398	}
1266	}	1399	}
1267		1400
…		…
1277		1410
1278	aio_mkdir playerdir $pl, 0770;	1411	aio_mkdir playerdir $pl, 0770;
1279	$pl->{last_save} = $cf::RUNTIME;	1412	$pl->{last_save} = $cf::RUNTIME;
1280		1413
1281	$pl->save_pl ($path);	1414	$pl->save_pl ($path);
1282	Coro::cede;	1415	cf::cede_to_tick;
1283	}	1416	}
1284		1417
1285	sub new($) {	1418	sub new($) {
1286	my ($login) = @_;	1419	my ($login) = @_;
1287		1420
…		…
1291	$self->{deny_save} = 1;	1424	$self->{deny_save} = 1;
1292		1425
1293	$cf::PLAYER{$login} = $self;	1426	$cf::PLAYER{$login} = $self;
1294		1427
1295	$self	1428	$self
		1429	}
		1430
		1431	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1432
		1433	=cut
		1434
		1435	sub send_msg {
		1436	my $ns = shift->ns
		1437	or return;
		1438	$ns->send_msg (@_);
1296	}	1439	}
1297		1440
1298	=item $pl->quit_character	1441	=item $pl->quit_character
1299		1442
1300	Nukes the player without looking back. If logged in, the connection will	1443	Nukes the player without looking back. If logged in, the connection will
…		…
1355	or return [];	1498	or return [];
1356		1499
1357	my @logins;	1500	my @logins;
1358		1501
1359	for my $login (@$dirs) {	1502	for my $login (@$dirs) {
		1503	my $path = path $login;
		1504
		1505	# a .pst is a dead give-away for a valid player
		1506	unless (-e "$path.pst") {
1360	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1507	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361	aio_read $fh, 0, 512, my $buf, 0 or next;	1508	aio_read $fh, 0, 512, my $buf, 0 or next;
1362	$buf !~ /^password -------------$/m or next; # official not-valid tag	1509	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1510	}
1363		1511
1364	utf8::decode $login;	1512	utf8::decode $login;
1365	push @logins, $login;	1513	push @logins, $login;
1366	}	1514	}
1367		1515
…		…
1405	sub expand_cfpod {	1553	sub expand_cfpod {
1406	((my $self), (local $_)) = @_;	1554	((my $self), (local $_)) = @_;
1407		1555
1408	# escape & and <	1556	# escape & and <
1409	s/&/&/g;	1557	s/&/&/g;
1410	s/(?<![BIUGH])</</g;	1558	s/(?<![BIUGHT])</</g;
1411		1559
1412	# this is buggy, it needs to properly take care of nested <'s	1560	# this is buggy, it needs to properly take care of nested <'s
1413		1561
1414	1 while	1562	1 while
1415	# replace B<>, I<>, U<> etc.	1563	# replace B<>, I<>, U<> etc.
1416	s/B<([^\>]*)>/<b>$1<\/b>/	1564	s/B<([^\>]*)>/<b>$1<\/b>/
1417	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1565	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
1418	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1566	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1567	\|\| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1419	# replace G<male\|female> tags	1568	# replace G<male\|female> tags
1420	\|\| s{G<([^>\|])\\|([^>])>}{	1569	\|\| s{G<([^>\|])\\|([^>])>}{
1421	$self->gender ? $2 : $1	1570	$self->gender ? $2 : $1
1422	}ge	1571	}ge
1423	# replace H<hint text>	1572	# replace H<hint text>
…		…
1444	sub hintmode {	1593	sub hintmode {
1445	$_[0]{hintmode} = $_[1] if @_ > 1;	1594	$_[0]{hintmode} = $_[1] if @_ > 1;
1446	$_[0]{hintmode}	1595	$_[0]{hintmode}
1447	}	1596	}
1448		1597
1449	=item $player->ext_reply ($msgid, %msg)	1598	=item $player->ext_reply ($msgid, @msg)
1450		1599
1451	Sends an ext reply to the player.	1600	Sends an ext reply to the player.
1452		1601
1453	=cut	1602	=cut
1454		1603
1455	sub ext_reply($$%) {	1604	sub ext_reply($$@) {
1456	my ($self, $id, %msg) = @_;	1605	my ($self, $id, @msg) = @_;
1457		1606
1458	$msg{msgid} = $id;	1607	$self->ns->ext_reply ($id, @msg)
1459	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460	}	1608	}
1461		1609
1462	=item $player->ext_event ($type, %msg)	1610	=item $player->ext_msg ($type, @msg)
1463		1611
1464	Sends an ext event to the client.	1612	Sends an ext event to the client.
1465		1613
1466	=cut	1614	=cut
1467		1615
1468	sub ext_event($$%) {	1616	sub ext_msg($$@) {
1469	my ($self, $type, %msg) = @_;	1617	my ($self, $type, @msg) = @_;
1470		1618
1471	$self->ns->ext_event ($type, %msg);	1619	$self->ns->ext_msg ($type, @msg);
1472	}	1620	}
1473		1621
1474	=head3 cf::region	1622	=head3 cf::region
1475		1623
1476	=over 4	1624	=over 4
…		…
1489	my ($path) = @_;	1637	my ($path) = @_;
1490		1638
1491	my ($match, $specificity);	1639	my ($match, $specificity);
1492		1640
1493	for my $region (list) {	1641	for my $region (list) {
1494	if ($region->match && $path =~ $region->match) {	1642	if ($region->{match} && $path =~ $region->{match}) {
1495	($match, $specificity) = ($region, $region->specificity)	1643	($match, $specificity) = ($region, $region->specificity)
1496	if $region->specificity > $specificity;	1644	if $region->specificity > $specificity;
1497	}	1645	}
1498	}	1646	}
1499		1647
…		…
1619	$self->init; # pass $1 etc.	1767	$self->init; # pass $1 etc.
1620	return $self;	1768	return $self;
1621	}	1769	}
1622	}	1770	}
1623		1771
1624	Carp::carp "unable to resolve path '$path' (base '$base').";	1772	Carp::cluck "unable to resolve path '$path' (base '$base').";
1625	()	1773	()
1626	}	1774	}
1627		1775
1628	sub init {	1776	sub init {
1629	my ($self) = @_;	1777	my ($self) = @_;
…		…
1692		1840
1693	sub load_header_from($) {	1841	sub load_header_from($) {
1694	my ($self, $path) = @_;	1842	my ($self, $path) = @_;
1695		1843
1696	utf8::encode $path;	1844	utf8::encode $path;
1697	#aio_open $path, O_RDONLY, 0	1845	my $f = new_from_file cf::object::thawer $path
1698	# or return;
1699
1700	$self->_load_header ($path)
1701	or return;	1846	or return;
		1847
		1848	$self->_load_header ($f)
		1849	or return;
		1850
		1851	local $MAP_LOADING{$self->{path}} = $self;
		1852	$f->resolve_delayed_derefs;
1702		1853
1703	$self->{load_path} = $path;	1854	$self->{load_path} = $path;
1704		1855
1705	1	1856	1
1706	}	1857	}
…		…
1760	sub find {	1911	sub find {
1761	my ($path, $origin) = @_;	1912	my ($path, $origin) = @_;
1762		1913
1763	$path = normalise $path, $origin && $origin->path;	1914	$path = normalise $path, $origin && $origin->path;
1764		1915
		1916	cf::lock_wait "map_data:$path";#d#remove
1765	cf::lock_wait "map_find:$path";	1917	cf::lock_wait "map_find:$path";
1766		1918
1767	$cf::MAP{$path} \|\| do {	1919	$cf::MAP{$path} \|\| do {
1768	my $guard = cf::lock_acquire "map_find:$path";	1920	my $guard1 = cf::lock_acquire "map_find:$path";
		1921	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1922
1769	my $map = new_from_path cf::map $path	1923	my $map = new_from_path cf::map $path
1770	or return;	1924	or return;
1771		1925
1772	$map->{last_save} = $cf::RUNTIME;	1926	$map->{last_save} = $cf::RUNTIME;
1773		1927
…		…
1775	or return;	1929	or return;
1776		1930
1777	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1931	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778	# doing this can freeze the server in a sync job, obviously	1932	# doing this can freeze the server in a sync job, obviously
1779	#$cf::WAIT_FOR_TICK->wait;	1933	#$cf::WAIT_FOR_TICK->wait;
		1934	undef $guard1;
		1935	undef $guard2;
1780	$map->reset;	1936	$map->reset;
1781	undef $guard;
1782	return find $path;	1937	return find $path;
1783	}	1938	}
1784		1939
1785	$cf::MAP{$path} = $map	1940	$cf::MAP{$path} = $map
1786	}	1941	}
…		…
1795	local $self->{deny_reset} = 1; # loading can take a long time	1950	local $self->{deny_reset} = 1; # loading can take a long time
1796		1951
1797	my $path = $self->{path};	1952	my $path = $self->{path};
1798		1953
1799	{	1954	{
1800	my $guard = cf::lock_acquire "map_load:$path";	1955	my $guard = cf::lock_acquire "map_data:$path";
1801		1956
		1957	return unless $self->valid;
1802	return if $self->in_memory != cf::MAP_SWAPPED;	1958	return unless $self->in_memory == cf::MAP_SWAPPED;
1803		1959
1804	$self->in_memory (cf::MAP_LOADING);	1960	$self->in_memory (cf::MAP_LOADING);
1805		1961
1806	$self->alloc;	1962	$self->alloc;
1807		1963
1808	$self->pre_load;	1964	$self->pre_load;
1809	Coro::cede;	1965	cf::cede_to_tick;
1810		1966
		1967	my $f = new_from_file cf::object::thawer $self->{load_path};
		1968	$f->skip_block;
1811	$self->_load_objects ($self->{load_path}, 1)	1969	$self->_load_objects ($f)
1812	or return;	1970	or return;
1813		1971
1814	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1972	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1815	if delete $self->{load_original};	1973	if delete $self->{load_original};
1816		1974
1817	if (my $uniq = $self->uniq_path) {	1975	if (my $uniq = $self->uniq_path) {
1818	utf8::encode $uniq;	1976	utf8::encode $uniq;
1819	if (aio_open $uniq, O_RDONLY, 0) {	1977	unless (aio_stat $uniq) {
		1978	if (my $f = new_from_file cf::object::thawer $uniq) {
1820	$self->clear_unique_items;	1979	$self->clear_unique_items;
1821	$self->_load_objects ($uniq, 0);	1980	$self->_load_objects ($f);
		1981	$f->resolve_delayed_derefs;
		1982	}
1822	}	1983	}
1823	}	1984	}
1824		1985
1825	Coro::cede;	1986	$f->resolve_delayed_derefs;
		1987
		1988	cf::cede_to_tick;
1826	# now do the right thing for maps	1989	# now do the right thing for maps
1827	$self->link_multipart_objects;	1990	$self->link_multipart_objects;
1828	$self->difficulty ($self->estimate_difficulty)	1991	$self->difficulty ($self->estimate_difficulty)
1829	unless $self->difficulty;	1992	unless $self->difficulty;
1830	Coro::cede;	1993	cf::cede_to_tick;
1831		1994
1832	unless ($self->{deny_activate}) {	1995	unless ($self->{deny_activate}) {
1833	$self->decay_objects;	1996	$self->decay_objects;
1834	$self->fix_auto_apply;	1997	$self->fix_auto_apply;
1835	$self->update_buttons;	1998	$self->update_buttons;
1836	Coro::cede;	1999	cf::cede_to_tick;
1837	$self->set_darkness_map;	2000	$self->set_darkness_map;
1838	Coro::cede;	2001	cf::cede_to_tick;
1839	$self->activate;	2002	$self->activate;
1840	}	2003	}
		2004
		2005	$self->{last_save} = $cf::RUNTIME;
		2006	$self->last_access ($cf::RUNTIME);
1841		2007
1842	$self->in_memory (cf::MAP_IN_MEMORY);	2008	$self->in_memory (cf::MAP_IN_MEMORY);
1843	}	2009	}
1844		2010
1845	$self->post_load;	2011	$self->post_load;
…		…
1856		2022
1857	$self	2023	$self
1858	}	2024	}
1859		2025
1860	# find and load all maps in the 3x3 area around a map	2026	# find and load all maps in the 3x3 area around a map
1861	sub load_diag {	2027	sub load_neighbours {
1862	my ($map) = @_;	2028	my ($map) = @_;
1863		2029
1864	my @diag; # diagonal neighbours	2030	my @neigh; # diagonal neighbours
1865		2031
1866	for (0 .. 3) {	2032	for (0 .. 3) {
1867	my $neigh = $map->tile_path ($_)	2033	my $neigh = $map->tile_path ($_)
1868	or next;	2034	or next;
1869	$neigh = find $neigh, $map	2035	$neigh = find $neigh, $map
1870	or next;	2036	or next;
1871	$neigh->load;	2037	$neigh->load;
1872		2038
		2039	push @neigh,
1873	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2040	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1874	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2041	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1875	}	2042	}
1876		2043
1877	for (@diag) {	2044	for (grep defined $_->[0], @neigh) {
		2045	my ($path, $origin) = @$_;
1878	my $neigh = find @$_	2046	my $neigh = find $path, $origin
1879	or next;	2047	or next;
1880	$neigh->load;	2048	$neigh->load;
1881	}	2049	}
1882	}	2050	}
1883		2051
…		…
1888	}	2056	}
1889		2057
1890	sub do_load_sync {	2058	sub do_load_sync {
1891	my ($map) = @_;	2059	my ($map) = @_;
1892		2060
		2061	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2062	if $Coro::current == $Coro::main;
		2063
1893	cf::sync_job { $map->load };	2064	cf::sync_job { $map->load };
1894	}	2065	}
1895		2066
1896	our %MAP_PREFETCH;	2067	our %MAP_PREFETCH;
1897	our $MAP_PREFETCHER = undef;	2068	our $MAP_PREFETCHER = undef;
1898		2069
1899	sub find_async {	2070	sub find_async {
1900	my ($path, $origin) = @_;	2071	my ($path, $origin, $load) = @_;
1901		2072
1902	$path = normalise $path, $origin && $origin->{path};	2073	$path = normalise $path, $origin && $origin->{path};
1903		2074
1904	if (my $map = $cf::MAP{$path}) {	2075	if (my $map = $cf::MAP{$path}) {
1905	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2076	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1906	}	2077	}
1907		2078
1908	undef $MAP_PREFETCH{$path};	2079	$MAP_PREFETCH{$path} \|= $load;
		2080
1909	$MAP_PREFETCHER \|\|= cf::async {	2081	$MAP_PREFETCHER \|\|= cf::async {
		2082	$Coro::current->{desc} = "map prefetcher";
		2083
1910	while (%MAP_PREFETCH) {	2084	while (%MAP_PREFETCH) {
1911	for my $path (keys %MAP_PREFETCH) {	2085	while (my ($k, $v) = each %MAP_PREFETCH) {
1912	my $map = find $path	2086	if (my $map = find $k) {
1913	or next;
1914	$map->load;	2087	$map->load if $v;
		2088	}
1915		2089
1916	delete $MAP_PREFETCH{$path};	2090	delete $MAP_PREFETCH{$k};
1917	}	2091	}
1918	}	2092	}
1919	undef $MAP_PREFETCHER;	2093	undef $MAP_PREFETCHER;
1920	};	2094	};
1921	$MAP_PREFETCHER->prio (6);	2095	$MAP_PREFETCHER->prio (6);
…		…
1924	}	2098	}
1925		2099
1926	sub save {	2100	sub save {
1927	my ($self) = @_;	2101	my ($self) = @_;
1928		2102
1929	my $lock = cf::lock_acquire "map_data:" . $self->path;	2103	my $lock = cf::lock_acquire "map_data:$self->{path}";
1930		2104
1931	$self->{last_save} = $cf::RUNTIME;	2105	$self->{last_save} = $cf::RUNTIME;
1932		2106
1933	return unless $self->dirty;	2107	return unless $self->dirty;
1934		2108
…		…
1940	return if $self->{deny_save};	2114	return if $self->{deny_save};
1941		2115
1942	local $self->{last_access} = $self->last_access;#d#	2116	local $self->{last_access} = $self->last_access;#d#
1943		2117
1944	cf::async {	2118	cf::async {
		2119	$Coro::current->{desc} = "map player save";
1945	$_->contr->save for $self->players;	2120	$_->contr->save for $self->players;
1946	};	2121	};
1947		2122
1948	if ($uniq) {	2123	if ($uniq) {
1949	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	2124	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
…		…
1957	my ($self) = @_;	2132	my ($self) = @_;
1958		2133
1959	# save first because save cedes	2134	# save first because save cedes
1960	$self->save;	2135	$self->save;
1961		2136
1962	my $lock = cf::lock_acquire "map_data:" . $self->path;	2137	my $lock = cf::lock_acquire "map_data:$self->{path}";
1963		2138
1964	return if $self->players;	2139	return if $self->players;
1965	return if $self->in_memory != cf::MAP_IN_MEMORY;	2140	return if $self->in_memory != cf::MAP_IN_MEMORY;
1966	return if $self->{deny_save};	2141	return if $self->{deny_save};
1967		2142
		2143	$self->in_memory (cf::MAP_SWAPPED);
		2144
		2145	$self->deactivate;
		2146	$_->clear_links_to ($self) for values %cf::MAP;
1968	$self->clear;	2147	$self->clear;
1969	$self->in_memory (cf::MAP_SWAPPED);
1970	}	2148	}
1971		2149
1972	sub reset_at {	2150	sub reset_at {
1973	my ($self) = @_;	2151	my ($self) = @_;
1974		2152
…		…
2006	if $uniq;	2184	if $uniq;
2007	}	2185	}
2008		2186
2009	delete $cf::MAP{$self->path};	2187	delete $cf::MAP{$self->path};
2010		2188
		2189	$self->deactivate;
		2190	$_->clear_links_to ($self) for values %cf::MAP;
2011	$self->clear;	2191	$self->clear;
2012
2013	$_->clear_links_to ($self) for values %cf::MAP;
2014		2192
2015	$self->unlink_save;	2193	$self->unlink_save;
2016	$self->destroy;	2194	$self->destroy;
2017	}	2195	}
2018		2196
2019	my $nuke_counter = "aaaa";	2197	my $nuke_counter = "aaaa";
2020		2198
2021	sub nuke {	2199	sub nuke {
2022	my ($self) = @_;	2200	my ($self) = @_;
2023		2201
		2202	{
		2203	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2204
2024	delete $cf::MAP{$self->path};	2205	delete $cf::MAP{$self->path};
2025		2206
2026	$self->unlink_save;	2207	$self->unlink_save;
2027		2208
2028	bless $self, "cf::map";	2209	bless $self, "cf::map";
2029	delete $self->{deny_reset};	2210	delete $self->{deny_reset};
2030	$self->{deny_save} = 1;	2211	$self->{deny_save} = 1;
2031	$self->reset_timeout (1);	2212	$self->reset_timeout (1);
2032	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2213	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033		2214
2034	$cf::MAP{$self->path} = $self;	2215	$cf::MAP{$self->path} = $self;
		2216	}
2035		2217
2036	$self->reset; # polite request, might not happen	2218	$self->reset; # polite request, might not happen
2037	}	2219	}
2038		2220
2039	=item $maps = cf::map::tmp_maps	2221	=item $maps = cf::map::tmp_maps
…		…
2115		2297
2116	sub inv_recursive {	2298	sub inv_recursive {
2117	inv_recursive_ inv $_[0]	2299	inv_recursive_ inv $_[0]
2118	}	2300	}
2119		2301
		2302	=item $ref = $ob->ref
		2303
		2304	creates and returns a persistent reference to an objetc that can be stored as a string.
		2305
		2306	=item $ob = cf::object::deref ($refstring)
		2307
		2308	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2309	even if the object actually exists. May block.
		2310
		2311	=cut
		2312
		2313	sub deref {
		2314	my ($ref) = @_;
		2315
		2316	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2317	my ($uuid, $name) = ($1, $2);
		2318	my $pl = $cf::PLAYER_LOADING{$name} \|\| cf::player::find $name
		2319	or return;
		2320	$pl->ob->uuid eq $uuid
		2321	or return;
		2322
		2323	$pl->ob
		2324	} else {
		2325	warn "$ref: cannot resolve object reference\n";
		2326	undef
		2327	}
		2328	}
		2329
2120	package cf;	2330	package cf;
2121		2331
2122	=back	2332	=back
2123		2333
2124	=head3 cf::object::player	2334	=head3 cf::object::player
…		…
2146		2356
2147	} else {	2357	} else {
2148	my $pl = $self->contr;	2358	my $pl = $self->contr;
2149		2359
2150	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2360	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151	my $diag = $pl->{npc_dialog};	2361	my $dialog = $pl->{npc_dialog};
2152	$diag->{pl}->ext_reply (	2362	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153	$diag->{id},
2154	msgtype => "reply",
2155	msg => $diag->{pl}->expand_cfpod ($msg),
2156	add_topics => []
2157	);
2158		2363
2159	} else {	2364	} else {
2160	$msg = $npc->name . " says: $msg" if $npc;	2365	$msg = $npc->name . " says: $msg" if $npc;
2161	$self->message ($msg, $flags);	2366	$self->message ($msg, $flags);
2162	}	2367	}
2163	}	2368	}
		2369	}
		2370
		2371	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2372
		2373	=cut
		2374
		2375	sub cf::object::send_msg {
		2376	my $pl = shift->contr
		2377	or return;
		2378	$pl->send_msg (@_);
2164	}	2379	}
2165		2380
2166	=item $player_object->may ("access")	2381	=item $player_object->may ("access")
2167		2382
2168	Returns wether the given player is authorized to access resource "access"	2383	Returns wether the given player is authorized to access resource "access"
…		…
2247	# use -1 or undef as default coordinates, not 0, 0	2462	# use -1 or undef as default coordinates, not 0, 0
2248	($x, $y) = ($map->enter_x, $map->enter_y)	2463	($x, $y) = ($map->enter_x, $map->enter_y)
2249	if $x <=0 && $y <= 0;	2464	if $x <=0 && $y <= 0;
2250		2465
2251	$map->load;	2466	$map->load;
2252	$map->load_diag;	2467	$map->load_neighbours;
2253		2468
2254	return unless $self->contr->active;	2469	return unless $self->contr->active;
2255	$self->activate_recursive;	2470	$self->activate_recursive;
2256		2471
2257	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2472	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258	$self->enter_map ($map, $x, $y);	2473	$self->enter_map ($map, $x, $y);
2259	}	2474	}
2260		2475
2261	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2476	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262		2477
2263	Moves the player to the given map-path and coordinates by first freezing	2478	Moves the player to the given map-path and coordinates by first freezing
2264	her, loading and preparing them map, calling the provided $check callback	2479	her, loading and preparing them map, calling the provided $check callback
2265	that has to return the map if sucecssful, and then unfreezes the player on	2480	that has to return the map if sucecssful, and then unfreezes the player on
2266	the new (success) or old (failed) map position.	2481	the new (success) or old (failed) map position. In either case, $done will
		2482	be called at the end of this process.
2267		2483
2268	=cut	2484	=cut
2269		2485
2270	our $GOTOGEN;	2486	our $GOTOGEN;
2271		2487
2272	sub cf::object::player::goto {	2488	sub cf::object::player::goto {
2273	my ($self, $path, $x, $y, $check) = @_;	2489	my ($self, $path, $x, $y, $check, $done) = @_;
2274		2490
2275	# do generation counting so two concurrent goto's will be executed in-order	2491	# do generation counting so two concurrent goto's will be executed in-order
2276	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2492	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277		2493
2278	$self->enter_link;	2494	$self->enter_link;
2279		2495
2280	(async {	2496	(async {
		2497	$Coro::current->{desc} = "player::goto $path $x $y";
		2498
		2499	# *tag paths override both path and x\|y
		2500	if ($path =~ /^\(.)$/) {
		2501	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2502	my $ob = $obs[rand @obs];
		2503
		2504	# see if we actually can go there
		2505	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2506	$ob = $obs[rand @obs];
		2507	} else {
		2508	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE \| cf::NDI_RED);
		2509	}
		2510	# else put us there anyways for now #d#
		2511
		2512	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2513	} else {
		2514	($path, $x, $y) = (undef, undef, undef);
		2515	}
		2516	}
		2517
2281	my $map = eval {	2518	my $map = eval {
2282	my $map = cf::map::find $path;	2519	my $map = defined $path ? cf::map::find $path : undef;
2283		2520
2284	if ($map) {	2521	if ($map) {
2285	$map = $map->customise_for ($self);	2522	$map = $map->customise_for ($self);
2286	$map = $check->($map) if $check && $map;	2523	$map = $check->($map) if $check && $map;
2287	} else {	2524	} else {
2288	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);	2525	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE \| cf::NDI_RED);
2289	}	2526	}
2290		2527
2291	$map	2528	$map
2292	};	2529	};
2293		2530
…		…
2298		2535
2299	if ($gen == $self->{_goto_generation}) {	2536	if ($gen == $self->{_goto_generation}) {
2300	delete $self->{_goto_generation};	2537	delete $self->{_goto_generation};
2301	$self->leave_link ($map, $x, $y);	2538	$self->leave_link ($map, $x, $y);
2302	}	2539	}
		2540
		2541	$done->() if $done;
2303	})->prio (1);	2542	})->prio (1);
2304	}	2543	}
2305		2544
2306	=item $player_object->enter_exit ($exit_object)	2545	=item $player_object->enter_exit ($exit_object)
2307		2546
…		…
2381	# if exit is damned, update players death & WoR home-position	2620	# if exit is damned, update players death & WoR home-position
2382	$self->contr->savebed ($slaying, $hp, $sp)	2621	$self->contr->savebed ($slaying, $hp, $sp)
2383	if $exit->flag (FLAG_DAMNED);	2622	if $exit->flag (FLAG_DAMNED);
2384		2623
2385	(async {	2624	(async {
		2625	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2626
2386	$self->deactivate_recursive; # just to be sure	2627	$self->deactivate_recursive; # just to be sure
2387	unless (eval {	2628	unless (eval {
2388	$self->goto ($slaying, $hp, $sp);	2629	$self->goto ($slaying, $hp, $sp);
2389		2630
2390	1;	2631	1;
…		…
2416		2657
2417	utf8::encode $text;	2658	utf8::encode $text;
2418	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2659	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2419	}	2660	}
2420		2661
2421	=item $client->send_msg ($color, $type, $msg, [extra...])	2662	=item $client->send_msg ($channel, $msg, $color, [extra...])
2422		2663
2423	Send a drawinfo or msg packet to the client, formatting the msg for the	2664	Send a drawinfo or msg packet to the client, formatting the msg for the
2424	client if neccessary. C<$type> should be a string identifying the type of	2665	client if neccessary. C<$type> should be a string identifying the type of
2425	the message, with C<log> being the default. If C<$color> is negative, suppress	2666	the message, with C<log> being the default. If C<$color> is negative, suppress
2426	the message unless the client supports the msg packet.	2667	the message unless the client supports the msg packet.
2427		2668
2428	=cut	2669	=cut
2429		2670
		2671	our %CHANNEL = (
		2672	"c/identify" => {
		2673	id => "infobox",
		2674	title => "Identify",
		2675	reply => undef,
		2676	tooltip => "Items recently identified",
		2677	},
		2678	"c/examine" => {
		2679	id => "infobox",
		2680	title => "Examine",
		2681	reply => undef,
		2682	tooltip => "Signs and other items you examined",
		2683	},
		2684	"c/book" => {
		2685	id => "infobox",
		2686	title => "Book",
		2687	reply => undef,
		2688	tooltip => "The contents of a note or book",
		2689	},
		2690	"c/lookat" => {
		2691	id => "infobox",
		2692	title => "Look",
		2693	reply => undef,
		2694	tooltip => "What you saw there",
		2695	},
		2696	);
		2697
2430	sub cf::client::send_msg {	2698	sub cf::client::send_msg {
2431	my ($self, $color, $type, $msg, @extra) = @_;	2699	my ($self, $channel, $msg, $color, @extra) = @_;
2432		2700
2433	$msg = $self->pl->expand_cfpod ($msg);	2701	$msg = $self->pl->expand_cfpod ($msg);
2434		2702
		2703	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2704
		2705	# check predefined channels, for the benefit of C
		2706	if ($CHANNEL{$channel}) {
		2707	$channel = $CHANNEL{$channel};
		2708
		2709	$self->ext_msg (channel_info => $channel)
		2710	if $self->can_msg;
		2711
		2712	$channel = $channel->{id};
		2713
		2714	} elsif (ref $channel) {
		2715	# send meta info to client, if not yet sent
		2716	unless (exists $self->{channel}{$channel->{id}}) {
		2717	$self->{channel}{$channel->{id}} = $channel;
		2718	$self->ext_msg (channel_info => $channel)
		2719	if $self->can_msg;
		2720	}
		2721
		2722	$channel = $channel->{id};
		2723	}
		2724
2435	return unless @extra \|\| length $msg;	2725	return unless @extra \|\| length $msg;
2436		2726
2437	if ($self->can_msg) {	2727	if ($self->can_msg) {
		2728	# default colour, mask it out
		2729	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
		2730	if $color & cf::NDI_DEF;
		2731
2438	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));	2732	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2733	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2439	} else {	2734	} else {
2440	# replace some tags by gcfclient-compatible ones
2441	for ($msg) {
2442	1 while
2443	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448	}
2449
2450	if ($color >= 0) {	2735	if ($color >= 0) {
		2736	# replace some tags by gcfclient-compatible ones
		2737	for ($msg) {
		2738	1 while
		2739	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2740	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2741	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2742	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2743	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2744	}
		2745
		2746	$color &= cf::NDI_COLOR_MASK;
		2747
		2748	utf8::encode $msg;
		2749
2451	if (0 && $msg =~ /\[/) {	2750	if (0 && $msg =~ /\[/) {
		2751	# COMMAND/INFO
2452	$self->send_packet ("drawextinfo $color 4 0 $msg")	2752	$self->send_packet ("drawextinfo $color 10 8 $msg")
2453	} else {	2753	} else {
2454	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2754	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2455	$self->send_packet ("drawinfo $color $msg")	2755	$self->send_packet ("drawinfo $color $msg")
2456	}	2756	}
2457	}	2757	}
2458	}	2758	}
2459	}	2759	}
2460		2760
2461	=item $client->ext_event ($type, %msg)	2761	=item $client->ext_msg ($type, @msg)
2462		2762
2463	Sends an ext event to the client.	2763	Sends an ext event to the client.
2464		2764
2465	=cut	2765	=cut
2466		2766
2467	sub cf::client::ext_event($$%) {	2767	sub cf::client::ext_msg($$@) {
2468	my ($self, $type, %msg) = @_;	2768	my ($self, $type, @msg) = @_;
2469		2769
		2770	if ($self->extcmd == 2) {
		2771	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2772	} elsif ($self->extcmd == 1) { # TODO: remove
2470	$msg{msgtype} = "event_$type";	2773	push @msg, msgtype => "event_$type";
2471	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2774	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2775	}
		2776	}
		2777
		2778	=item $client->ext_reply ($msgid, @msg)
		2779
		2780	Sends an ext reply to the client.
		2781
		2782	=cut
		2783
		2784	sub cf::client::ext_reply($$@) {
		2785	my ($self, $id, @msg) = @_;
		2786
		2787	if ($self->extcmd == 2) {
		2788	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2789	} elsif ($self->extcmd == 1) {
		2790	#TODO: version 1, remove
		2791	unshift @msg, msgtype => "reply", msgid => $id;
		2792	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2793	}
2472	}	2794	}
2473		2795
2474	=item $success = $client->query ($flags, "text", \&cb)	2796	=item $success = $client->query ($flags, "text", \&cb)
2475		2797
2476	Queues a query to the client, calling the given callback with	2798	Queues a query to the client, calling the given callback with
…		…
2531	my ($ns, $buf) = @_;	2853	my ($ns, $buf) = @_;
2532		2854
2533	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2855	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2534		2856
2535	if (ref $msg) {	2857	if (ref $msg) {
		2858	my ($type, $reply, @payload) =
		2859	"ARRAY" eq ref $msg
		2860	? @$msg
		2861	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2862
		2863	my @reply;
		2864
2536	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2865	if (my $cb = $EXTICMD{$type}) {
2537	if (my %reply = $cb->($ns, $msg)) {	2866	@reply = $cb->($ns, @payload);
2538	$reply{msgid} = $msg->{msgid};
2539	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2540	}
2541	}	2867	}
		2868
		2869	$ns->ext_reply ($reply, @reply)
		2870	if $reply;
		2871
2542	} else {	2872	} else {
2543	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2873	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2544	}	2874	}
2545		2875
2546	cf::override;	2876	cf::override;
…		…
2593	our $safe = new Safe "safe";	2923	our $safe = new Safe "safe";
2594	our $safe_hole = new Safe::Hole;	2924	our $safe_hole = new Safe::Hole;
2595		2925
2596	$SIG{FPE} = 'IGNORE';	2926	$SIG{FPE} = 'IGNORE';
2597		2927
2598	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2928	$safe->permit_only (Opcode::opset qw(
		2929	:base_core :base_mem :base_orig :base_math
		2930	grepstart grepwhile mapstart mapwhile
		2931	sort time
		2932	));
2599		2933
2600	# here we export the classes and methods available to script code	2934	# here we export the classes and methods available to script code
2601		2935
2602	=pod	2936	=pod
2603		2937
2604	The following functions and methods are available within a safe environment:	2938	The following functions and methods are available within a safe environment:
2605		2939
2606	cf::object	2940	cf::object
2607	contr pay_amount pay_player map x y force_find force_add	2941	contr pay_amount pay_player map x y force_find force_add destroy
2608	insert remove	2942	insert remove name archname title slaying race decrease_ob_nr
2609		2943
2610	cf::object::player	2944	cf::object::player
2611	player	2945	player
2612		2946
2613	cf::player	2947	cf::player
…		…
2618		2952
2619	=cut	2953	=cut
2620		2954
2621	for (	2955	for (
2622	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	2956	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2957	insert remove inv name archname title slaying race
2623	insert remove)],	2958	decrease_ob_nr destroy)],
2624	["cf::object::player" => qw(player)],	2959	["cf::object::player" => qw(player)],
2625	["cf::player" => qw(peaceful)],	2960	["cf::player" => qw(peaceful)],
2626	["cf::map" => qw(trigger)],	2961	["cf::map" => qw(trigger)],
2627	) {	2962	) {
2628	no strict 'refs';	2963	no strict 'refs';
…		…
2704	# the server's init and main functions	3039	# the server's init and main functions
2705		3040
2706	sub load_facedata($) {	3041	sub load_facedata($) {
2707	my ($path) = @_;	3042	my ($path) = @_;
2708		3043
		3044	# HACK to clear player env face cache, we need some signal framework
		3045	# for this (global event?)
		3046	%ext::player_env::MUSIC_FACE_CACHE = ();
		3047
		3048	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3049
2709	warn "loading facedata from $path\n";	3050	warn "loading facedata from $path\n";
2710		3051
2711	my $facedata;	3052	my $facedata;
2712	0 < aio_load $path, $facedata	3053	0 < aio_load $path, $facedata
2713	or die "$path: $!";	3054	or die "$path: $!";
2714		3055
2715	$facedata = Coro::Storable::thaw $facedata;	3056	$facedata = Coro::Storable::thaw $facedata;
2716		3057
2717	$facedata->{version} == 2	3058	$facedata->{version} == 2
2718	or cf::cleanup "$path: version mismatch, cannot proceed.";	3059	or cf::cleanup "$path: version mismatch, cannot proceed.";
		3060
		3061	# patch in the exptable
		3062	$facedata->{resource}{"res/exp_table"} = {
		3063	type => FT_RSRC,
		3064	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3065	};
		3066	cf::cede_to_tick;
2719		3067
2720	{	3068	{
2721	my $faces = $facedata->{faceinfo};	3069	my $faces = $facedata->{faceinfo};
2722		3070
2723	while (my ($face, $info) = each %$faces) {	3071	while (my ($face, $info) = each %$faces) {
2724	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3072	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2725	cf::face::set_visibility $idx, $info->{visibility};	3073	cf::face::set_visibility $idx, $info->{visibility};
2726	cf::face::set_magicmap $idx, $info->{magicmap};	3074	cf::face::set_magicmap $idx, $info->{magicmap};
2727	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3075	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2728	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3076	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2729		3077
2730	cf::cede_to_tick;	3078	cf::cede_to_tick;
2731	}	3079	}
2732		3080
2733	while (my ($face, $info) = each %$faces) {	3081	while (my ($face, $info) = each %$faces) {
…		…
2758		3106
2759	{	3107	{
2760	# TODO: for gcfclient pleasure, we should give resources	3108	# TODO: for gcfclient pleasure, we should give resources
2761	# that gcfclient doesn't grok a >10000 face index.	3109	# that gcfclient doesn't grok a >10000 face index.
2762	my $res = $facedata->{resource};	3110	my $res = $facedata->{resource};
2763	my $enc = JSON::XS->new->utf8->canonical;	3111
		3112	my $soundconf = delete $res->{"res/sound.conf"};
2764		3113
2765	while (my ($name, $info) = each %$res) {	3114	while (my ($name, $info) = each %$res) {
2766	my $meta = $enc->encode ({
2767	name => $name,
2768	type => $info->{type},
2769	copyright => $info->{copyright},
2770	});
2771	my $data = pack "(w/a)", $meta, $info->{data};
2772	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2773
2774	use Data::Dumper; warn Dumper substr $data, 0, 100;#d#
2775
2776	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3115	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3116	my $data;
		3117
		3118	if ($info->{type} & 1) {
		3119	# prepend meta info
		3120
		3121	my $meta = $enc->encode ({
		3122	name => $name,
		3123	%{ $info->{meta} \|\| {} },
		3124	});
		3125
		3126	$data = pack "(w/a)", $meta, $info->{data};
		3127	} else {
		3128	$data = $info->{data};
		3129	}
		3130
		3131	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2777	cf::face::set_type $idx, 1;	3132	cf::face::set_type $idx, $info->{type};
2778	cf::face::set_data $idx, 0, $data, $chk;
2779		3133
2780	# TODO
2781	cf::cede_to_tick;	3134	cf::cede_to_tick;
2782	}	3135	}
		3136
		3137	if ($soundconf) {
		3138	$soundconf = $enc->decode (delete $soundconf->{data});
		3139
		3140	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3141	my $sound = $soundconf->{compat}[$_]
		3142	or next;
		3143
		3144	my $face = cf::face::find "sound/$sound->[1]";
		3145	cf::sound::set $sound->[0] => $face;
		3146	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3147	}
		3148
		3149	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3150	my $face = cf::face::find "sound/$v";
		3151	cf::sound::set $k => $face;
		3152	}
		3153	}
2783	}	3154	}
2784		3155
2785	1	3156	1
2786	}	3157	}
2787		3158
		3159	register_exticmd fx_want => sub {
		3160	my ($ns, $want) = @_;
		3161
		3162	while (my ($k, $v) = each %$want) {
		3163	$ns->fx_want ($k, $v);
		3164	}
		3165	};
		3166
2788	sub reload_regions {	3167	sub reload_regions {
		3168	# HACK to clear player env face cache, we need some signal framework
		3169	# for this (global event?)
		3170	%ext::player_env::MUSIC_FACE_CACHE = ();
		3171
2789	load_resource_file "$MAPDIR/regions"	3172	load_resource_file "$MAPDIR/regions"
2790	or die "unable to load regions file\n";	3173	or die "unable to load regions file\n";
		3174
		3175	for (cf::region::list) {
		3176	$_->{match} = qr/$_->{match}/
		3177	if exists $_->{match};
		3178	}
2791	}	3179	}
2792		3180
2793	sub reload_facedata {	3181	sub reload_facedata {
2794	load_facedata "$DATADIR/facedata"	3182	load_facedata "$DATADIR/facedata"
2795	or die "unable to load facedata\n";	3183	or die "unable to load facedata\n";
…		…
2824		3212
2825	sub init {	3213	sub init {
2826	reload_resources;	3214	reload_resources;
2827	}	3215	}
2828		3216
2829	sub cfg_load {	3217	sub reload_config {
2830	open my $fh, "<:utf8", "$CONFDIR/config"	3218	open my $fh, "<:utf8", "$CONFDIR/config"
2831	or return;	3219	or return;
2832		3220
2833	local $/;	3221	local $/;
2834	*CFG = YAML::Syck::Load <$fh>;	3222	*CFG = YAML::Syck::Load <$fh>;
…		…
2850	sub main {	3238	sub main {
2851	# we must not ever block the main coroutine	3239	# we must not ever block the main coroutine
2852	local $Coro::idle = sub {	3240	local $Coro::idle = sub {
2853	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3241	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2854	(async {	3242	(async {
		3243	$Coro::current->{desc} = "IDLE BUG HANDLER";
2855	Event::one_event;	3244	Event::one_event;
2856	})->prio (Coro::PRIO_MAX);	3245	})->prio (Coro::PRIO_MAX);
2857	};	3246	};
2858		3247
2859	cfg_load;	3248	reload_config;
2860	db_init;	3249	db_init;
2861	load_extensions;	3250	load_extensions;
2862		3251
2863	$TICK_WATCHER->start;	3252	$TICK_WATCHER->start;
2864	Event::loop;	3253	Event::loop;
…		…
2931	# and maps saved/destroyed asynchronously.	3320	# and maps saved/destroyed asynchronously.
2932	warn "begin emergency player save\n";	3321	warn "begin emergency player save\n";
2933	for my $login (keys %cf::PLAYER) {	3322	for my $login (keys %cf::PLAYER) {
2934	my $pl = $cf::PLAYER{$login} or next;	3323	my $pl = $cf::PLAYER{$login} or next;
2935	$pl->valid or next;	3324	$pl->valid or next;
		3325	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2936	$pl->save;	3326	$pl->save;
2937	}	3327	}
2938	warn "end emergency player save\n";	3328	warn "end emergency player save\n";
2939		3329
2940	warn "begin emergency map save\n";	3330	warn "begin emergency map save\n";
…		…
2988		3378
2989	warn "flushing outstanding aio requests";	3379	warn "flushing outstanding aio requests";
2990	for (;;) {	3380	for (;;) {
2991	BDB::flush;	3381	BDB::flush;
2992	IO::AIO::flush;	3382	IO::AIO::flush;
2993	Coro::cede;	3383	Coro::cede_notself;
2994	last unless IO::AIO::nreqs \|\| BDB::nreqs;	3384	last unless IO::AIO::nreqs \|\| BDB::nreqs;
2995	warn "iterate...";	3385	warn "iterate...";
2996	}	3386	}
2997		3387
2998	++$RELOAD;	3388	++$RELOAD;
…		…
3057	warn "reloading cf.pm";	3447	warn "reloading cf.pm";
3058	require cf;	3448	require cf;
3059	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3449	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3060		3450
3061	warn "loading config and database again";	3451	warn "loading config and database again";
3062	cf::cfg_load;	3452	cf::reload_config;
3063		3453
3064	warn "loading extensions";	3454	warn "loading extensions";
3065	cf::load_extensions;	3455	cf::load_extensions;
3066		3456
3067	warn "reattaching attachments to objects/players";	3457	warn "reattaching attachments to objects/players";
…		…
3103	register_command "reload" => sub {	3493	register_command "reload" => sub {
3104	my ($who, $arg) = @_;	3494	my ($who, $arg) = @_;
3105		3495
3106	if ($who->flag (FLAG_WIZ)) {	3496	if ($who->flag (FLAG_WIZ)) {
3107	$who->message ("reloading server.");	3497	$who->message ("reloading server.");
		3498	async {
		3499	$Coro::current->{desc} = "perl_reload";
3108	async { reload_perl };	3500	reload_perl;
		3501	};
3109	}	3502	}
3110	};	3503	};
3111		3504
3112	unshift @INC, $LIBDIR;	3505	unshift @INC, $LIBDIR;
3113		3506
…		…
3132	my $signal = new Coro::Signal;	3525	my $signal = new Coro::Signal;
3133	push @WAIT_FOR_TICK_BEGIN, $signal;	3526	push @WAIT_FOR_TICK_BEGIN, $signal;
3134	$signal->wait;	3527	$signal->wait;
3135	}	3528	}
3136		3529
3137	my $min = 1e6;#d#
3138	my $avg = 10;
3139	$TICK_WATCHER = Event->timer (	3530	$TICK_WATCHER = Event->timer (
3140	reentrant => 0,	3531	reentrant => 0,
3141	parked => 1,	3532	parked => 1,
3142	prio => 0,	3533	prio => 0,
3143	at => $NEXT_TICK \|\| $TICK,	3534	at => $NEXT_TICK \|\| $TICK,
…		…
3151		3542
3152	$NOW = $tick_start = Event::time;	3543	$NOW = $tick_start = Event::time;
3153		3544
3154	cf::server_tick; # one server iteration	3545	cf::server_tick; # one server iteration
3155		3546
3156	0 && sync_job {#d#
3157	for(1..10) {
3158	my $t = Event::time;
3159	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3160	or die;
3161
3162	$map->width (50);
3163	$map->height (50);
3164	$map->alloc;
3165	$map->_load_objects ("/tmp/x.map", 1);
3166	my $t = Event::time - $t;
3167
3168	#next unless $t < 0.0013;#d#
3169	if ($t < $min) {
3170	$min = $t;
3171	}
3172	$avg = $avg * 0.99 + $t * 0.01;
3173	}
3174	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3175	exit 0;
3176	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3177	};
3178
3179	$RUNTIME += $TICK;	3547	$RUNTIME += $TICK;
3180	$NEXT_TICK += $TICK;	3548	$NEXT_TICK += $TICK;
3181		3549
3182	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3550	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3183	$NEXT_RUNTIME_WRITE = $NOW + 10;	3551	$NEXT_RUNTIME_WRITE = $NOW + 10;
3184	Coro::async_pool {	3552	Coro::async_pool {
		3553	$Coro::current->{desc} = "runtime saver";
3185	write_runtime	3554	write_runtime
3186	or warn "ERROR: unable to write runtime file: $!";	3555	or warn "ERROR: unable to write runtime file: $!";
3187	};	3556	};
3188	}	3557	}
3189		3558
3190	# my $AFTER = Event::time;
3191	# warn $AFTER - $NOW;#d#
3192
3193	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3559	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3194	$sig->send;	3560	$sig->send;
3195	}	3561	}
3196	while (my $sig = shift @WAIT_FOR_TICK) {	3562	while (my $sig = shift @WAIT_FOR_TICK) {
3197	$sig->send;	3563	$sig->send;
…		…
3207		3573
3208	$LOAD = ($NOW - $tick_start) / $TICK;	3574	$LOAD = ($NOW - $tick_start) / $TICK;
3209	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3575	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3210		3576
3211	_post_tick;	3577	_post_tick;
3212
3213
3214	},	3578	},
3215	);	3579	);
3216		3580
3217	{	3581	{
		3582	BDB::min_parallel 8;
3218	BDB::max_poll_time $TICK * 0.1;	3583	BDB::max_poll_time $TICK * 0.1;
3219	$BDB_POLL_WATCHER = Event->io (	3584	$BDB_POLL_WATCHER = Event->io (
3220	reentrant => 0,	3585	reentrant => 0,
3221	fd => BDB::poll_fileno,	3586	fd => BDB::poll_fileno,
3222	poll => 'r',	3587	poll => 'r',
3223	prio => 0,	3588	prio => 0,
3224	data => WF_AUTOCANCEL,	3589	data => WF_AUTOCANCEL,
3225	cb => \&BDB::poll_cb,	3590	cb => \&BDB::poll_cb,
3226	);	3591	);
3227	BDB::min_parallel 8;
3228		3592
3229	BDB::set_sync_prepare {	3593	BDB::set_sync_prepare {
3230	my $status;	3594	my $status;
3231	my $current = $Coro::current;	3595	my $current = $Coro::current;
3232	(	3596	(
…		…
3241	)	3605	)
3242	};	3606	};
3243		3607
3244	unless ($DB_ENV) {	3608	unless ($DB_ENV) {
3245	$DB_ENV = BDB::db_env_create;	3609	$DB_ENV = BDB::db_env_create;
		3610	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC
		3611	\| BDB::LOG_AUTOREMOVE, 1);
		3612	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3613	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3246		3614
3247	cf::sync_job {	3615	cf::sync_job {
3248	eval {	3616	eval {
3249	BDB::db_env_open	3617	BDB::db_env_open
3250	$DB_ENV,	3618	$DB_ENV,
…		…
3252	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN	3620	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN
3253	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3621	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3254	0666;	3622	0666;
3255		3623
3256	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3624	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3257
3258	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
3259	$DB_ENV->set_lk_detect;
3260	};	3625	};
3261		3626
3262	cf::cleanup "db_env_open(db): $@" if $@;	3627	cf::cleanup "db_env_open(db): $@" if $@;
3263	};	3628	};
3264	}	3629	}
		3630
		3631	$BDB_DEADLOCK_WATCHER = Event->timer (
		3632	after => 3,
		3633	interval => 1,
		3634	hard => 1,
		3635	prio => 0,
		3636	data => WF_AUTOCANCEL,
		3637	cb => sub {
		3638	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3639	},
		3640	);
		3641	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3642	after => 11,
		3643	interval => 60,
		3644	hard => 1,
		3645	prio => 0,
		3646	data => WF_AUTOCANCEL,
		3647	cb => sub {
		3648	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3649	},
		3650	);
		3651	$BDB_TRICKLE_WATCHER = Event->timer (
		3652	after => 5,
		3653	interval => 10,
		3654	hard => 1,
		3655	prio => 0,
		3656	data => WF_AUTOCANCEL,
		3657	cb => sub {
		3658	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3659	},
		3660	);
3265	}	3661	}
3266		3662
3267	{	3663	{
3268	IO::AIO::min_parallel 8;	3664	IO::AIO::min_parallel 8;
3269		3665
…		…
3272	$AIO_POLL_WATCHER = Event->io (	3668	$AIO_POLL_WATCHER = Event->io (
3273	reentrant => 0,	3669	reentrant => 0,
3274	data => WF_AUTOCANCEL,	3670	data => WF_AUTOCANCEL,
3275	fd => IO::AIO::poll_fileno,	3671	fd => IO::AIO::poll_fileno,
3276	poll => 'r',	3672	poll => 'r',
3277	prio => 6,	3673	prio => 0,
3278	cb => \&IO::AIO::poll_cb,	3674	cb => \&IO::AIO::poll_cb,
3279	);	3675	);
3280	}	3676	}
3281		3677
3282	my $_log_backtrace;	3678	my $_log_backtrace;
…		…
3288		3684
3289	# limit the # of concurrent backtraces	3685	# limit the # of concurrent backtraces
3290	if ($_log_backtrace < 2) {	3686	if ($_log_backtrace < 2) {
3291	++$_log_backtrace;	3687	++$_log_backtrace;
3292	async {	3688	async {
		3689	$Coro::current->{desc} = "abt $msg";
		3690
3293	my @bt = fork_call {	3691	my @bt = fork_call {
3294	@addr = map { sprintf "%x", $_ } @addr;	3692	@addr = map { sprintf "%x", $_ } @addr;
3295	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3693	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3296	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"	3694	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"
3297	or die "addr2line: $!";	3695	or die "addr2line: $!";

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.302 by root, Tue Jul 10 16:23:59 2007 UTC vs. Revision 1.389 by root, Sat Oct 20 04:39:57 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.302 by root, Tue Jul 10 16:23:59 2007 UTC vs.
Revision 1.389 by root, Sat Oct 20 04:39:57 2007 UTC