ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.312 by root, Sat Jul 21 18:01:26 2007 UTC vs.
Revision 1.395 by root, Sat Nov 10 22:41:59 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
…		…
158		162
159	The raw value load value from the last tick.	163	The raw value load value from the last tick.
160		164
161	=item %cf::CFG	165	=item %cf::CFG
162		166
163	Configuration for the server, loaded from C</etc/crossfire/config>, or	167	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164	from wherever your confdir points to.	168	from wherever your confdir points to.
165		169
166	=item cf::wait_for_tick, cf::wait_for_tick_begin	170	=item cf::wait_for_tick, cf::wait_for_tick_begin
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
…		…
186	$msg .= "\n"	190	$msg .= "\n"
187	unless $msg =~ /\n$/;	191	unless $msg =~ /\n$/;
188		192
189	$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;
190		194
191	utf8::encode $msg;
192	LOG llevError, $msg;	195	LOG llevError, $msg;
193	};	196	};
194	}	197	}
195		198
196	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	199	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
271	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
272	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,
273	for example when the coroutine gets canceled), the lock is automatically	276	for example when the coroutine gets canceled), the lock is automatically
274	returned.	277	returned.
275		278
		279	Locks are *not* recursive, locking from the same coro twice results in a
		280	deadlocked coro.
		281
276	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
277	uses map_find and cf::map::load uses map_load).	283	uses map_find and cf::map::load uses map_load).
278		284
279	=item $locked = cf::lock_active $string	285	=item $locked = cf::lock_active $string
280		286
281	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.
282		288
283	=cut	289	=cut
284		290
285	our %LOCK;	291	our %LOCK;
		292	our %LOCKER;#d#
286		293
287	sub lock_wait($) {	294	sub lock_wait($) {
288	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#
289		301
290	# wait for lock, if any	302	# wait for lock, if any
291	while ($LOCK{$key}) {	303	while ($LOCK{$key}) {
292	push @{ $LOCK{$key} }, $Coro::current;	304	push @{ $LOCK{$key} }, $Coro::current;
293	Coro::schedule;	305	Coro::schedule;
…		…
299		311
300	# wait, to be sure we are not locked	312	# wait, to be sure we are not locked
301	lock_wait $key;	313	lock_wait $key;
302		314
303	$LOCK{$key} = [];	315	$LOCK{$key} = [];
		316	$LOCKER{$key} = $Coro::current;#d#
304		317
305	Coro::guard {	318	Coro::guard {
		319	delete $LOCKER{$key};#d#
306	# wake up all waiters, to be on the safe side	320	# wake up all waiters, to be on the safe side
307	$_->ready for @{ delete $LOCK{$key} };	321	$_->ready for @{ delete $LOCK{$key} };
308	}	322	}
309	}	323	}
310		324
…		…
322	};	336	};
323	$TICK_WATCHER->stop;	337	$TICK_WATCHER->stop;
324	$guard	338	$guard
325	}	339	}
326		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
327	=item cf::async { BLOCK }	399	=item cf::async { BLOCK }
328		400
329	Currently the same as Coro::async_pool, meaning you cannot use	401	Currently the same as Coro::async_pool, meaning you cannot use
330	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
331	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.
…		…
334		406
335	BEGIN { *async = \&Coro::async_pool }	407	BEGIN { *async = \&Coro::async_pool }
336		408
337	=item cf::sync_job { BLOCK }	409	=item cf::sync_job { BLOCK }
338		410
339	The design of Crossfire TRT requires that the main coroutine ($Coro::main)	411	The design of Deliantra requires that the main coroutine ($Coro::main)
340	is always able to handle events or runnable, as Crossfire TRT is only	412	is always able to handle events or runnable, as Deliantra is only
341	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not	413	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
342	acceptable.	414	acceptable.
343		415
344	If it must be done, put the blocking parts into C<sync_job>. This will run	416	If it must be done, put the blocking parts into C<sync_job>. This will run
345	the given BLOCK in another coroutine while waiting for the result. The	417	the given BLOCK in another coroutine while waiting for the result. The
…		…
355	my $time = Event::time;	427	my $time = Event::time;
356		428
357	# this is the main coro, too bad, we have to block	429	# this is the main coro, too bad, we have to block
358	# till the operation succeeds, freezing the server :/	430	# till the operation succeeds, freezing the server :/
359		431
		432	LOG llevError, Carp::longmess "sync job";#d#
		433
360	# TODO: use suspend/resume instead	434	# TODO: use suspend/resume instead
361	# (but this is cancel-safe)	435	# (but this is cancel-safe)
362	my $freeze_guard = freeze_mainloop;	436	my $freeze_guard = freeze_mainloop;
363		437
364	my $busy = 1;	438	my $busy = 1;
365	my @res;	439	my @res;
366		440
367	(async {	441	(async {
		442	$Coro::current->desc ("sync job coro");
368	@res = eval { $job->() };	443	@res = eval { $job->() };
369	warn $@ if $@;	444	warn $@ if $@;
370	undef $busy;	445	undef $busy;
371	})->prio (Coro::PRIO_MAX);	446	})->prio (Coro::PRIO_MAX);
372		447
373	while ($busy) {	448	while ($busy) {
		449	if (Coro::nready) {
		450	Coro::cede_notself;
		451	} else {
374	Coro::cede or Event::one_event;	452	Event::one_event;
		453	}
375	}	454	}
376		455
377	$time = Event::time - $time;	456	$time = Event::time - $time;
378		457
379	LOG llevError | logBacktrace, Carp::longmess "long sync job"	458	LOG llevError | logBacktrace, Carp::longmess "long sync job"
…		…
416	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
417	never block itself or use any form of Event handling.	496	never block itself or use any form of Event handling.
418		497
419	=cut	498	=cut
420		499
421	sub _store_scalar {
422	open my $fh, ">", \my $buf
423	or die "fork_call: cannot open fh-to-buf in child : $!";
424	Storable::store_fd $_[0], $fh;
425	close $fh;
426
427	$buf
428	}
429
430	sub fork_call(&@) {	500	sub fork_call(&@) {
431	my ($cb, @args) = @_;	501	my ($cb, @args) = @_;
432		502
433	# 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,
434	# or die "socketpair: $!";	504	# otherwise perl prematurely frees the stuff :/
435	pipe my $fh1, my $fh2	505	# TODO: investigate and fix (likely this will be rather laborious)
436	or die "pipe: $!";
437		506
438	if (my $pid = fork) {	507	my @res = Coro::Util::fork_eval {
439	close $fh2;
440
441	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442	warn "pst<$res>" unless $res =~ /^pst/;
443	$res = Coro::Storable::thaw $res;
444
445	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447	Carp::confess $$res unless "ARRAY" eq ref $res;
448
449	return wantarray ? @$res : $res->[-1];
450	} else {
451	reset_signals;	508	reset_signals;
452	local $SIG{__WARN__};	509	&$cb
453	local $SIG{__DIE__};	510	}, @args;
454	# just in case, this hack effectively disables event
455	# in the child. cleaner and slower would be canceling all watchers,
456	# but this works for the time being.
457	local $Coro::idle;
458	$Coro::current->prio (Coro::PRIO_MAX);
459		511
460	eval {	512	wantarray ? @res : $res[-1]
461	close $fh1;
462
463	my @res = eval { $cb->(@args) };
464
465	syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466	close $fh2;
467	};
468
469	warn $@ if $@;
470	_exit 0;
471	}
472	}	513	}
473		514
474	=item $value = cf::db_get $family => $key	515	=item $value = cf::db_get $family => $key
475		516
476	Returns a single value from the environment database.	517	Returns a single value from the environment database.
…		…
478	=item cf::db_put $family => $key => $value	519	=item cf::db_put $family => $key => $value
479		520
480	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
481	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).
482		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
483	=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	}
484		547
485	our $DB;	548	our $DB;
486		549
487	sub db_init {	550	sub db_init {
488	unless ($DB) {
489	$DB = BDB::db_create $DB_ENV;
490
491	cf::sync_job {	551	cf::sync_job {
492	eval {	552	$DB ||= db_table "db";
493	$DB->set_flags (BDB::CHKSUM);
494
495	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
496	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
497	cf::cleanup "db_open(db): $!" if $!;
498	};
499	cf::cleanup "db_open(db): $@" if $@;
500	};
501	}	553	};
502	}	554	}
503		555
504	sub db_get($$) {	556	sub db_get($$) {
505	my $key = "$_[0]/$_[1]";	557	my $key = "$_[0]/$_[1]";
506		558
…		…
556	if (1) {	608	if (1) {
557	$md5 =	609	$md5 =
558	join "\x00",	610	join "\x00",
559	$processversion,	611	$processversion,
560	map {	612	map {
561	Coro::cede;	613	cf::cede_to_tick;
562	($src->[$_], Digest::MD5::md5_hex $data[$_])	614	($src->[$_], Digest::MD5::md5_hex $data[$_])
563	} 0.. $#$src;	615	} 0.. $#$src;
564		616
565		617
566	my $dbmd5 = db_get cache => "$id/md5";	618	my $dbmd5 = db_get cache => "$id/md5";
…		…
610	attach callbacks/event handlers (a collection of which is called an "attachment")	662	attach callbacks/event handlers (a collection of which is called an "attachment")
611	to it. All such attachable objects support the following methods.	663	to it. All such attachable objects support the following methods.
612		664
613	In the following description, CLASS can be any of C<global>, C<object>	665	In the following description, CLASS can be any of C<global>, C<object>
614	C<player>, C<client> or C<map> (i.e. the attachable objects in	666	C<player>, C<client> or C<map> (i.e. the attachable objects in
615	Crossfire TRT).	667	Deliantra).
616		668
617	=over 4	669	=over 4
618		670
619	=item $attachable->attach ($attachment, key => $value...)	671	=item $attachable->attach ($attachment, key => $value...)
620		672
…		…
918		970
919	=cut	971	=cut
920		972
921	#############################################################################	973	#############################################################################
922	# object support	974	# object support
923	#
924		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#
925	sub _can_merge {	1009	sub _can_merge {
926	my ($ob1, $ob2) = @_;	1010	my ($ob1, $ob2) = @_;
927		1011
928	local $Storable::canonical = 1;	1012	++$SLOW_MERGES;#d#
929	my $fob1 = Storable::freeze $ob1;
930	my $fob2 = Storable::freeze $ob2;
931		1013
932	$fob1 eq $fob2	1014	# we do the slow way here
		1015	return _object_equal $ob1, $ob2
933	}	1016	}
934		1017
935	sub reattach {	1018	sub reattach {
936	# basically do the same as instantiate, without calling instantiate	1019	# basically do the same as instantiate, without calling instantiate
937	my ($obj) = @_;	1020	my ($obj) = @_;
…		…
985	sub object_freezer_save {	1068	sub object_freezer_save {
986	my ($filename, $rdata, $objs) = @_;	1069	my ($filename, $rdata, $objs) = @_;
987		1070
988	sync_job {	1071	sync_job {
989	if (length $$rdata) {	1072	if (length $$rdata) {
		1073	utf8::decode (my $decname = $filename);
990	warn sprintf "saving %s (%d,%d)\n",	1074	warn sprintf "saving %s (%d,%d)\n",
991	$filename, length $$rdata, scalar @$objs;	1075	$decname, length $$rdata, scalar @$objs;
992		1076
993	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1077	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
994	chmod SAVE_MODE, $fh;	1078	chmod SAVE_MODE, $fh;
995	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1079	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
996	aio_fsync $fh if $cf::USE_FSYNC;	1080	aio_fsync $fh if $cf::USE_FSYNC;
997	close $fh;	1081	close $fh;
998		1082
999	if (@$objs) {	1083	if (@$objs) {
1000	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) {
1001	chmod SAVE_MODE, $fh;	1085	chmod SAVE_MODE, $fh;
1002	my $data = Storable::nfreeze { version => 1, objs => $objs };	1086	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1003	aio_write $fh, 0, (length $data), $data, 0;	1087	aio_write $fh, 0, (length $data), $data, 0;
1004	aio_fsync $fh if $cf::USE_FSYNC;	1088	aio_fsync $fh if $cf::USE_FSYNC;
1005	close $fh;	1089	close $fh;
1006	aio_rename "$filename.pst~", "$filename.pst";	1090	aio_rename "$filename.pst~", "$filename.pst";
1007	}	1091	}
…		…
1015	}	1099	}
1016	} else {	1100	} else {
1017	aio_unlink $filename;	1101	aio_unlink $filename;
1018	aio_unlink "$filename.pst";	1102	aio_unlink "$filename.pst";
1019	}	1103	}
1020	}	1104	};
1021	}	1105	}
1022		1106
1023	sub object_freezer_as_string {	1107	sub object_freezer_as_string {
1024	my ($rdata, $objs) = @_;	1108	my ($rdata, $objs) = @_;
1025		1109
…		…
1037	or return;	1121	or return;
1038		1122
1039	unless (aio_stat "$filename.pst") {	1123	unless (aio_stat "$filename.pst") {
1040	(aio_load "$filename.pst", $av) >= 0	1124	(aio_load "$filename.pst", $av) >= 0
1041	or return;	1125	or return;
		1126
1042	$av = eval { (Storable::thaw $av)->{objs} };	1127	my $st = eval { Coro::Storable::thaw $av };
		1128	$av = $st->{objs};
1043	}	1129	}
1044		1130
		1131	utf8::decode (my $decname = $filename);
1045	warn sprintf "loading %s (%d)\n",	1132	warn sprintf "loading %s (%d,%d)\n",
1046	$filename, length $data, scalar @{$av || []};	1133	$decname, length $data, scalar @{$av || []};
		1134
1047	return ($data, $av);	1135	($data, $av)
1048	}	1136	}
1049		1137
1050	=head2 COMMAND CALLBACKS	1138	=head2 COMMAND CALLBACKS
1051		1139
1052	=over 4	1140	=over 4
…		…
1125	my ($pl, $buf) = @_;	1213	my ($pl, $buf) = @_;
1126		1214
1127	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1215	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1128		1216
1129	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
1130	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1225	if (my $cb = $EXTCMD{$type}) {
1131	if (my %reply = $cb->($pl, $msg)) {	1226	@reply = $cb->($pl, @payload);
1132	$pl->ext_reply ($msg->{msgid}, %reply);
1133	}
1134	}	1227	}
		1228
		1229	$pl->ext_reply ($reply, @reply)
		1230	if $reply;
		1231
1135	} else {	1232	} else {
1136	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1233	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1137	}	1234	}
1138		1235
1139	cf::override;	1236	cf::override;
…		…
1229		1326
1230	=head3 cf::player	1327	=head3 cf::player
1231		1328
1232	=over 4	1329	=over 4
1233		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
1234	=item cf::player::find $login	1345	=item cf::player::find $login
1235		1346
1236	Returns the given player object, loading it if necessary (might block).	1347	Returns the given player object, loading it if necessary (might block).
1237		1348
1238	=cut	1349	=cut
…		…
1273	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1384	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1274	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1385	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1275	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1386	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1276	aio_unlink +(playerdir $login) . "/$login.pl";	1387	aio_unlink +(playerdir $login) . "/$login.pl";
1277		1388
1278	my $pl = load_pl path $login	1389	my $f = new_from_file cf::object::thawer path $login
1279	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;
1280	$cf::PLAYER{$login} = $pl	1396	$cf::PLAYER{$login} = $pl
1281	}	1397	}
1282	}	1398	}
1283	}	1399	}
1284		1400
…		…
1294		1410
1295	aio_mkdir playerdir $pl, 0770;	1411	aio_mkdir playerdir $pl, 0770;
1296	$pl->{last_save} = $cf::RUNTIME;	1412	$pl->{last_save} = $cf::RUNTIME;
1297		1413
1298	$pl->save_pl ($path);	1414	$pl->save_pl ($path);
1299	Coro::cede;	1415	cf::cede_to_tick;
1300	}	1416	}
1301		1417
1302	sub new($) {	1418	sub new($) {
1303	my ($login) = @_;	1419	my ($login) = @_;
1304		1420
…		…
1308	$self->{deny_save} = 1;	1424	$self->{deny_save} = 1;
1309		1425
1310	$cf::PLAYER{$login} = $self;	1426	$cf::PLAYER{$login} = $self;
1311		1427
1312	$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 (@_);
1313	}	1439	}
1314		1440
1315	=item $pl->quit_character	1441	=item $pl->quit_character
1316		1442
1317	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
…		…
1372	or return [];	1498	or return [];
1373		1499
1374	my @logins;	1500	my @logins;
1375		1501
1376	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") {
1377	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1507	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1378	aio_read $fh, 0, 512, my $buf, 0 or next;	1508	aio_read $fh, 0, 512, my $buf, 0 or next;
1379	$buf !~ /^password -------------$/m or next; # official not-valid tag	1509	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1510	}
1380		1511
1381	utf8::decode $login;	1512	utf8::decode $login;
1382	push @logins, $login;	1513	push @logins, $login;
1383	}	1514	}
1384		1515
…		…
1417		1548
1418	Expand crossfire pod fragments into protocol xml.	1549	Expand crossfire pod fragments into protocol xml.
1419		1550
1420	=cut	1551	=cut
1421		1552
		1553	use re 'eval';
		1554
		1555	my $group;
		1556	my $interior; $interior = qr{
		1557	# match a pod interior sequence sans C<< >>
		1558	(?:
		1559	\ (.*?)\ (?{ $group = $^N })
		1560	| < (??{$interior}) >
		1561	)
		1562	}x;
		1563
1422	sub expand_cfpod {	1564	sub expand_cfpod {
1423	((my $self), (local $_)) = @_;	1565	my ($self, $pod) = @_;
1424		1566
1425	# escape & and <	1567	my $xml;
1426	s/&/&amp;/g;
1427	s/(?<![BIUGH])</&lt;/g;
1428		1568
1429	# this is buggy, it needs to properly take care of nested <'s	1569	while () {
		1570	if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
		1571	$group = $1;
1430		1572
1431	1 while	1573	$group =~ s/&/&amp;/g;
1432	# replace B<>, I<>, U<> etc.	1574	$group =~ s/</&lt;/g;
1433	s/B<([^\>]*)>/<b>$1<\/b>/	1575
1434	|| s/I<([^\>]*)>/<i>$1<\/i>/	1576	$xml .= $group;
1435	|| s/U<([^\>]*)>/<u>$1<\/u>/	1577	} elsif ($pod =~ m%\G
1436	# replace G<male|female> tags	1578	([BCGHITU])
1437	|| s{G<([^>|]*)\|([^>]*)>}{	1579	<
1438	$self->gender ? $2 : $1	1580	(?:
1439	}ge	1581	([^<>]*) (?{ $group = $^N })
1440	# replace H<hint text>	1582	| < $interior >
1441	|| s{H<([^\>]*)>}	1583	)
		1584	>
		1585	%gcsx
1442	{	1586	) {
		1587	my ($code, $data) = ($1, $group);
		1588
		1589	if ($code eq "B") {
		1590	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
		1591	} elsif ($code eq "I") {
		1592	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
		1593	} elsif ($code eq "U") {
		1594	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
		1595	} elsif ($code eq "C") {
		1596	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
		1597	} elsif ($code eq "T") {
		1598	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
		1599	} elsif ($code eq "G") {
		1600	my ($male, $female) = split /\|/, $data;
		1601	$data = $self->gender ? $female : $male;
		1602	$xml .= expand_cfpod ($self, $data);
		1603	} elsif ($code eq "H") {
1443	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",	1604	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1444	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",	1605	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1445	"")	1606	"")
1446	[$self->{hintmode}]	1607	[$self->{hintmode}];
		1608	} else {
		1609	$xml .= "error processing '$code($data)' directive";
1447	}ge;	1610	}
		1611	} else {
		1612	if ($pod =~ /\G(.+)/) {
		1613	warn "parse error while expanding $pod (at $1)";
		1614	}
		1615	last;
		1616	}
		1617	}
1448		1618
		1619	for ($xml) {
1449	# create single paragraphs (very hackish)	1620	# create single paragraphs (very hackish)
1450	s/(?<=\S)\n(?=\w)/ /g;	1621	s/(?<=\S)\n(?=\w)/ /g;
1451		1622
1452	# compress some whitespace	1623	# compress some whitespace
1453	s/\s+\n/\n/g; # ws line-ends	1624	s/\s+\n/\n/g; # ws line-ends
1454	s/\n\n+/\n/g; # double lines	1625	s/\n\n+/\n/g; # double lines
1455	s/^\n+//; # beginning lines	1626	s/^\n+//; # beginning lines
1456	s/\n+$//; # ending lines	1627	s/\n+$//; # ending lines
		1628	}
1457		1629
1458	$_	1630	$xml
1459	}	1631	}
		1632
		1633	no re 'eval';
1460		1634
1461	sub hintmode {	1635	sub hintmode {
1462	$_[0]{hintmode} = $_[1] if @_ > 1;	1636	$_[0]{hintmode} = $_[1] if @_ > 1;
1463	$_[0]{hintmode}	1637	$_[0]{hintmode}
1464	}	1638	}
1465		1639
1466	=item $player->ext_reply ($msgid, %msg)	1640	=item $player->ext_reply ($msgid, @msg)
1467		1641
1468	Sends an ext reply to the player.	1642	Sends an ext reply to the player.
1469		1643
1470	=cut	1644	=cut
1471		1645
1472	sub ext_reply($$%) {	1646	sub ext_reply($$@) {
1473	my ($self, $id, %msg) = @_;	1647	my ($self, $id, @msg) = @_;
1474		1648
1475	$msg{msgid} = $id;	1649	$self->ns->ext_reply ($id, @msg)
1476	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1477	}	1650	}
1478		1651
1479	=item $player->ext_event ($type, %msg)	1652	=item $player->ext_msg ($type, @msg)
1480		1653
1481	Sends an ext event to the client.	1654	Sends an ext event to the client.
1482		1655
1483	=cut	1656	=cut
1484		1657
1485	sub ext_event($$%) {	1658	sub ext_msg($$@) {
1486	my ($self, $type, %msg) = @_;	1659	my ($self, $type, @msg) = @_;
1487		1660
1488	$self->ns->ext_event ($type, %msg);	1661	$self->ns->ext_msg ($type, @msg);
1489	}	1662	}
1490		1663
1491	=head3 cf::region	1664	=head3 cf::region
1492		1665
1493	=over 4	1666	=over 4
…		…
1709		1882
1710	sub load_header_from($) {	1883	sub load_header_from($) {
1711	my ($self, $path) = @_;	1884	my ($self, $path) = @_;
1712		1885
1713	utf8::encode $path;	1886	utf8::encode $path;
1714	#aio_open $path, O_RDONLY, 0	1887	my $f = new_from_file cf::object::thawer $path
1715	# or return;
1716
1717	$self->_load_header ($path)
1718	or return;	1888	or return;
		1889
		1890	$self->_load_header ($f)
		1891	or return;
		1892
		1893	local $MAP_LOADING{$self->{path}} = $self;
		1894	$f->resolve_delayed_derefs;
1719		1895
1720	$self->{load_path} = $path;	1896	$self->{load_path} = $path;
1721		1897
1722	1	1898	1
1723	}	1899	}
…		…
1777	sub find {	1953	sub find {
1778	my ($path, $origin) = @_;	1954	my ($path, $origin) = @_;
1779		1955
1780	$path = normalise $path, $origin && $origin->path;	1956	$path = normalise $path, $origin && $origin->path;
1781		1957
		1958	cf::lock_wait "map_data:$path";#d#remove
1782	cf::lock_wait "map_find:$path";	1959	cf::lock_wait "map_find:$path";
1783		1960
1784	$cf::MAP{$path} || do {	1961	$cf::MAP{$path} || do {
1785	my $guard = cf::lock_acquire "map_find:$path";	1962	my $guard1 = cf::lock_acquire "map_find:$path";
		1963	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1964
1786	my $map = new_from_path cf::map $path	1965	my $map = new_from_path cf::map $path
1787	or return;	1966	or return;
1788		1967
1789	$map->{last_save} = $cf::RUNTIME;	1968	$map->{last_save} = $cf::RUNTIME;
1790		1969
…		…
1792	or return;	1971	or return;
1793		1972
1794	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1973	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1795	# doing this can freeze the server in a sync job, obviously	1974	# doing this can freeze the server in a sync job, obviously
1796	#$cf::WAIT_FOR_TICK->wait;	1975	#$cf::WAIT_FOR_TICK->wait;
		1976	undef $guard1;
		1977	undef $guard2;
1797	$map->reset;	1978	$map->reset;
1798	undef $guard;
1799	return find $path;	1979	return find $path;
1800	}	1980	}
1801		1981
1802	$cf::MAP{$path} = $map	1982	$cf::MAP{$path} = $map
1803	}	1983	}
…		…
1812	local $self->{deny_reset} = 1; # loading can take a long time	1992	local $self->{deny_reset} = 1; # loading can take a long time
1813		1993
1814	my $path = $self->{path};	1994	my $path = $self->{path};
1815		1995
1816	{	1996	{
1817	my $guard = cf::lock_acquire "map_load:$path";	1997	my $guard = cf::lock_acquire "map_data:$path";
1818		1998
		1999	return unless $self->valid;
1819	return if $self->in_memory != cf::MAP_SWAPPED;	2000	return unless $self->in_memory == cf::MAP_SWAPPED;
1820		2001
1821	$self->in_memory (cf::MAP_LOADING);	2002	$self->in_memory (cf::MAP_LOADING);
1822		2003
1823	$self->alloc;	2004	$self->alloc;
1824		2005
1825	$self->pre_load;	2006	$self->pre_load;
1826	Coro::cede;	2007	cf::cede_to_tick;
1827		2008
		2009	my $f = new_from_file cf::object::thawer $self->{load_path};
		2010	$f->skip_block;
1828	$self->_load_objects ($self->{load_path}, 1)	2011	$self->_load_objects ($f)
1829	or return;	2012	or return;
1830		2013
1831	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2014	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1832	if delete $self->{load_original};	2015	if delete $self->{load_original};
1833		2016
1834	if (my $uniq = $self->uniq_path) {	2017	if (my $uniq = $self->uniq_path) {
1835	utf8::encode $uniq;	2018	utf8::encode $uniq;
1836	if (aio_open $uniq, O_RDONLY, 0) {	2019	unless (aio_stat $uniq) {
		2020	if (my $f = new_from_file cf::object::thawer $uniq) {
1837	$self->clear_unique_items;	2021	$self->clear_unique_items;
1838	$self->_load_objects ($uniq, 0);	2022	$self->_load_objects ($f);
		2023	$f->resolve_delayed_derefs;
		2024	}
1839	}	2025	}
1840	}	2026	}
1841		2027
1842	Coro::cede;	2028	$f->resolve_delayed_derefs;
		2029
		2030	cf::cede_to_tick;
1843	# now do the right thing for maps	2031	# now do the right thing for maps
1844	$self->link_multipart_objects;	2032	$self->link_multipart_objects;
1845	$self->difficulty ($self->estimate_difficulty)	2033	$self->difficulty ($self->estimate_difficulty)
1846	unless $self->difficulty;	2034	unless $self->difficulty;
1847	Coro::cede;	2035	cf::cede_to_tick;
1848		2036
1849	unless ($self->{deny_activate}) {	2037	unless ($self->{deny_activate}) {
1850	$self->decay_objects;	2038	$self->decay_objects;
1851	$self->fix_auto_apply;	2039	$self->fix_auto_apply;
1852	$self->update_buttons;	2040	$self->update_buttons;
1853	Coro::cede;	2041	cf::cede_to_tick;
1854	$self->set_darkness_map;	2042	$self->set_darkness_map;
1855	Coro::cede;	2043	cf::cede_to_tick;
1856	$self->activate;	2044	$self->activate;
1857	}	2045	}
		2046
		2047	$self->{last_save} = $cf::RUNTIME;
		2048	$self->last_access ($cf::RUNTIME);
1858		2049
1859	$self->in_memory (cf::MAP_IN_MEMORY);	2050	$self->in_memory (cf::MAP_IN_MEMORY);
1860	}	2051	}
1861		2052
1862	$self->post_load;	2053	$self->post_load;
…		…
1873		2064
1874	$self	2065	$self
1875	}	2066	}
1876		2067
1877	# find and load all maps in the 3x3 area around a map	2068	# find and load all maps in the 3x3 area around a map
1878	sub load_diag {	2069	sub load_neighbours {
1879	my ($map) = @_;	2070	my ($map) = @_;
1880		2071
1881	my @diag; # diagonal neighbours	2072	my @neigh; # diagonal neighbours
1882		2073
1883	for (0 .. 3) {	2074	for (0 .. 3) {
1884	my $neigh = $map->tile_path ($_)	2075	my $neigh = $map->tile_path ($_)
1885	or next;	2076	or next;
1886	$neigh = find $neigh, $map	2077	$neigh = find $neigh, $map
1887	or next;	2078	or next;
1888	$neigh->load;	2079	$neigh->load;
1889		2080
		2081	push @neigh,
1890	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2082	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1891	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2083	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1892	}	2084	}
1893		2085
1894	for (@diag) {	2086	for (grep defined $_->[0], @neigh) {
		2087	my ($path, $origin) = @$_;
1895	my $neigh = find @$_	2088	my $neigh = find $path, $origin
1896	or next;	2089	or next;
1897	$neigh->load;	2090	$neigh->load;
1898	}	2091	}
1899	}	2092	}
1900		2093
…		…
1905	}	2098	}
1906		2099
1907	sub do_load_sync {	2100	sub do_load_sync {
1908	my ($map) = @_;	2101	my ($map) = @_;
1909		2102
		2103	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2104	if $Coro::current == $Coro::main;
		2105
1910	cf::sync_job { $map->load };	2106	cf::sync_job { $map->load };
1911	}	2107	}
1912		2108
1913	our %MAP_PREFETCH;	2109	our %MAP_PREFETCH;
1914	our $MAP_PREFETCHER = undef;	2110	our $MAP_PREFETCHER = undef;
1915		2111
1916	sub find_async {	2112	sub find_async {
1917	my ($path, $origin) = @_;	2113	my ($path, $origin, $load) = @_;
1918		2114
1919	$path = normalise $path, $origin && $origin->{path};	2115	$path = normalise $path, $origin && $origin->{path};
1920		2116
1921	if (my $map = $cf::MAP{$path}) {	2117	if (my $map = $cf::MAP{$path}) {
1922	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2118	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1923	}	2119	}
1924		2120
1925	undef $MAP_PREFETCH{$path};	2121	$MAP_PREFETCH{$path} |= $load;
		2122
1926	$MAP_PREFETCHER ||= cf::async {	2123	$MAP_PREFETCHER ||= cf::async {
		2124	$Coro::current->{desc} = "map prefetcher";
		2125
1927	while (%MAP_PREFETCH) {	2126	while (%MAP_PREFETCH) {
1928	for my $path (keys %MAP_PREFETCH) {	2127	while (my ($k, $v) = each %MAP_PREFETCH) {
1929	if (my $map = find $path) {	2128	if (my $map = find $k) {
1930	$map->load;	2129	$map->load if $v;
1931	}	2130	}
1932		2131
1933	delete $MAP_PREFETCH{$path};	2132	delete $MAP_PREFETCH{$k};
1934	}	2133	}
1935	}	2134	}
1936	undef $MAP_PREFETCHER;	2135	undef $MAP_PREFETCHER;
1937	};	2136	};
1938	$MAP_PREFETCHER->prio (6);	2137	$MAP_PREFETCHER->prio (6);
…		…
1941	}	2140	}
1942		2141
1943	sub save {	2142	sub save {
1944	my ($self) = @_;	2143	my ($self) = @_;
1945		2144
1946	my $lock = cf::lock_acquire "map_data:" . $self->path;	2145	my $lock = cf::lock_acquire "map_data:$self->{path}";
1947		2146
1948	$self->{last_save} = $cf::RUNTIME;	2147	$self->{last_save} = $cf::RUNTIME;
1949		2148
1950	return unless $self->dirty;	2149	return unless $self->dirty;
1951		2150
…		…
1957	return if $self->{deny_save};	2156	return if $self->{deny_save};
1958		2157
1959	local $self->{last_access} = $self->last_access;#d#	2158	local $self->{last_access} = $self->last_access;#d#
1960		2159
1961	cf::async {	2160	cf::async {
		2161	$Coro::current->{desc} = "map player save";
1962	$_->contr->save for $self->players;	2162	$_->contr->save for $self->players;
1963	};	2163	};
1964		2164
1965	if ($uniq) {	2165	if ($uniq) {
1966	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2166	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
1974	my ($self) = @_;	2174	my ($self) = @_;
1975		2175
1976	# save first because save cedes	2176	# save first because save cedes
1977	$self->save;	2177	$self->save;
1978		2178
1979	my $lock = cf::lock_acquire "map_data:" . $self->path;	2179	my $lock = cf::lock_acquire "map_data:$self->{path}";
1980		2180
1981	return if $self->players;	2181	return if $self->players;
1982	return if $self->in_memory != cf::MAP_IN_MEMORY;	2182	return if $self->in_memory != cf::MAP_IN_MEMORY;
1983	return if $self->{deny_save};	2183	return if $self->{deny_save};
1984		2184
		2185	$self->in_memory (cf::MAP_SWAPPED);
		2186
		2187	$self->deactivate;
		2188	$_->clear_links_to ($self) for values %cf::MAP;
1985	$self->clear;	2189	$self->clear;
1986	$self->in_memory (cf::MAP_SWAPPED);
1987	}	2190	}
1988		2191
1989	sub reset_at {	2192	sub reset_at {
1990	my ($self) = @_;	2193	my ($self) = @_;
1991		2194
…		…
2023	if $uniq;	2226	if $uniq;
2024	}	2227	}
2025		2228
2026	delete $cf::MAP{$self->path};	2229	delete $cf::MAP{$self->path};
2027		2230
		2231	$self->deactivate;
		2232	$_->clear_links_to ($self) for values %cf::MAP;
2028	$self->clear;	2233	$self->clear;
2029
2030	$_->clear_links_to ($self) for values %cf::MAP;
2031		2234
2032	$self->unlink_save;	2235	$self->unlink_save;
2033	$self->destroy;	2236	$self->destroy;
2034	}	2237	}
2035		2238
2036	my $nuke_counter = "aaaa";	2239	my $nuke_counter = "aaaa";
2037		2240
2038	sub nuke {	2241	sub nuke {
2039	my ($self) = @_;	2242	my ($self) = @_;
2040		2243
		2244	{
		2245	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2246
2041	delete $cf::MAP{$self->path};	2247	delete $cf::MAP{$self->path};
2042		2248
2043	$self->unlink_save;	2249	$self->unlink_save;
2044		2250
2045	bless $self, "cf::map";	2251	bless $self, "cf::map";
2046	delete $self->{deny_reset};	2252	delete $self->{deny_reset};
2047	$self->{deny_save} = 1;	2253	$self->{deny_save} = 1;
2048	$self->reset_timeout (1);	2254	$self->reset_timeout (1);
2049	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2255	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2050		2256
2051	$cf::MAP{$self->path} = $self;	2257	$cf::MAP{$self->path} = $self;
		2258	}
2052		2259
2053	$self->reset; # polite request, might not happen	2260	$self->reset; # polite request, might not happen
2054	}	2261	}
2055		2262
2056	=item $maps = cf::map::tmp_maps	2263	=item $maps = cf::map::tmp_maps
…		…
2132		2339
2133	sub inv_recursive {	2340	sub inv_recursive {
2134	inv_recursive_ inv $_[0]	2341	inv_recursive_ inv $_[0]
2135	}	2342	}
2136		2343
		2344	=item $ref = $ob->ref
		2345
		2346	creates and returns a persistent reference to an objetc that can be stored as a string.
		2347
		2348	=item $ob = cf::object::deref ($refstring)
		2349
		2350	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2351	even if the object actually exists. May block.
		2352
		2353	=cut
		2354
		2355	sub deref {
		2356	my ($ref) = @_;
		2357
		2358	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2359	my ($uuid, $name) = ($1, $2);
		2360	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2361	or return;
		2362	$pl->ob->uuid eq $uuid
		2363	or return;
		2364
		2365	$pl->ob
		2366	} else {
		2367	warn "$ref: cannot resolve object reference\n";
		2368	undef
		2369	}
		2370	}
		2371
2137	package cf;	2372	package cf;
2138		2373
2139	=back	2374	=back
2140		2375
2141	=head3 cf::object::player	2376	=head3 cf::object::player
…		…
2163		2398
2164	} else {	2399	} else {
2165	my $pl = $self->contr;	2400	my $pl = $self->contr;
2166		2401
2167	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2402	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2168	my $diag = $pl->{npc_dialog};	2403	my $dialog = $pl->{npc_dialog};
2169	$diag->{pl}->ext_reply (	2404	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2170	$diag->{id},
2171	msgtype => "reply",
2172	msg => $diag->{pl}->expand_cfpod ($msg),
2173	add_topics => []
2174	);
2175		2405
2176	} else {	2406	} else {
2177	$msg = $npc->name . " says: $msg" if $npc;	2407	$msg = $npc->name . " says: $msg" if $npc;
2178	$self->message ($msg, $flags);	2408	$self->message ($msg, $flags);
2179	}	2409	}
2180	}	2410	}
		2411	}
		2412
		2413	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2414
		2415	=cut
		2416
		2417	sub cf::object::send_msg {
		2418	my $pl = shift->contr
		2419	or return;
		2420	$pl->send_msg (@_);
2181	}	2421	}
2182		2422
2183	=item $player_object->may ("access")	2423	=item $player_object->may ("access")
2184		2424
2185	Returns wether the given player is authorized to access resource "access"	2425	Returns wether the given player is authorized to access resource "access"
…		…
2264	# use -1 or undef as default coordinates, not 0, 0	2504	# use -1 or undef as default coordinates, not 0, 0
2265	($x, $y) = ($map->enter_x, $map->enter_y)	2505	($x, $y) = ($map->enter_x, $map->enter_y)
2266	if $x <=0 && $y <= 0;	2506	if $x <=0 && $y <= 0;
2267		2507
2268	$map->load;	2508	$map->load;
2269	$map->load_diag;	2509	$map->load_neighbours;
2270		2510
2271	return unless $self->contr->active;	2511	return unless $self->contr->active;
2272	$self->activate_recursive;	2512	$self->activate_recursive;
2273		2513
2274	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2514	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
…		…
2294	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2534	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2295		2535
2296	$self->enter_link;	2536	$self->enter_link;
2297		2537
2298	(async {	2538	(async {
		2539	$Coro::current->{desc} = "player::goto $path $x $y";
		2540
		2541	# *tag paths override both path and x|y
		2542	if ($path =~ /^\*(.*)$/) {
		2543	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2544	my $ob = $obs[rand @obs];
		2545
		2546	# see if we actually can go there
		2547	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2548	$ob = $obs[rand @obs];
		2549	} else {
		2550	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2551	}
		2552	# else put us there anyways for now #d#
		2553
		2554	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2555	} else {
		2556	($path, $x, $y) = (undef, undef, undef);
		2557	}
		2558	}
		2559
2299	my $map = eval {	2560	my $map = eval {
2300	my $map = cf::map::find $path;	2561	my $map = defined $path ? cf::map::find $path : undef;
2301		2562
2302	if ($map) {	2563	if ($map) {
2303	$map = $map->customise_for ($self);	2564	$map = $map->customise_for ($self);
2304	$map = $check->($map) if $check && $map;	2565	$map = $check->($map) if $check && $map;
2305	} else {	2566	} else {
2306	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2567	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2307	}	2568	}
2308		2569
2309	$map	2570	$map
2310	};	2571	};
2311		2572
…		…
2401	# if exit is damned, update players death & WoR home-position	2662	# if exit is damned, update players death & WoR home-position
2402	$self->contr->savebed ($slaying, $hp, $sp)	2663	$self->contr->savebed ($slaying, $hp, $sp)
2403	if $exit->flag (FLAG_DAMNED);	2664	if $exit->flag (FLAG_DAMNED);
2404		2665
2405	(async {	2666	(async {
		2667	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2668
2406	$self->deactivate_recursive; # just to be sure	2669	$self->deactivate_recursive; # just to be sure
2407	unless (eval {	2670	unless (eval {
2408	$self->goto ($slaying, $hp, $sp);	2671	$self->goto ($slaying, $hp, $sp);
2409		2672
2410	1;	2673	1;
…		…
2445	the message, with C<log> being the default. If C<$color> is negative, suppress	2708	the message, with C<log> being the default. If C<$color> is negative, suppress
2446	the message unless the client supports the msg packet.	2709	the message unless the client supports the msg packet.
2447		2710
2448	=cut	2711	=cut
2449		2712
		2713	# non-persistent channels (usually the info channel)
		2714	our %CHANNEL = (
		2715	"c/identify" => {
		2716	id => "infobox",
		2717	title => "Identify",
		2718	reply => undef,
		2719	tooltip => "Items recently identified",
		2720	},
		2721	"c/examine" => {
		2722	id => "infobox",
		2723	title => "Examine",
		2724	reply => undef,
		2725	tooltip => "Signs and other items you examined",
		2726	},
		2727	"c/book" => {
		2728	id => "infobox",
		2729	title => "Book",
		2730	reply => undef,
		2731	tooltip => "The contents of a note or book",
		2732	},
		2733	"c/lookat" => {
		2734	id => "infobox",
		2735	title => "Look",
		2736	reply => undef,
		2737	tooltip => "What you saw there",
		2738	},
		2739	"c/who" => {
		2740	id => "infobox",
		2741	title => "Players",
		2742	reply => undef,
		2743	tooltip => "Shows players who are currently online",
		2744	},
		2745	"c/body" => {
		2746	id => "infobox",
		2747	title => "Body Parts",
		2748	reply => undef,
		2749	tooltip => "Shows which body parts you posess and are available",
		2750	},
		2751	"c/uptime" => {
		2752	id => "infobox",
		2753	title => "Uptime",
		2754	reply => undef,
		2755	tooltip => "How long the server has been running since last restart",
		2756	},
		2757	"c/mapinfo" => {
		2758	id => "infobox",
		2759	title => "Map Info",
		2760	reply => undef,
		2761	tooltip => "Information related to the maps",
		2762	},
		2763	);
		2764
2450	sub cf::client::send_msg {	2765	sub cf::client::send_msg {
2451	my ($self, $channel, $msg, $color, @extra) = @_;	2766	my ($self, $channel, $msg, $color, @extra) = @_;
2452		2767
2453	$msg = $self->pl->expand_cfpod ($msg);	2768	$msg = $self->pl->expand_cfpod ($msg);
2454		2769
2455	return unless @extra || length $msg;
2456
2457	$color &= ~cf::NDI_UNIQUE; # just in case...	2770	$color &= cf::NDI_CLIENT_MASK; # just in case...
2458		2771
		2772	# check predefined channels, for the benefit of C
		2773	if ($CHANNEL{$channel}) {
		2774	$channel = $CHANNEL{$channel};
		2775
		2776	$self->ext_msg (channel_info => $channel)
		2777	if $self->can_msg;
		2778
		2779	$channel = $channel->{id};
		2780
2459	if (ref $channel) {	2781	} elsif (ref $channel) {
2460	# send meta info to client, if not yet sent	2782	# send meta info to client, if not yet sent
2461	unless (exists $self->{channel}{$channel->{id}}) {	2783	unless (exists $self->{channel}{$channel->{id}}) {
2462	$self->{channel}{$channel->{id}} = $channel;	2784	$self->{channel}{$channel->{id}} = $channel;
2463	$self->ext_event (channel_info => %$channel);	2785	$self->ext_msg (channel_info => $channel)
		2786	if $self->can_msg;
2464	}	2787	}
2465		2788
2466	$channel = $channel->{id};	2789	$channel = $channel->{id};
2467	}	2790	}
2468		2791
		2792	return unless @extra || length $msg;
		2793
2469	if ($self->can_msg) {	2794	if ($self->can_msg) {
		2795	# default colour, mask it out
		2796	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2797	if $color & cf::NDI_DEF;
		2798
2470	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));	2799	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2800	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2471	} else {	2801	} else {
2472	# replace some tags by gcfclient-compatible ones
2473	for ($msg) {
2474	1 while
2475	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2476	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2477	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2478	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2479	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2480	}
2481
2482	if ($color >= 0) {	2802	if ($color >= 0) {
		2803	# replace some tags by gcfclient-compatible ones
		2804	for ($msg) {
		2805	1 while
		2806	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2807	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2808	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2809	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2810	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2811	}
		2812
		2813	$color &= cf::NDI_COLOR_MASK;
		2814
		2815	utf8::encode $msg;
		2816
2483	if (0 && $msg =~ /\[/) {	2817	if (0 && $msg =~ /\[/) {
		2818	# COMMAND/INFO
2484	$self->send_packet ("drawextinfo $color 4 0 $msg")	2819	$self->send_packet ("drawextinfo $color 10 8 $msg")
2485	} else {	2820	} else {
2486	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	2821	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2487	$self->send_packet ("drawinfo $color $msg")	2822	$self->send_packet ("drawinfo $color $msg")
2488	}	2823	}
2489	}	2824	}
2490	}	2825	}
2491	}	2826	}
2492		2827
2493	=item $client->ext_event ($type, %msg)	2828	=item $client->ext_msg ($type, @msg)
2494		2829
2495	Sends an ext event to the client.	2830	Sends an ext event to the client.
2496		2831
2497	=cut	2832	=cut
2498		2833
2499	sub cf::client::ext_event($$%) {	2834	sub cf::client::ext_msg($$@) {
2500	my ($self, $type, %msg) = @_;	2835	my ($self, $type, @msg) = @_;
2501		2836
2502	return unless $self->extcmd;	2837	if ($self->extcmd == 2) {
2503		2838	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2839	} elsif ($self->extcmd == 1) { # TODO: remove
2504	$msg{msgtype} = "event_$type";	2840	push @msg, msgtype => "event_$type";
2505	$self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));	2841	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2842	}
		2843	}
		2844
		2845	=item $client->ext_reply ($msgid, @msg)
		2846
		2847	Sends an ext reply to the client.
		2848
		2849	=cut
		2850
		2851	sub cf::client::ext_reply($$@) {
		2852	my ($self, $id, @msg) = @_;
		2853
		2854	if ($self->extcmd == 2) {
		2855	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2856	} elsif ($self->extcmd == 1) {
		2857	#TODO: version 1, remove
		2858	unshift @msg, msgtype => "reply", msgid => $id;
		2859	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2860	}
2506	}	2861	}
2507		2862
2508	=item $success = $client->query ($flags, "text", \&cb)	2863	=item $success = $client->query ($flags, "text", \&cb)
2509		2864
2510	Queues a query to the client, calling the given callback with	2865	Queues a query to the client, calling the given callback with
…		…
2565	my ($ns, $buf) = @_;	2920	my ($ns, $buf) = @_;
2566		2921
2567	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2922	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568		2923
2569	if (ref $msg) {	2924	if (ref $msg) {
		2925	my ($type, $reply, @payload) =
		2926	"ARRAY" eq ref $msg
		2927	? @$msg
		2928	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2929
		2930	my @reply;
		2931
2570	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2932	if (my $cb = $EXTICMD{$type}) {
2571	if (my %reply = $cb->($ns, $msg)) {	2933	@reply = $cb->($ns, @payload);
2572	$reply{msgid} = $msg->{msgid};
2573	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2574	}
2575	}	2934	}
		2935
		2936	$ns->ext_reply ($reply, @reply)
		2937	if $reply;
		2938
2576	} else {	2939	} else {
2577	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	2940	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2578	}	2941	}
2579		2942
2580	cf::override;	2943	cf::override;
…		…
2627	our $safe = new Safe "safe";	2990	our $safe = new Safe "safe";
2628	our $safe_hole = new Safe::Hole;	2991	our $safe_hole = new Safe::Hole;
2629		2992
2630	$SIG{FPE} = 'IGNORE';	2993	$SIG{FPE} = 'IGNORE';
2631		2994
2632	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2995	$safe->permit_only (Opcode::opset qw(
		2996	:base_core :base_mem :base_orig :base_math
		2997	grepstart grepwhile mapstart mapwhile
		2998	sort time
		2999	));
2633		3000
2634	# here we export the classes and methods available to script code	3001	# here we export the classes and methods available to script code
2635		3002
2636	=pod	3003	=pod
2637		3004
2638	The following functions and methods are available within a safe environment:	3005	The following functions and methods are available within a safe environment:
2639		3006
2640	cf::object	3007	cf::object
2641	contr pay_amount pay_player map x y force_find force_add	3008	contr pay_amount pay_player map x y force_find force_add destroy
2642	insert remove	3009	insert remove name archname title slaying race decrease_ob_nr
2643		3010
2644	cf::object::player	3011	cf::object::player
2645	player	3012	player
2646		3013
2647	cf::player	3014	cf::player
…		…
2652		3019
2653	=cut	3020	=cut
2654		3021
2655	for (	3022	for (
2656	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3023	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		3024	insert remove inv name archname title slaying race
2657	insert remove)],	3025	decrease_ob_nr destroy)],
2658	["cf::object::player" => qw(player)],	3026	["cf::object::player" => qw(player)],
2659	["cf::player" => qw(peaceful)],	3027	["cf::player" => qw(peaceful)],
2660	["cf::map" => qw(trigger)],	3028	["cf::map" => qw(trigger)],
2661	) {	3029	) {
2662	no strict 'refs';	3030	no strict 'refs';
…		…
2738	# the server's init and main functions	3106	# the server's init and main functions
2739		3107
2740	sub load_facedata($) {	3108	sub load_facedata($) {
2741	my ($path) = @_;	3109	my ($path) = @_;
2742		3110
		3111	# HACK to clear player env face cache, we need some signal framework
		3112	# for this (global event?)
		3113	%ext::player_env::MUSIC_FACE_CACHE = ();
		3114
		3115	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3116
2743	warn "loading facedata from $path\n";	3117	warn "loading facedata from $path\n";
2744		3118
2745	my $facedata;	3119	my $facedata;
2746	0 < aio_load $path, $facedata	3120	0 < aio_load $path, $facedata
2747	or die "$path: $!";	3121	or die "$path: $!";
2748		3122
2749	$facedata = Coro::Storable::thaw $facedata;	3123	$facedata = Coro::Storable::thaw $facedata;
2750		3124
2751	$facedata->{version} == 2	3125	$facedata->{version} == 2
2752	or cf::cleanup "$path: version mismatch, cannot proceed.";	3126	or cf::cleanup "$path: version mismatch, cannot proceed.";
		3127
		3128	# patch in the exptable
		3129	$facedata->{resource}{"res/exp_table"} = {
		3130	type => FT_RSRC,
		3131	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3132	};
		3133	cf::cede_to_tick;
2753		3134
2754	{	3135	{
2755	my $faces = $facedata->{faceinfo};	3136	my $faces = $facedata->{faceinfo};
2756		3137
2757	while (my ($face, $info) = each %$faces) {	3138	while (my ($face, $info) = each %$faces) {
2758	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3139	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2759	cf::face::set_visibility $idx, $info->{visibility};	3140	cf::face::set_visibility $idx, $info->{visibility};
2760	cf::face::set_magicmap $idx, $info->{magicmap};	3141	cf::face::set_magicmap $idx, $info->{magicmap};
2761	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3142	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2762	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3143	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2763		3144
2764	cf::cede_to_tick;	3145	cf::cede_to_tick;
2765	}	3146	}
2766		3147
2767	while (my ($face, $info) = each %$faces) {	3148	while (my ($face, $info) = each %$faces) {
…		…
2792		3173
2793	{	3174	{
2794	# TODO: for gcfclient pleasure, we should give resources	3175	# TODO: for gcfclient pleasure, we should give resources
2795	# that gcfclient doesn't grok a >10000 face index.	3176	# that gcfclient doesn't grok a >10000 face index.
2796	my $res = $facedata->{resource};	3177	my $res = $facedata->{resource};
2797	my $enc = JSON::XS->new->utf8->canonical;	3178
		3179	my $soundconf = delete $res->{"res/sound.conf"};
2798		3180
2799	while (my ($name, $info) = each %$res) {	3181	while (my ($name, $info) = each %$res) {
2800	my $meta = $enc->encode ({
2801	name => $name,
2802	type => $info->{type},
2803	copyright => $info->{copyright}, #TODO#
2804	});
2805
2806	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3182	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3183	my $data;
2807		3184
2808	if ($name =~ /\.jpg$/) {	3185	if ($info->{type} & 1) {
2809	cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack	3186	# prepend meta info
2810	cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack	3187
		3188	my $meta = $enc->encode ({
		3189	name => $name,
		3190	%{ $info->{meta} || {} },
		3191	});
		3192
		3193	$data = pack "(w/a*)*", $meta, $info->{data};
2811	} else {	3194	} else {
2812	my $data = pack "(w/a*)*", $meta, $info->{data};	3195	$data = $info->{data};
2813	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814
2815	cf::face::set_type $idx, 1;
2816	cf::face::set_data $idx, 0, $data, $chk;
2817	}	3196	}
2818		3197
		3198	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3199	cf::face::set_type $idx, $info->{type};
		3200
2819	cf::cede_to_tick;	3201	cf::cede_to_tick;
2820	}	3202	}
		3203
		3204	if ($soundconf) {
		3205	$soundconf = $enc->decode (delete $soundconf->{data});
		3206
		3207	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3208	my $sound = $soundconf->{compat}[$_]
		3209	or next;
		3210
		3211	my $face = cf::face::find "sound/$sound->[1]";
		3212	cf::sound::set $sound->[0] => $face;
		3213	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3214	}
		3215
		3216	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3217	my $face = cf::face::find "sound/$v";
		3218	cf::sound::set $k => $face;
		3219	}
		3220	}
2821	}	3221	}
2822		3222
2823	1	3223	1
2824	}	3224	}
2825		3225
		3226	register_exticmd fx_want => sub {
		3227	my ($ns, $want) = @_;
		3228
		3229	while (my ($k, $v) = each %$want) {
		3230	$ns->fx_want ($k, $v);
		3231	}
		3232	};
		3233
2826	sub reload_regions {	3234	sub reload_regions {
		3235	# HACK to clear player env face cache, we need some signal framework
		3236	# for this (global event?)
		3237	%ext::player_env::MUSIC_FACE_CACHE = ();
		3238
2827	load_resource_file "$MAPDIR/regions"	3239	load_resource_file "$MAPDIR/regions"
2828	or die "unable to load regions file\n";	3240	or die "unable to load regions file\n";
2829		3241
2830	for (cf::region::list) {	3242	for (cf::region::list) {
2831	$_->{match} = qr/$_->{match}/	3243	$_->{match} = qr/$_->{match}/
…		…
2867		3279
2868	sub init {	3280	sub init {
2869	reload_resources;	3281	reload_resources;
2870	}	3282	}
2871		3283
2872	sub cfg_load {	3284	sub reload_config {
2873	open my $fh, "<:utf8", "$CONFDIR/config"	3285	open my $fh, "<:utf8", "$CONFDIR/config"
2874	or return;	3286	or return;
2875		3287
2876	local $/;	3288	local $/;
2877	*CFG = YAML::Syck::Load <$fh>;	3289	*CFG = YAML::Syck::Load <$fh>;
…		…
2893	sub main {	3305	sub main {
2894	# we must not ever block the main coroutine	3306	# we must not ever block the main coroutine
2895	local $Coro::idle = sub {	3307	local $Coro::idle = sub {
2896	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3308	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2897	(async {	3309	(async {
		3310	$Coro::current->{desc} = "IDLE BUG HANDLER";
2898	Event::one_event;	3311	Event::one_event;
2899	})->prio (Coro::PRIO_MAX);	3312	})->prio (Coro::PRIO_MAX);
2900	};	3313	};
2901		3314
2902	cfg_load;	3315	reload_config;
2903	db_init;	3316	db_init;
2904	load_extensions;	3317	load_extensions;
2905		3318
2906	$TICK_WATCHER->start;	3319	$TICK_WATCHER->start;
2907	Event::loop;	3320	Event::loop;
…		…
2974	# and maps saved/destroyed asynchronously.	3387	# and maps saved/destroyed asynchronously.
2975	warn "begin emergency player save\n";	3388	warn "begin emergency player save\n";
2976	for my $login (keys %cf::PLAYER) {	3389	for my $login (keys %cf::PLAYER) {
2977	my $pl = $cf::PLAYER{$login} or next;	3390	my $pl = $cf::PLAYER{$login} or next;
2978	$pl->valid or next;	3391	$pl->valid or next;
		3392	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2979	$pl->save;	3393	$pl->save;
2980	}	3394	}
2981	warn "end emergency player save\n";	3395	warn "end emergency player save\n";
2982		3396
2983	warn "begin emergency map save\n";	3397	warn "begin emergency map save\n";
…		…
3031		3445
3032	warn "flushing outstanding aio requests";	3446	warn "flushing outstanding aio requests";
3033	for (;;) {	3447	for (;;) {
3034	BDB::flush;	3448	BDB::flush;
3035	IO::AIO::flush;	3449	IO::AIO::flush;
3036	Coro::cede;	3450	Coro::cede_notself;
3037	last unless IO::AIO::nreqs || BDB::nreqs;	3451	last unless IO::AIO::nreqs || BDB::nreqs;
3038	warn "iterate...";	3452	warn "iterate...";
3039	}	3453	}
3040		3454
3041	++$RELOAD;	3455	++$RELOAD;
…		…
3100	warn "reloading cf.pm";	3514	warn "reloading cf.pm";
3101	require cf;	3515	require cf;
3102	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3516	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3103		3517
3104	warn "loading config and database again";	3518	warn "loading config and database again";
3105	cf::cfg_load;	3519	cf::reload_config;
3106		3520
3107	warn "loading extensions";	3521	warn "loading extensions";
3108	cf::load_extensions;	3522	cf::load_extensions;
3109		3523
3110	warn "reattaching attachments to objects/players";	3524	warn "reattaching attachments to objects/players";
…		…
3146	register_command "reload" => sub {	3560	register_command "reload" => sub {
3147	my ($who, $arg) = @_;	3561	my ($who, $arg) = @_;
3148		3562
3149	if ($who->flag (FLAG_WIZ)) {	3563	if ($who->flag (FLAG_WIZ)) {
3150	$who->message ("reloading server.");	3564	$who->message ("reloading server.");
		3565	async {
		3566	$Coro::current->{desc} = "perl_reload";
3151	async { reload_perl };	3567	reload_perl;
		3568	};
3152	}	3569	}
3153	};	3570	};
3154		3571
3155	unshift @INC, $LIBDIR;	3572	unshift @INC, $LIBDIR;
3156		3573
…		…
3175	my $signal = new Coro::Signal;	3592	my $signal = new Coro::Signal;
3176	push @WAIT_FOR_TICK_BEGIN, $signal;	3593	push @WAIT_FOR_TICK_BEGIN, $signal;
3177	$signal->wait;	3594	$signal->wait;
3178	}	3595	}
3179		3596
3180	my $min = 1e6;#d#
3181	my $avg = 10;
3182	$TICK_WATCHER = Event->timer (	3597	$TICK_WATCHER = Event->timer (
3183	reentrant => 0,	3598	reentrant => 0,
3184	parked => 1,	3599	parked => 1,
3185	prio => 0,	3600	prio => 0,
3186	at => $NEXT_TICK || $TICK,	3601	at => $NEXT_TICK || $TICK,
…		…
3194		3609
3195	$NOW = $tick_start = Event::time;	3610	$NOW = $tick_start = Event::time;
3196		3611
3197	cf::server_tick; # one server iteration	3612	cf::server_tick; # one server iteration
3198		3613
3199	0 && sync_job {#d#
3200	for(1..10) {
3201	my $t = Event::time;
3202	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3203	or die;
3204
3205	$map->width (50);
3206	$map->height (50);
3207	$map->alloc;
3208	$map->_load_objects ("/tmp/x.map", 1);
3209	my $t = Event::time - $t;
3210
3211	#next unless $t < 0.0013;#d#
3212	if ($t < $min) {
3213	$min = $t;
3214	}
3215	$avg = $avg * 0.99 + $t * 0.01;
3216	}
3217	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3218	exit 0;
3219	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3220	};
3221
3222	$RUNTIME += $TICK;	3614	$RUNTIME += $TICK;
3223	$NEXT_TICK += $TICK;	3615	$NEXT_TICK += $TICK;
3224		3616
3225	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3617	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3226	$NEXT_RUNTIME_WRITE = $NOW + 10;	3618	$NEXT_RUNTIME_WRITE = $NOW + 10;
3227	Coro::async_pool {	3619	Coro::async_pool {
		3620	$Coro::current->{desc} = "runtime saver";
3228	write_runtime	3621	write_runtime
3229	or warn "ERROR: unable to write runtime file: $!";	3622	or warn "ERROR: unable to write runtime file: $!";
3230	};	3623	};
3231	}	3624	}
3232		3625
3233	# my $AFTER = Event::time;
3234	# warn $AFTER - $NOW;#d#
3235
3236	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3626	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3237	$sig->send;	3627	$sig->send;
3238	}	3628	}
3239	while (my $sig = shift @WAIT_FOR_TICK) {	3629	while (my $sig = shift @WAIT_FOR_TICK) {
3240	$sig->send;	3630	$sig->send;
…		…
3250		3640
3251	$LOAD = ($NOW - $tick_start) / $TICK;	3641	$LOAD = ($NOW - $tick_start) / $TICK;
3252	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3642	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3253		3643
3254	_post_tick;	3644	_post_tick;
3255
3256
3257	},	3645	},
3258	);	3646	);
3259		3647
3260	{	3648	{
		3649	BDB::min_parallel 8;
3261	BDB::max_poll_time $TICK * 0.1;	3650	BDB::max_poll_time $TICK * 0.1;
3262	$BDB_POLL_WATCHER = Event->io (	3651	$BDB_POLL_WATCHER = Event->io (
3263	reentrant => 0,	3652	reentrant => 0,
3264	fd => BDB::poll_fileno,	3653	fd => BDB::poll_fileno,
3265	poll => 'r',	3654	poll => 'r',
3266	prio => 0,	3655	prio => 0,
3267	data => WF_AUTOCANCEL,	3656	data => WF_AUTOCANCEL,
3268	cb => \&BDB::poll_cb,	3657	cb => \&BDB::poll_cb,
3269	);	3658	);
3270	BDB::min_parallel 8;
3271		3659
3272	BDB::set_sync_prepare {	3660	BDB::set_sync_prepare {
3273	my $status;	3661	my $status;
3274	my $current = $Coro::current;	3662	my $current = $Coro::current;
3275	(	3663	(
…		…
3284	)	3672	)
3285	};	3673	};
3286		3674
3287	unless ($DB_ENV) {	3675	unless ($DB_ENV) {
3288	$DB_ENV = BDB::db_env_create;	3676	$DB_ENV = BDB::db_env_create;
		3677	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3678	| BDB::LOG_AUTOREMOVE, 1);
		3679	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3680	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3289		3681
3290	cf::sync_job {	3682	cf::sync_job {
3291	eval {	3683	eval {
3292	BDB::db_env_open	3684	BDB::db_env_open
3293	$DB_ENV,	3685	$DB_ENV,
…		…
3295	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3687	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3296	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3688	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3297	0666;	3689	0666;
3298		3690
3299	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3691	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3300
3301	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3302	$DB_ENV->set_lk_detect;
3303	};	3692	};
3304		3693
3305	cf::cleanup "db_env_open(db): $@" if $@;	3694	cf::cleanup "db_env_open(db): $@" if $@;
3306	};	3695	};
3307	}	3696	}
		3697
		3698	$BDB_DEADLOCK_WATCHER = Event->timer (
		3699	after => 3,
		3700	interval => 1,
		3701	hard => 1,
		3702	prio => 0,
		3703	data => WF_AUTOCANCEL,
		3704	cb => sub {
		3705	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3706	},
		3707	);
		3708	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3709	after => 11,
		3710	interval => 60,
		3711	hard => 1,
		3712	prio => 0,
		3713	data => WF_AUTOCANCEL,
		3714	cb => sub {
		3715	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3716	},
		3717	);
		3718	$BDB_TRICKLE_WATCHER = Event->timer (
		3719	after => 5,
		3720	interval => 10,
		3721	hard => 1,
		3722	prio => 0,
		3723	data => WF_AUTOCANCEL,
		3724	cb => sub {
		3725	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3726	},
		3727	);
3308	}	3728	}
3309		3729
3310	{	3730	{
3311	IO::AIO::min_parallel 8;	3731	IO::AIO::min_parallel 8;
3312		3732
…		…
3315	$AIO_POLL_WATCHER = Event->io (	3735	$AIO_POLL_WATCHER = Event->io (
3316	reentrant => 0,	3736	reentrant => 0,
3317	data => WF_AUTOCANCEL,	3737	data => WF_AUTOCANCEL,
3318	fd => IO::AIO::poll_fileno,	3738	fd => IO::AIO::poll_fileno,
3319	poll => 'r',	3739	poll => 'r',
3320	prio => 6,	3740	prio => 0,
3321	cb => \&IO::AIO::poll_cb,	3741	cb => \&IO::AIO::poll_cb,
3322	);	3742	);
3323	}	3743	}
3324		3744
3325	my $_log_backtrace;	3745	my $_log_backtrace;
…		…
3331		3751
3332	# limit the # of concurrent backtraces	3752	# limit the # of concurrent backtraces
3333	if ($_log_backtrace < 2) {	3753	if ($_log_backtrace < 2) {
3334	++$_log_backtrace;	3754	++$_log_backtrace;
3335	async {	3755	async {
		3756	$Coro::current->{desc} = "abt $msg";
		3757
3336	my @bt = fork_call {	3758	my @bt = fork_call {
3337	@addr = map { sprintf "%x", $_ } @addr;	3759	@addr = map { sprintf "%x", $_ } @addr;
3338	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3760	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3339	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	3761	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3340	or die "addr2line: $!";	3762	or die "addr2line: $!";

Diff Legend

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