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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.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;
		35	use Digest::MD5 ();
34		36
35	# configure various modules to our taste	37	# configure various modules to our taste
36	#	38	#
37	$Storable::canonical = 1; # reduce rsync transfers	39	$Storable::canonical = 1; # reduce rsync transfers
38	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	40	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
…		…
78	our $NEXT_TICK;	80	our $NEXT_TICK;
79	our $NOW;	81	our $NOW;
80	our $USE_FSYNC = 1; # use fsync to write maps - default off	82	our $USE_FSYNC = 1; # use fsync to write maps - default off
81		83
82	our $BDB_POLL_WATCHER;	84	our $BDB_POLL_WATCHER;
		85	our $BDB_DEADLOCK_WATCHER;
		86	our $BDB_CHECKPOINT_WATCHER;
		87	our $BDB_TRICKLE_WATCHER;
83	our $DB_ENV;	88	our $DB_ENV;
84		89
85	our %CFG;	90	our %CFG;
86		91
87	our $UPTIME; $UPTIME \|\|= time;	92	our $UPTIME; $UPTIME \|\|= time;
88	our $RUNTIME;	93	our $RUNTIME;
89		94
90	our %PLAYER; # all users	95	our (%PLAYER, %PLAYER_LOADING); # all users
91	our %MAP; # all maps	96	our (%MAP, %MAP_LOADING ); # all maps
92	our $LINK_MAP; # the special {link} map, which is always available	97	our $LINK_MAP; # the special {link} map, which is always available
93		98
94	# used to convert map paths into valid unix filenames by replacing / by ∕	99	# used to convert map paths into valid unix filenames by replacing / by ∕
95	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	100	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96		101
…		…
157		162
158	The raw value load value from the last tick.	163	The raw value load value from the last tick.
159		164
160	=item %cf::CFG	165	=item %cf::CFG
161		166
162	Configuration for the server, loaded from C</etc/crossfire/config>, or	167	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163	from wherever your confdir points to.	168	from wherever your confdir points to.
164		169
165	=item cf::wait_for_tick, cf::wait_for_tick_begin	170	=item cf::wait_for_tick, cf::wait_for_tick_begin
166		171
167	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	172	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168	returns directly I<after> the tick processing (and consequently, can only wake one process	173	returns directly I<after> the tick processing (and consequently, can only wake one process
169	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	174	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170		175
		176	=item @cf::INVOKE_RESULTS
		177
		178	This array contains the results of the last C<invoke ()> call. When
		179	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		180	that call.
		181
171	=back	182	=back
172		183
173	=cut	184	=cut
174		185
175	BEGIN {	186	BEGIN {
…		…
179	$msg .= "\n"	190	$msg .= "\n"
180	unless $msg =~ /\n$/;	191	unless $msg =~ /\n$/;
181		192
182	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	193	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183		194
184	utf8::encode $msg;
185	LOG llevError, $msg;	195	LOG llevError, $msg;
186	};	196	};
187	}	197	}
188		198
189	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	199	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
264	Wait until the given lock is available and then acquires it and returns	274	Wait until the given lock is available and then acquires it and returns
265	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	275	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
266	for example when the coroutine gets canceled), the lock is automatically	276	for example when the coroutine gets canceled), the lock is automatically
267	returned.	277	returned.
268		278
		279	Locks are not recursive, locking from the same coro twice results in a
		280	deadlocked coro.
		281
269	Lock names should begin with a unique identifier (for example, cf::map::find	282	Lock names should begin with a unique identifier (for example, cf::map::find
270	uses map_find and cf::map::load uses map_load).	283	uses map_find and cf::map::load uses map_load).
271		284
272	=item $locked = cf::lock_active $string	285	=item $locked = cf::lock_active $string
273		286
274	Return true if the lock is currently active, i.e. somebody has locked it.	287	Return true if the lock is currently active, i.e. somebody has locked it.
275		288
276	=cut	289	=cut
277		290
278	our %LOCK;	291	our %LOCK;
		292	our %LOCKER;#d#
279		293
280	sub lock_wait($) {	294	sub lock_wait($) {
281	my ($key) = @_;	295	my ($key) = @_;
		296
		297	if ($LOCKER{$key} == $Coro::current) {#d#
		298	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		299	return;#d#
		300	}#d#
282		301
283	# wait for lock, if any	302	# wait for lock, if any
284	while ($LOCK{$key}) {	303	while ($LOCK{$key}) {
285	push @{ $LOCK{$key} }, $Coro::current;	304	push @{ $LOCK{$key} }, $Coro::current;
286	Coro::schedule;	305	Coro::schedule;
…		…
292		311
293	# wait, to be sure we are not locked	312	# wait, to be sure we are not locked
294	lock_wait $key;	313	lock_wait $key;
295		314
296	$LOCK{$key} = [];	315	$LOCK{$key} = [];
		316	$LOCKER{$key} = $Coro::current;#d#
297		317
298	Coro::guard {	318	Coro::guard {
		319	delete $LOCKER{$key};#d#
299	# wake up all waiters, to be on the safe side	320	# wake up all waiters, to be on the safe side
300	$_->ready for @{ delete $LOCK{$key} };	321	$_->ready for @{ delete $LOCK{$key} };
301	}	322	}
302	}	323	}
303		324
…		…
315	};	336	};
316	$TICK_WATCHER->stop;	337	$TICK_WATCHER->stop;
317	$guard	338	$guard
318	}	339	}
319		340
		341	=item cf::get_slot $time[, $priority[, $name]]
		342
		343	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		344	This call blocks and returns only when you have at least C<$time> seconds
		345	of cpu time till the next tick. The slot is only valid till the next cede.
		346
		347	The optional C<$name> can be used to identify the job to run. It might be
		348	used for statistical purposes and should identify the same time-class.
		349
		350	Useful for short background jobs.
		351
		352	=cut
		353
		354	our @SLOT_QUEUE;
		355	our $SLOT_QUEUE;
		356
		357	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		358	$SLOT_QUEUE = Coro::async {
		359	$Coro::current->desc ("timeslot manager");
		360
		361	my $signal = new Coro::Signal;
		362
		363	while () {
		364	next_job:
		365	my $avail = cf::till_tick;
		366	if ($avail > 0.01) {
		367	for (0 .. $#SLOT_QUEUE) {
		368	if ($SLOT_QUEUE[$_][0] < $avail) {
		369	my $job = splice @SLOT_QUEUE, $_, 1, ();
		370	$job->[2]->send;
		371	Coro::cede;
		372	goto next_job;
		373	}
		374	}
		375	}
		376
		377	if (@SLOT_QUEUE) {
		378	# we do not use wait_for_tick() as it returns immediately when tick is inactive
		379	push @cf::WAIT_FOR_TICK, $signal;
		380	$signal->wait;
		381	} else {
		382	Coro::schedule;
		383	}
		384	}
		385	};
		386
		387	sub get_slot($;$$) {
		388	my ($time, $pri, $name) = @_;
		389
		390	$time = $TICK * .6 if $time > $TICK * .6;
		391	my $sig = new Coro::Signal;
		392
		393	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		394	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		395	$SLOT_QUEUE->ready;
		396	$sig->wait;
		397	}
		398
320	=item cf::async { BLOCK }	399	=item cf::async { BLOCK }
321		400
322	Currently the same as Coro::async_pool, meaning you cannot use	401	Currently the same as Coro::async_pool, meaning you cannot use
323	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only	402	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
324	thing you are allowed to do is call C<prio> on it.	403	thing you are allowed to do is call C<prio> on it.
…		…
327		406
328	BEGIN { *async = \&Coro::async_pool }	407	BEGIN { *async = \&Coro::async_pool }
329		408
330	=item cf::sync_job { BLOCK }	409	=item cf::sync_job { BLOCK }
331		410
332	The design of Crossfire TRT requires that the main coroutine ($Coro::main)	411	The design of Deliantra requires that the main coroutine ($Coro::main)
333	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
334	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
335	acceptable.	414	acceptable.
336		415
337	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
338	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
…		…
348	my $time = Event::time;	427	my $time = Event::time;
349		428
350	# this is the main coro, too bad, we have to block	429	# this is the main coro, too bad, we have to block
351	# till the operation succeeds, freezing the server :/	430	# till the operation succeeds, freezing the server :/
352		431
		432	LOG llevError, Carp::longmess "sync job";#d#
		433
353	# TODO: use suspend/resume instead	434	# TODO: use suspend/resume instead
354	# (but this is cancel-safe)	435	# (but this is cancel-safe)
355	my $freeze_guard = freeze_mainloop;	436	my $freeze_guard = freeze_mainloop;
356		437
357	my $busy = 1;	438	my $busy = 1;
358	my @res;	439	my @res;
359		440
360	(async {	441	(async {
		442	$Coro::current->desc ("sync job coro");
361	@res = eval { $job->() };	443	@res = eval { $job->() };
362	warn $@ if $@;	444	warn $@ if $@;
363	undef $busy;	445	undef $busy;
364	})->prio (Coro::PRIO_MAX);	446	})->prio (Coro::PRIO_MAX);
365		447
366	while ($busy) {	448	while ($busy) {
		449	if (Coro::nready) {
		450	Coro::cede_notself;
		451	} else {
367	Coro::cede or Event::one_event;	452	Event::one_event;
		453	}
368	}	454	}
369		455
370	$time = Event::time - $time;	456	$time = Event::time - $time;
371		457
372	LOG llevError \| logBacktrace, Carp::longmess "long sync job"	458	LOG llevError \| logBacktrace, Carp::longmess "long sync job"
…		…
412	=cut	498	=cut
413		499
414	sub fork_call(&@) {	500	sub fork_call(&@) {
415	my ($cb, @args) = @_;	501	my ($cb, @args) = @_;
416		502
417	# 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,
418	# or die "socketpair: $!";	504	# otherwise perl prematurely frees the stuff :/
419	pipe my $fh1, my $fh2	505	# TODO: investigate and fix (likely this will be rather laborious)
420	or die "pipe: $!";
421		506
422	if (my $pid = fork) {	507	my @res = Coro::Util::fork_eval {
423	close $fh2;
424
425	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426	warn "pst<$res>" unless $res =~ /^pst/;
427	$res = Coro::Storable::thaw $res;
428
429	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431	Carp::confess $$res unless "ARRAY" eq ref $res;
432
433	return wantarray ? @$res : $res->[-1];
434	} else {
435	reset_signals;	508	reset_signals;
436	local $SIG{__WARN__};	509	&$cb
437	local $SIG{__DIE__};	510	}, @args;
438	local $Coro::idle;
439	$Coro::current->prio (Coro::PRIO_MAX);
440	eval {
441	close $fh1;
442		511
443	my @res = eval { $cb->(@args) };	512	wantarray ? @res : $res[-1]
444
445	open my $fh, ">", \my $buf
446	or die "fork_call: cannot open fh-to-buf in child : $!";
447	Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448	close $fh;
449
450	warn "writing ", length $buf;
451	my $x;
452	(length $buf) == ($x = syswrite $fh2, $buf)
453	or warn "error writing ".(length $buf)." != $x\n";
454	close $fh2;
455	};
456
457	warn $@ if $@;
458	_exit 0;
459	}
460	}	513	}
461		514
462	=item $value = cf::db_get $family => $key	515	=item $value = cf::db_get $family => $key
463		516
464	Returns a single value from the environment database.	517	Returns a single value from the environment database.
…		…
466	=item cf::db_put $family => $key => $value	519	=item cf::db_put $family => $key => $value
467		520
468	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
469	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).
470		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
471	=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	}
472		547
473	our $DB;	548	our $DB;
474		549
475	sub db_init {	550	sub db_init {
476	unless ($DB) {
477	$DB = BDB::db_create $DB_ENV;
478
479	cf::sync_job {	551	cf::sync_job {
480	eval {	552	$DB \|\|= db_table "db";
481	$DB->set_flags (BDB::CHKSUM);
482
483	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
484	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
485	cf::cleanup "db_open(db): $!" if $!;
486	};
487	cf::cleanup "db_open(db): $@" if $@;
488	};
489	}	553	};
490	}	554	}
491		555
492	sub db_get($$) {	556	sub db_get($$) {
493	my $key = "$_[0]/$_[1]";	557	my $key = "$_[0]/$_[1]";
494		558
…		…
544	if (1) {	608	if (1) {
545	$md5 =	609	$md5 =
546	join "\x00",	610	join "\x00",
547	$processversion,	611	$processversion,
548	map {	612	map {
549	Coro::cede;	613	cf::cede_to_tick;
550	($src->[$_], Digest::MD5::md5_hex $data[$_])	614	($src->[$_], Digest::MD5::md5_hex $data[$_])
551	} 0.. $#$src;	615	} 0.. $#$src;
552		616
553		617
554	my $dbmd5 = db_get cache => "$id/md5";	618	my $dbmd5 = db_get cache => "$id/md5";
…		…
598	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")
599	to it. All such attachable objects support the following methods.	663	to it. All such attachable objects support the following methods.
600		664
601	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>
602	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
603	Crossfire TRT).	667	Deliantra).
604		668
605	=over 4	669	=over 4
606		670
607	=item $attachable->attach ($attachment, key => $value...)	671	=item $attachable->attach ($attachment, key => $value...)
608		672
…		…
860	";	924	";
861	die if $@;	925	die if $@;
862	}	926	}
863		927
864	our $override;	928	our $override;
865	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?
866		930
867	sub override {	931	sub override {
868	$override = 1;	932	$override = 1;
869	@invoke_results = ();	933	@INVOKE_RESULTS = (@_);
870	}	934	}
871		935
872	sub do_invoke {	936	sub do_invoke {
873	my $event = shift;	937	my $event = shift;
874	my $callbacks = shift;	938	my $callbacks = shift;
875		939
876	@invoke_results = ();	940	@INVOKE_RESULTS = ();
877		941
878	local $override;	942	local $override;
879		943
880	for (@$callbacks) {	944	for (@$callbacks) {
881	eval { &{$_->[1]} };	945	eval { &{$_->[1]} };
…		…
898		962
899	Generate an object-specific event with the given arguments.	963	Generate an object-specific event with the given arguments.
900		964
901	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
902	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
903	results (if you must, access C<@cf::invoke_results> directly).	967	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904		968
905	=back	969	=back
906		970
907	=cut	971	=cut
908		972
909	#############################################################################	973	#############################################################################
910	# 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	}
911		1017
912	sub reattach {	1018	sub reattach {
913	# basically do the same as instantiate, without calling instantiate	1019	# basically do the same as instantiate, without calling instantiate
914	my ($obj) = @_;	1020	my ($obj) = @_;
915		1021
…		…
962	sub object_freezer_save {	1068	sub object_freezer_save {
963	my ($filename, $rdata, $objs) = @_;	1069	my ($filename, $rdata, $objs) = @_;
964		1070
965	sync_job {	1071	sync_job {
966	if (length $$rdata) {	1072	if (length $$rdata) {
		1073	utf8::decode (my $decname = $filename);
967	warn sprintf "saving %s (%d,%d)\n",	1074	warn sprintf "saving %s (%d,%d)\n",
968	$filename, length $$rdata, scalar @$objs;	1075	$decname, length $$rdata, scalar @$objs;
969		1076
970	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1077	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
971	chmod SAVE_MODE, $fh;	1078	chmod SAVE_MODE, $fh;
972	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1079	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
973	aio_fsync $fh if $cf::USE_FSYNC;	1080	aio_fsync $fh if $cf::USE_FSYNC;
974	close $fh;	1081	close $fh;
975		1082
976	if (@$objs) {	1083	if (@$objs) {
977	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) {
978	chmod SAVE_MODE, $fh;	1085	chmod SAVE_MODE, $fh;
979	my $data = Storable::nfreeze { version => 1, objs => $objs };	1086	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
980	aio_write $fh, 0, (length $data), $data, 0;	1087	aio_write $fh, 0, (length $data), $data, 0;
981	aio_fsync $fh if $cf::USE_FSYNC;	1088	aio_fsync $fh if $cf::USE_FSYNC;
982	close $fh;	1089	close $fh;
983	aio_rename "$filename.pst~", "$filename.pst";	1090	aio_rename "$filename.pst~", "$filename.pst";
984	}	1091	}
…		…
992	}	1099	}
993	} else {	1100	} else {
994	aio_unlink $filename;	1101	aio_unlink $filename;
995	aio_unlink "$filename.pst";	1102	aio_unlink "$filename.pst";
996	}	1103	}
997	}	1104	};
998	}	1105	}
999		1106
1000	sub object_freezer_as_string {	1107	sub object_freezer_as_string {
1001	my ($rdata, $objs) = @_;	1108	my ($rdata, $objs) = @_;
1002		1109
…		…
1014	or return;	1121	or return;
1015		1122
1016	unless (aio_stat "$filename.pst") {	1123	unless (aio_stat "$filename.pst") {
1017	(aio_load "$filename.pst", $av) >= 0	1124	(aio_load "$filename.pst", $av) >= 0
1018	or return;	1125	or return;
		1126
1019	$av = eval { (Storable::thaw $av)->{objs} };	1127	my $st = eval { Coro::Storable::thaw $av };
		1128	$av = $st->{objs};
1020	}	1129	}
1021		1130
		1131	utf8::decode (my $decname = $filename);
1022	warn sprintf "loading %s (%d)\n",	1132	warn sprintf "loading %s (%d,%d)\n",
1023	$filename, length $data, scalar @{$av \|\| []};	1133	$decname, length $data, scalar @{$av \|\| []};
		1134
1024	return ($data, $av);	1135	($data, $av)
1025	}	1136	}
1026		1137
1027	=head2 COMMAND CALLBACKS	1138	=head2 COMMAND CALLBACKS
1028		1139
1029	=over 4	1140	=over 4
…		…
1102	my ($pl, $buf) = @_;	1213	my ($pl, $buf) = @_;
1103		1214
1104	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1215	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105		1216
1106	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
1107	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1225	if (my $cb = $EXTCMD{$type}) {
1108	if (my %reply = $cb->($pl, $msg)) {	1226	@reply = $cb->($pl, @payload);
1109	$pl->ext_reply ($msg->{msgid}, %reply);
1110	}
1111	}	1227	}
		1228
		1229	$pl->ext_reply ($reply, @reply)
		1230	if $reply;
		1231
1112	} else {	1232	} else {
1113	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1233	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114	}	1234	}
1115		1235
1116	cf::override;	1236	cf::override;
…		…
1206		1326
1207	=head3 cf::player	1327	=head3 cf::player
1208		1328
1209	=over 4	1329	=over 4
1210		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
1211	=item cf::player::find $login	1345	=item cf::player::find $login
1212		1346
1213	Returns the given player object, loading it if necessary (might block).	1347	Returns the given player object, loading it if necessary (might block).
1214		1348
1215	=cut	1349	=cut
…		…
1250	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1384	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1251	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1385	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1252	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1386	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1253	aio_unlink +(playerdir $login) . "/$login.pl";	1387	aio_unlink +(playerdir $login) . "/$login.pl";
1254		1388
1255	my $pl = load_pl path $login	1389	my $f = new_from_file cf::object::thawer path $login
1256	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;
1257	$cf::PLAYER{$login} = $pl	1396	$cf::PLAYER{$login} = $pl
1258	}	1397	}
1259	}	1398	}
1260	}	1399	}
1261		1400
…		…
1271		1410
1272	aio_mkdir playerdir $pl, 0770;	1411	aio_mkdir playerdir $pl, 0770;
1273	$pl->{last_save} = $cf::RUNTIME;	1412	$pl->{last_save} = $cf::RUNTIME;
1274		1413
1275	$pl->save_pl ($path);	1414	$pl->save_pl ($path);
1276	Coro::cede;	1415	cf::cede_to_tick;
1277	}	1416	}
1278		1417
1279	sub new($) {	1418	sub new($) {
1280	my ($login) = @_;	1419	my ($login) = @_;
1281		1420
…		…
1285	$self->{deny_save} = 1;	1424	$self->{deny_save} = 1;
1286		1425
1287	$cf::PLAYER{$login} = $self;	1426	$cf::PLAYER{$login} = $self;
1288		1427
1289	$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 (@_);
1290	}	1439	}
1291		1440
1292	=item $pl->quit_character	1441	=item $pl->quit_character
1293		1442
1294	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
…		…
1349	or return [];	1498	or return [];
1350		1499
1351	my @logins;	1500	my @logins;
1352		1501
1353	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") {
1354	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1507	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1355	aio_read $fh, 0, 512, my $buf, 0 or next;	1508	aio_read $fh, 0, 512, my $buf, 0 or next;
1356	$buf !~ /^password -------------$/m or next; # official not-valid tag	1509	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1510	}
1357		1511
1358	utf8::decode $login;	1512	utf8::decode $login;
1359	push @logins, $login;	1513	push @logins, $login;
1360	}	1514	}
1361		1515
…		…
1394		1548
1395	Expand crossfire pod fragments into protocol xml.	1549	Expand crossfire pod fragments into protocol xml.
1396		1550
1397	=cut	1551	=cut
1398		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
1399	sub expand_cfpod {	1564	sub expand_cfpod {
1400	((my $self), (local $_)) = @_;	1565	my ($self, $pod) = @_;
1401		1566
1402	# escape & and <	1567	my $xml;
1403	s/&/&/g;
1404	s/(?<![BIUGH])</</g;
1405		1568
1406	# this is buggy, it needs to properly take care of nested <'s	1569	while () {
		1570	if ($pod =~ /\G( (?: [^BCGHITU]+ \| .(?!<) )+ )/xgcs) {
		1571	$group = $1;
1407		1572
1408	1 while	1573	$group =~ s/&/&/g;
1409	# replace B<>, I<>, U<> etc.	1574	$group =~ s/</</g;
1410	s/B<([^\>]*)>/<b>$1<\/b>/	1575
1411	\|\| s/I<([^\>]*)>/<i>$1<\/i>/	1576	$xml .= $group;
1412	\|\| s/U<([^\>]*)>/<u>$1<\/u>/	1577	} elsif ($pod =~ m%\G
1413	# replace G<male\|female> tags	1578	([BCGHITU])
1414	\|\| s{G<([^>\|])\\|([^>])>}{	1579	<
1415	$self->gender ? $2 : $1	1580	(?:
1416	}ge	1581	([^<>]*) (?{ $group = $^N })
1417	# replace H<hint text>	1582	\| < $interior >
1418	\|\| s{H<([^\>]*)>}	1583	)
		1584	>
		1585	%gcsx
1419	{	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") {
1420	("<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>",
1421	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",	1605	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1422	"")	1606	"")
1423	[$self->{hintmode}]	1607	[$self->{hintmode}];
		1608	} else {
		1609	$xml .= "error processing '$code($data)' directive";
1424	}ge;	1610	}
		1611	} else {
		1612	if ($pod =~ /\G(.+)/) {
		1613	warn "parse error while expanding $pod (at $1)";
		1614	}
		1615	last;
		1616	}
		1617	}
1425		1618
		1619	for ($xml) {
1426	# create single paragraphs (very hackish)	1620	# create single paragraphs (very hackish)
1427	s/(?<=\S)\n(?=\w)/ /g;	1621	s/(?<=\S)\n(?=\w)/ /g;
1428		1622
1429	# compress some whitespace	1623	# compress some whitespace
1430	s/\s+\n/\n/g; # ws line-ends	1624	s/\s+\n/\n/g; # ws line-ends
1431	s/\n\n+/\n/g; # double lines	1625	s/\n\n+/\n/g; # double lines
1432	s/^\n+//; # beginning lines	1626	s/^\n+//; # beginning lines
1433	s/\n+$//; # ending lines	1627	s/\n+$//; # ending lines
		1628	}
1434		1629
1435	$_	1630	$xml
1436	}	1631	}
		1632
		1633	no re 'eval';
1437		1634
1438	sub hintmode {	1635	sub hintmode {
1439	$_[0]{hintmode} = $_[1] if @_ > 1;	1636	$_[0]{hintmode} = $_[1] if @_ > 1;
1440	$_[0]{hintmode}	1637	$_[0]{hintmode}
1441	}	1638	}
1442		1639
1443	=item $player->ext_reply ($msgid, %msg)	1640	=item $player->ext_reply ($msgid, @msg)
1444		1641
1445	Sends an ext reply to the player.	1642	Sends an ext reply to the player.
1446		1643
1447	=cut	1644	=cut
1448		1645
1449	sub ext_reply($$%) {	1646	sub ext_reply($$@) {
1450	my ($self, $id, %msg) = @_;	1647	my ($self, $id, @msg) = @_;
1451		1648
1452	$msg{msgid} = $id;	1649	$self->ns->ext_reply ($id, @msg)
1453	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1454	}	1650	}
1455		1651
1456	=item $player->ext_event ($type, %msg)	1652	=item $player->ext_msg ($type, @msg)
1457		1653
1458	Sends an ext event to the client.	1654	Sends an ext event to the client.
1459		1655
1460	=cut	1656	=cut
1461		1657
1462	sub ext_event($$%) {	1658	sub ext_msg($$@) {
1463	my ($self, $type, %msg) = @_;	1659	my ($self, $type, @msg) = @_;
1464		1660
1465	$self->ns->ext_event ($type, %msg);	1661	$self->ns->ext_msg ($type, @msg);
1466	}	1662	}
1467		1663
1468	=head3 cf::region	1664	=head3 cf::region
1469		1665
1470	=over 4	1666	=over 4
…		…
1483	my ($path) = @_;	1679	my ($path) = @_;
1484		1680
1485	my ($match, $specificity);	1681	my ($match, $specificity);
1486		1682
1487	for my $region (list) {	1683	for my $region (list) {
1488	if ($region->match && $path =~ $region->match) {	1684	if ($region->{match} && $path =~ $region->{match}) {
1489	($match, $specificity) = ($region, $region->specificity)	1685	($match, $specificity) = ($region, $region->specificity)
1490	if $region->specificity > $specificity;	1686	if $region->specificity > $specificity;
1491	}	1687	}
1492	}	1688	}
1493		1689
…		…
1613	$self->init; # pass $1 etc.	1809	$self->init; # pass $1 etc.
1614	return $self;	1810	return $self;
1615	}	1811	}
1616	}	1812	}
1617		1813
1618	Carp::carp "unable to resolve path '$path' (base '$base').";	1814	Carp::cluck "unable to resolve path '$path' (base '$base').";
1619	()	1815	()
1620	}	1816	}
1621		1817
1622	sub init {	1818	sub init {
1623	my ($self) = @_;	1819	my ($self) = @_;
…		…
1686		1882
1687	sub load_header_from($) {	1883	sub load_header_from($) {
1688	my ($self, $path) = @_;	1884	my ($self, $path) = @_;
1689		1885
1690	utf8::encode $path;	1886	utf8::encode $path;
1691	#aio_open $path, O_RDONLY, 0	1887	my $f = new_from_file cf::object::thawer $path
1692	# or return;
1693
1694	$self->_load_header ($path)
1695	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;
1696		1895
1697	$self->{load_path} = $path;	1896	$self->{load_path} = $path;
1698		1897
1699	1	1898	1
1700	}	1899	}
…		…
1754	sub find {	1953	sub find {
1755	my ($path, $origin) = @_;	1954	my ($path, $origin) = @_;
1756		1955
1757	$path = normalise $path, $origin && $origin->path;	1956	$path = normalise $path, $origin && $origin->path;
1758		1957
		1958	cf::lock_wait "map_data:$path";#d#remove
1759	cf::lock_wait "map_find:$path";	1959	cf::lock_wait "map_find:$path";
1760		1960
1761	$cf::MAP{$path} \|\| do {	1961	$cf::MAP{$path} \|\| do {
1762	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
1763	my $map = new_from_path cf::map $path	1965	my $map = new_from_path cf::map $path
1764	or return;	1966	or return;
1765		1967
1766	$map->{last_save} = $cf::RUNTIME;	1968	$map->{last_save} = $cf::RUNTIME;
1767		1969
…		…
1769	or return;	1971	or return;
1770		1972
1771	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1973	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1772	# doing this can freeze the server in a sync job, obviously	1974	# doing this can freeze the server in a sync job, obviously
1773	#$cf::WAIT_FOR_TICK->wait;	1975	#$cf::WAIT_FOR_TICK->wait;
		1976	undef $guard1;
		1977	undef $guard2;
1774	$map->reset;	1978	$map->reset;
1775	undef $guard;
1776	return find $path;	1979	return find $path;
1777	}	1980	}
1778		1981
1779	$cf::MAP{$path} = $map	1982	$cf::MAP{$path} = $map
1780	}	1983	}
…		…
1789	local $self->{deny_reset} = 1; # loading can take a long time	1992	local $self->{deny_reset} = 1; # loading can take a long time
1790		1993
1791	my $path = $self->{path};	1994	my $path = $self->{path};
1792		1995
1793	{	1996	{
1794	my $guard = cf::lock_acquire "map_load:$path";	1997	my $guard = cf::lock_acquire "map_data:$path";
1795		1998
		1999	return unless $self->valid;
1796	return if $self->in_memory != cf::MAP_SWAPPED;	2000	return unless $self->in_memory == cf::MAP_SWAPPED;
1797		2001
1798	$self->in_memory (cf::MAP_LOADING);	2002	$self->in_memory (cf::MAP_LOADING);
1799		2003
1800	$self->alloc;	2004	$self->alloc;
1801		2005
1802	$self->pre_load;	2006	$self->pre_load;
1803	Coro::cede;	2007	cf::cede_to_tick;
1804		2008
		2009	my $f = new_from_file cf::object::thawer $self->{load_path};
		2010	$f->skip_block;
1805	$self->_load_objects ($self->{load_path}, 1)	2011	$self->_load_objects ($f)
1806	or return;	2012	or return;
1807		2013
1808	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2014	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1809	if delete $self->{load_original};	2015	if delete $self->{load_original};
1810		2016
1811	if (my $uniq = $self->uniq_path) {	2017	if (my $uniq = $self->uniq_path) {
1812	utf8::encode $uniq;	2018	utf8::encode $uniq;
1813	if (aio_open $uniq, O_RDONLY, 0) {	2019	unless (aio_stat $uniq) {
		2020	if (my $f = new_from_file cf::object::thawer $uniq) {
1814	$self->clear_unique_items;	2021	$self->clear_unique_items;
1815	$self->_load_objects ($uniq, 0);	2022	$self->_load_objects ($f);
		2023	$f->resolve_delayed_derefs;
		2024	}
1816	}	2025	}
1817	}	2026	}
1818		2027
1819	Coro::cede;	2028	$f->resolve_delayed_derefs;
		2029
		2030	cf::cede_to_tick;
1820	# now do the right thing for maps	2031	# now do the right thing for maps
1821	$self->link_multipart_objects;	2032	$self->link_multipart_objects;
1822	$self->difficulty ($self->estimate_difficulty)	2033	$self->difficulty ($self->estimate_difficulty)
1823	unless $self->difficulty;	2034	unless $self->difficulty;
1824	Coro::cede;	2035	cf::cede_to_tick;
1825		2036
1826	unless ($self->{deny_activate}) {	2037	unless ($self->{deny_activate}) {
1827	$self->decay_objects;	2038	$self->decay_objects;
1828	$self->fix_auto_apply;	2039	$self->fix_auto_apply;
1829	$self->update_buttons;	2040	$self->update_buttons;
1830	Coro::cede;	2041	cf::cede_to_tick;
1831	$self->set_darkness_map;	2042	$self->set_darkness_map;
1832	Coro::cede;	2043	cf::cede_to_tick;
1833	$self->activate;	2044	$self->activate;
1834	}	2045	}
		2046
		2047	$self->{last_save} = $cf::RUNTIME;
		2048	$self->last_access ($cf::RUNTIME);
1835		2049
1836	$self->in_memory (cf::MAP_IN_MEMORY);	2050	$self->in_memory (cf::MAP_IN_MEMORY);
1837	}	2051	}
1838		2052
1839	$self->post_load;	2053	$self->post_load;
…		…
1850		2064
1851	$self	2065	$self
1852	}	2066	}
1853		2067
1854	# 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
1855	sub load_diag {	2069	sub load_neighbours {
1856	my ($map) = @_;	2070	my ($map) = @_;
1857		2071
1858	my @diag; # diagonal neighbours	2072	my @neigh; # diagonal neighbours
1859		2073
1860	for (0 .. 3) {	2074	for (0 .. 3) {
1861	my $neigh = $map->tile_path ($_)	2075	my $neigh = $map->tile_path ($_)
1862	or next;	2076	or next;
1863	$neigh = find $neigh, $map	2077	$neigh = find $neigh, $map
1864	or next;	2078	or next;
1865	$neigh->load;	2079	$neigh->load;
1866		2080
		2081	push @neigh,
1867	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2082	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1868	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2083	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1869	}	2084	}
1870		2085
1871	for (@diag) {	2086	for (grep defined $_->[0], @neigh) {
		2087	my ($path, $origin) = @$_;
1872	my $neigh = find @$_	2088	my $neigh = find $path, $origin
1873	or next;	2089	or next;
1874	$neigh->load;	2090	$neigh->load;
1875	}	2091	}
1876	}	2092	}
1877		2093
…		…
1882	}	2098	}
1883		2099
1884	sub do_load_sync {	2100	sub do_load_sync {
1885	my ($map) = @_;	2101	my ($map) = @_;
1886		2102
		2103	cf::LOG cf::llevDebug \| cf::logBacktrace, "do_load_sync"
		2104	if $Coro::current == $Coro::main;
		2105
1887	cf::sync_job { $map->load };	2106	cf::sync_job { $map->load };
1888	}	2107	}
1889		2108
1890	our %MAP_PREFETCH;	2109	our %MAP_PREFETCH;
1891	our $MAP_PREFETCHER = undef;	2110	our $MAP_PREFETCHER = undef;
1892		2111
1893	sub find_async {	2112	sub find_async {
1894	my ($path, $origin) = @_;	2113	my ($path, $origin, $load) = @_;
1895		2114
1896	$path = normalise $path, $origin && $origin->{path};	2115	$path = normalise $path, $origin && $origin->{path};
1897		2116
1898	if (my $map = $cf::MAP{$path}) {	2117	if (my $map = $cf::MAP{$path}) {
1899	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2118	return $map if !$load \|\| $map->in_memory == cf::MAP_IN_MEMORY;
1900	}	2119	}
1901		2120
1902	undef $MAP_PREFETCH{$path};	2121	$MAP_PREFETCH{$path} \|= $load;
		2122
1903	$MAP_PREFETCHER \|\|= cf::async {	2123	$MAP_PREFETCHER \|\|= cf::async {
		2124	$Coro::current->{desc} = "map prefetcher";
		2125
1904	while (%MAP_PREFETCH) {	2126	while (%MAP_PREFETCH) {
1905	for my $path (keys %MAP_PREFETCH) {	2127	while (my ($k, $v) = each %MAP_PREFETCH) {
1906	my $map = find $path	2128	if (my $map = find $k) {
1907	or next;
1908	$map->load;	2129	$map->load if $v;
		2130	}
1909		2131
1910	delete $MAP_PREFETCH{$path};	2132	delete $MAP_PREFETCH{$k};
1911	}	2133	}
1912	}	2134	}
1913	undef $MAP_PREFETCHER;	2135	undef $MAP_PREFETCHER;
1914	};	2136	};
1915	$MAP_PREFETCHER->prio (6);	2137	$MAP_PREFETCHER->prio (6);
…		…
1918	}	2140	}
1919		2141
1920	sub save {	2142	sub save {
1921	my ($self) = @_;	2143	my ($self) = @_;
1922		2144
1923	my $lock = cf::lock_acquire "map_data:" . $self->path;	2145	my $lock = cf::lock_acquire "map_data:$self->{path}";
1924		2146
1925	$self->{last_save} = $cf::RUNTIME;	2147	$self->{last_save} = $cf::RUNTIME;
1926		2148
1927	return unless $self->dirty;	2149	return unless $self->dirty;
1928		2150
…		…
1934	return if $self->{deny_save};	2156	return if $self->{deny_save};
1935		2157
1936	local $self->{last_access} = $self->last_access;#d#	2158	local $self->{last_access} = $self->last_access;#d#
1937		2159
1938	cf::async {	2160	cf::async {
		2161	$Coro::current->{desc} = "map player save";
1939	$_->contr->save for $self->players;	2162	$_->contr->save for $self->players;
1940	};	2163	};
1941		2164
1942	if ($uniq) {	2165	if ($uniq) {
1943	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	2166	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
…		…
1951	my ($self) = @_;	2174	my ($self) = @_;
1952		2175
1953	# save first because save cedes	2176	# save first because save cedes
1954	$self->save;	2177	$self->save;
1955		2178
1956	my $lock = cf::lock_acquire "map_data:" . $self->path;	2179	my $lock = cf::lock_acquire "map_data:$self->{path}";
1957		2180
1958	return if $self->players;	2181	return if $self->players;
1959	return if $self->in_memory != cf::MAP_IN_MEMORY;	2182	return if $self->in_memory != cf::MAP_IN_MEMORY;
1960	return if $self->{deny_save};	2183	return if $self->{deny_save};
1961		2184
		2185	$self->in_memory (cf::MAP_SWAPPED);
		2186
		2187	$self->deactivate;
		2188	$_->clear_links_to ($self) for values %cf::MAP;
1962	$self->clear;	2189	$self->clear;
1963	$self->in_memory (cf::MAP_SWAPPED);
1964	}	2190	}
1965		2191
1966	sub reset_at {	2192	sub reset_at {
1967	my ($self) = @_;	2193	my ($self) = @_;
1968		2194
…		…
2000	if $uniq;	2226	if $uniq;
2001	}	2227	}
2002		2228
2003	delete $cf::MAP{$self->path};	2229	delete $cf::MAP{$self->path};
2004		2230
		2231	$self->deactivate;
		2232	$_->clear_links_to ($self) for values %cf::MAP;
2005	$self->clear;	2233	$self->clear;
2006
2007	$_->clear_links_to ($self) for values %cf::MAP;
2008		2234
2009	$self->unlink_save;	2235	$self->unlink_save;
2010	$self->destroy;	2236	$self->destroy;
2011	}	2237	}
2012		2238
2013	my $nuke_counter = "aaaa";	2239	my $nuke_counter = "aaaa";
2014		2240
2015	sub nuke {	2241	sub nuke {
2016	my ($self) = @_;	2242	my ($self) = @_;
2017		2243
		2244	{
		2245	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2246
2018	delete $cf::MAP{$self->path};	2247	delete $cf::MAP{$self->path};
2019		2248
2020	$self->unlink_save;	2249	$self->unlink_save;
2021		2250
2022	bless $self, "cf::map";	2251	bless $self, "cf::map";
2023	delete $self->{deny_reset};	2252	delete $self->{deny_reset};
2024	$self->{deny_save} = 1;	2253	$self->{deny_save} = 1;
2025	$self->reset_timeout (1);	2254	$self->reset_timeout (1);
2026	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2255	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2027		2256
2028	$cf::MAP{$self->path} = $self;	2257	$cf::MAP{$self->path} = $self;
		2258	}
2029		2259
2030	$self->reset; # polite request, might not happen	2260	$self->reset; # polite request, might not happen
2031	}	2261	}
2032		2262
2033	=item $maps = cf::map::tmp_maps	2263	=item $maps = cf::map::tmp_maps
…		…
2109		2339
2110	sub inv_recursive {	2340	sub inv_recursive {
2111	inv_recursive_ inv $_[0]	2341	inv_recursive_ inv $_[0]
2112	}	2342	}
2113		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
2114	package cf;	2372	package cf;
2115		2373
2116	=back	2374	=back
2117		2375
2118	=head3 cf::object::player	2376	=head3 cf::object::player
…		…
2140		2398
2141	} else {	2399	} else {
2142	my $pl = $self->contr;	2400	my $pl = $self->contr;
2143		2401
2144	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2402	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145	my $diag = $pl->{npc_dialog};	2403	my $dialog = $pl->{npc_dialog};
2146	$diag->{pl}->ext_reply (	2404	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2147	$diag->{id},
2148	msgtype => "reply",
2149	msg => $diag->{pl}->expand_cfpod ($msg),
2150	add_topics => []
2151	);
2152		2405
2153	} else {	2406	} else {
2154	$msg = $npc->name . " says: $msg" if $npc;	2407	$msg = $npc->name . " says: $msg" if $npc;
2155	$self->message ($msg, $flags);	2408	$self->message ($msg, $flags);
2156	}	2409	}
2157	}	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 (@_);
2158	}	2421	}
2159		2422
2160	=item $player_object->may ("access")	2423	=item $player_object->may ("access")
2161		2424
2162	Returns wether the given player is authorized to access resource "access"	2425	Returns wether the given player is authorized to access resource "access"
…		…
2241	# use -1 or undef as default coordinates, not 0, 0	2504	# use -1 or undef as default coordinates, not 0, 0
2242	($x, $y) = ($map->enter_x, $map->enter_y)	2505	($x, $y) = ($map->enter_x, $map->enter_y)
2243	if $x <=0 && $y <= 0;	2506	if $x <=0 && $y <= 0;
2244		2507
2245	$map->load;	2508	$map->load;
2246	$map->load_diag;	2509	$map->load_neighbours;
2247		2510
2248	return unless $self->contr->active;	2511	return unless $self->contr->active;
2249	$self->activate_recursive;	2512	$self->activate_recursive;
2250		2513
2251	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2514	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252	$self->enter_map ($map, $x, $y);	2515	$self->enter_map ($map, $x, $y);
2253	}	2516	}
2254		2517
2255	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2518	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256		2519
2257	Moves the player to the given map-path and coordinates by first freezing	2520	Moves the player to the given map-path and coordinates by first freezing
2258	her, loading and preparing them map, calling the provided $check callback	2521	her, loading and preparing them map, calling the provided $check callback
2259	that has to return the map if sucecssful, and then unfreezes the player on	2522	that has to return the map if sucecssful, and then unfreezes the player on
2260	the new (success) or old (failed) map position.	2523	the new (success) or old (failed) map position. In either case, $done will
		2524	be called at the end of this process.
2261		2525
2262	=cut	2526	=cut
2263		2527
2264	our $GOTOGEN;	2528	our $GOTOGEN;
2265		2529
2266	sub cf::object::player::goto {	2530	sub cf::object::player::goto {
2267	my ($self, $path, $x, $y, $check) = @_;	2531	my ($self, $path, $x, $y, $check, $done) = @_;
2268		2532
2269	# do generation counting so two concurrent goto's will be executed in-order	2533	# do generation counting so two concurrent goto's will be executed in-order
2270	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2534	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271		2535
2272	$self->enter_link;	2536	$self->enter_link;
2273		2537
2274	(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
2275	my $map = eval {	2560	my $map = eval {
2276	my $map = cf::map::find $path;	2561	my $map = defined $path ? cf::map::find $path : undef;
2277		2562
2278	if ($map) {	2563	if ($map) {
2279	$map = $map->customise_for ($self);	2564	$map = $map->customise_for ($self);
2280	$map = $check->($map) if $check && $map;	2565	$map = $check->($map) if $check && $map;
2281	} else {	2566	} else {
2282	$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);
2283	}	2568	}
2284		2569
2285	$map	2570	$map
2286	};	2571	};
2287		2572
…		…
2292		2577
2293	if ($gen == $self->{_goto_generation}) {	2578	if ($gen == $self->{_goto_generation}) {
2294	delete $self->{_goto_generation};	2579	delete $self->{_goto_generation};
2295	$self->leave_link ($map, $x, $y);	2580	$self->leave_link ($map, $x, $y);
2296	}	2581	}
		2582
		2583	$done->() if $done;
2297	})->prio (1);	2584	})->prio (1);
2298	}	2585	}
2299		2586
2300	=item $player_object->enter_exit ($exit_object)	2587	=item $player_object->enter_exit ($exit_object)
2301		2588
…		…
2375	# if exit is damned, update players death & WoR home-position	2662	# if exit is damned, update players death & WoR home-position
2376	$self->contr->savebed ($slaying, $hp, $sp)	2663	$self->contr->savebed ($slaying, $hp, $sp)
2377	if $exit->flag (FLAG_DAMNED);	2664	if $exit->flag (FLAG_DAMNED);
2378		2665
2379	(async {	2666	(async {
		2667	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2668
2380	$self->deactivate_recursive; # just to be sure	2669	$self->deactivate_recursive; # just to be sure
2381	unless (eval {	2670	unless (eval {
2382	$self->goto ($slaying, $hp, $sp);	2671	$self->goto ($slaying, $hp, $sp);
2383		2672
2384	1;	2673	1;
…		…
2410		2699
2411	utf8::encode $text;	2700	utf8::encode $text;
2412	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2701	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2413	}	2702	}
2414		2703
2415	=item $client->send_msg ($color, $type, $msg, [extra...])	2704	=item $client->send_msg ($channel, $msg, $color, [extra...])
2416		2705
2417	Send a drawinfo or msg packet to the client, formatting the msg for the	2706	Send a drawinfo or msg packet to the client, formatting the msg for the
2418	client if neccessary. C<$type> should be a string identifying the type of	2707	client if neccessary. C<$type> should be a string identifying the type of
2419	the message, with C<log> being the default. If C<$color> is negative, suppress	2708	the message, with C<log> being the default. If C<$color> is negative, suppress
2420	the message unless the client supports the msg packet.	2709	the message unless the client supports the msg packet.
2421		2710
2422	=cut	2711	=cut
2423		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
2424	sub cf::client::send_msg {	2765	sub cf::client::send_msg {
2425	my ($self, $color, $type, $msg, @extra) = @_;	2766	my ($self, $channel, $msg, $color, @extra) = @_;
2426		2767
2427	$msg = $self->pl->expand_cfpod ($msg);	2768	$msg = $self->pl->expand_cfpod ($msg);
2428		2769
		2770	$color &= cf::NDI_CLIENT_MASK; # just in case...
		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
		2781	} elsif (ref $channel) {
		2782	# send meta info to client, if not yet sent
		2783	unless (exists $self->{channel}{$channel->{id}}) {
		2784	$self->{channel}{$channel->{id}} = $channel;
		2785	$self->ext_msg (channel_info => $channel)
		2786	if $self->can_msg;
		2787	}
		2788
		2789	$channel = $channel->{id};
		2790	}
		2791
2429	return unless @extra \|\| length $msg;	2792	return unless @extra \|\| length $msg;
2430		2793
2431	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
2432	$self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));	2799	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2800	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2433	} else {	2801	} else {
2434	# replace some tags by gcfclient-compatible ones
2435	for ($msg) {
2436	1 while
2437	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2438	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2439	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2440	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2441	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2442	}
2443
2444	if ($color >= 0) {	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
2445	if (0 && $msg =~ /\[/) {	2817	if (0 && $msg =~ /\[/) {
		2818	# COMMAND/INFO
2446	$self->send_packet ("drawextinfo $color 4 0 $msg")	2819	$self->send_packet ("drawextinfo $color 10 8 $msg")
2447	} else {	2820	} else {
2448	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;	2821	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2449	$self->send_packet ("drawinfo $color $msg")	2822	$self->send_packet ("drawinfo $color $msg")
2450	}	2823	}
2451	}	2824	}
2452	}	2825	}
2453	}	2826	}
2454		2827
2455	=item $client->ext_event ($type, %msg)	2828	=item $client->ext_msg ($type, @msg)
2456		2829
2457	Sends an ext event to the client.	2830	Sends an ext event to the client.
2458		2831
2459	=cut	2832	=cut
2460		2833
2461	sub cf::client::ext_event($$%) {	2834	sub cf::client::ext_msg($$@) {
2462	my ($self, $type, %msg) = @_;	2835	my ($self, $type, @msg) = @_;
2463		2836
		2837	if ($self->extcmd == 2) {
		2838	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2839	} elsif ($self->extcmd == 1) { # TODO: remove
2464	$msg{msgtype} = "event_$type";	2840	push @msg, msgtype => "event_$type";
2465	$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	}
2466	}	2861	}
2467		2862
2468	=item $success = $client->query ($flags, "text", \&cb)	2863	=item $success = $client->query ($flags, "text", \&cb)
2469		2864
2470	Queues a query to the client, calling the given callback with	2865	Queues a query to the client, calling the given callback with
…		…
2525	my ($ns, $buf) = @_;	2920	my ($ns, $buf) = @_;
2526		2921
2527	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2922	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528		2923
2529	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
2530	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2932	if (my $cb = $EXTICMD{$type}) {
2531	if (my %reply = $cb->($ns, $msg)) {	2933	@reply = $cb->($ns, @payload);
2532	$reply{msgid} = $msg->{msgid};
2533	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534	}
2535	}	2934	}
		2935
		2936	$ns->ext_reply ($reply, @reply)
		2937	if $reply;
		2938
2536	} else {	2939	} else {
2537	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";
2538	}	2941	}
2539		2942
2540	cf::override;	2943	cf::override;
…		…
2587	our $safe = new Safe "safe";	2990	our $safe = new Safe "safe";
2588	our $safe_hole = new Safe::Hole;	2991	our $safe_hole = new Safe::Hole;
2589		2992
2590	$SIG{FPE} = 'IGNORE';	2993	$SIG{FPE} = 'IGNORE';
2591		2994
2592	$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	));
2593		3000
2594	# here we export the classes and methods available to script code	3001	# here we export the classes and methods available to script code
2595		3002
2596	=pod	3003	=pod
2597		3004
2598	The following functions and methods are available within a safe environment:	3005	The following functions and methods are available within a safe environment:
2599		3006
2600	cf::object	3007	cf::object
2601	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
2602	insert remove	3009	insert remove name archname title slaying race decrease_ob_nr
2603		3010
2604	cf::object::player	3011	cf::object::player
2605	player	3012	player
2606		3013
2607	cf::player	3014	cf::player
…		…
2612		3019
2613	=cut	3020	=cut
2614		3021
2615	for (	3022	for (
2616	["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
2617	insert remove)],	3025	decrease_ob_nr destroy)],
2618	["cf::object::player" => qw(player)],	3026	["cf::object::player" => qw(player)],
2619	["cf::player" => qw(peaceful)],	3027	["cf::player" => qw(peaceful)],
2620	["cf::map" => qw(trigger)],	3028	["cf::map" => qw(trigger)],
2621	) {	3029	) {
2622	no strict 'refs';	3030	no strict 'refs';
…		…
2698	# the server's init and main functions	3106	# the server's init and main functions
2699		3107
2700	sub load_facedata($) {	3108	sub load_facedata($) {
2701	my ($path) = @_;	3109	my ($path) = @_;
2702		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
2703	warn "loading facedata from $path\n";	3117	warn "loading facedata from $path\n";
2704		3118
2705	my $facedata;	3119	my $facedata;
2706	0 < aio_load $path, $facedata	3120	0 < aio_load $path, $facedata
2707	or die "$path: $!";	3121	or die "$path: $!";
…		…
2709	$facedata = Coro::Storable::thaw $facedata;	3123	$facedata = Coro::Storable::thaw $facedata;
2710		3124
2711	$facedata->{version} == 2	3125	$facedata->{version} == 2
2712	or cf::cleanup "$path: version mismatch, cannot proceed.";	3126	or cf::cleanup "$path: version mismatch, cannot proceed.";
2713		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;
		3134
2714	{	3135	{
2715	my $faces = $facedata->{faceinfo};	3136	my $faces = $facedata->{faceinfo};
2716		3137
2717	while (my ($face, $info) = each %$faces) {	3138	while (my ($face, $info) = each %$faces) {
2718	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3139	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2719	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3140	cf::face::set_visibility $idx, $info->{visibility};
		3141	cf::face::set_magicmap $idx, $info->{magicmap};
2720	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3142	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2721	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3143	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2722	Coro::cede;	3144
		3145	cf::cede_to_tick;
2723	}	3146	}
2724		3147
2725	while (my ($face, $info) = each %$faces) {	3148	while (my ($face, $info) = each %$faces) {
2726	next unless $info->{smooth};	3149	next unless $info->{smooth};
2727	my $idx = cf::face::find $face	3150	my $idx = cf::face::find $face
2728	or next;	3151	or next;
2729	if (my $smooth = cf::face::find $info->{smooth}) {	3152	if (my $smooth = cf::face::find $info->{smooth}) {
		3153	cf::face::set_smooth $idx, $smooth;
2730	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3154	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731	} else {	3155	} else {
2732	warn "smooth face '$info->{smooth}' not found for face '$face'";	3156	warn "smooth face '$info->{smooth}' not found for face '$face'";
2733	}	3157	}
2734	Coro::cede;	3158
		3159	cf::cede_to_tick;
2735	}	3160	}
2736	}	3161	}
2737		3162
2738	{	3163	{
2739	my $anims = $facedata->{animinfo};	3164	my $anims = $facedata->{animinfo};
2740		3165
2741	while (my ($anim, $info) = each %$anims) {	3166	while (my ($anim, $info) = each %$anims) {
2742	cf::anim::set $anim, $info->{frames}, $info->{facings};	3167	cf::anim::set $anim, $info->{frames}, $info->{facings};
2743	Coro::cede;	3168	cf::cede_to_tick;
2744	}	3169	}
2745		3170
2746	cf::anim::invalidate_all; # d'oh	3171	cf::anim::invalidate_all; # d'oh
2747	}	3172	}
2748		3173
		3174	{
		3175	# TODO: for gcfclient pleasure, we should give resources
		3176	# that gcfclient doesn't grok a >10000 face index.
		3177	my $res = $facedata->{resource};
		3178
		3179	my $soundconf = delete $res->{"res/sound.conf"};
		3180
		3181	while (my ($name, $info) = each %$res) {
		3182	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
		3183	my $data;
		3184
		3185	if ($info->{type} & 1) {
		3186	# prepend meta info
		3187
		3188	my $meta = $enc->encode ({
		3189	name => $name,
		3190	%{ $info->{meta} \|\| {} },
		3191	});
		3192
		3193	$data = pack "(w/a)", $meta, $info->{data};
		3194	} else {
		3195	$data = $info->{data};
		3196	}
		3197
		3198	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3199	cf::face::set_type $idx, $info->{type};
		3200
		3201	cf::cede_to_tick;
		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	}
		3221	}
		3222
2749	1	3223	1
2750	}	3224	}
2751		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
2752	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
2753	load_resource_file "$MAPDIR/regions"	3239	load_resource_file "$MAPDIR/regions"
2754	or die "unable to load regions file\n";	3240	or die "unable to load regions file\n";
		3241
		3242	for (cf::region::list) {
		3243	$_->{match} = qr/$_->{match}/
		3244	if exists $_->{match};
		3245	}
2755	}	3246	}
2756		3247
2757	sub reload_facedata {	3248	sub reload_facedata {
2758	load_facedata "$DATADIR/facedata"	3249	load_facedata "$DATADIR/facedata"
2759	or die "unable to load facedata\n";	3250	or die "unable to load facedata\n";
…		…
2788		3279
2789	sub init {	3280	sub init {
2790	reload_resources;	3281	reload_resources;
2791	}	3282	}
2792		3283
2793	sub cfg_load {	3284	sub reload_config {
2794	open my $fh, "<:utf8", "$CONFDIR/config"	3285	open my $fh, "<:utf8", "$CONFDIR/config"
2795	or return;	3286	or return;
2796		3287
2797	local $/;	3288	local $/;
2798	*CFG = YAML::Syck::Load <$fh>;	3289	*CFG = YAML::Syck::Load <$fh>;
…		…
2814	sub main {	3305	sub main {
2815	# we must not ever block the main coroutine	3306	# we must not ever block the main coroutine
2816	local $Coro::idle = sub {	3307	local $Coro::idle = sub {
2817	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#
2818	(async {	3309	(async {
		3310	$Coro::current->{desc} = "IDLE BUG HANDLER";
2819	Event::one_event;	3311	Event::one_event;
2820	})->prio (Coro::PRIO_MAX);	3312	})->prio (Coro::PRIO_MAX);
2821	};	3313	};
2822		3314
2823	cfg_load;	3315	reload_config;
2824	db_init;	3316	db_init;
2825	load_extensions;	3317	load_extensions;
2826		3318
2827	$TICK_WATCHER->start;	3319	$TICK_WATCHER->start;
2828	Event::loop;	3320	Event::loop;
…		…
2895	# and maps saved/destroyed asynchronously.	3387	# and maps saved/destroyed asynchronously.
2896	warn "begin emergency player save\n";	3388	warn "begin emergency player save\n";
2897	for my $login (keys %cf::PLAYER) {	3389	for my $login (keys %cf::PLAYER) {
2898	my $pl = $cf::PLAYER{$login} or next;	3390	my $pl = $cf::PLAYER{$login} or next;
2899	$pl->valid or next;	3391	$pl->valid or next;
		3392	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2900	$pl->save;	3393	$pl->save;
2901	}	3394	}
2902	warn "end emergency player save\n";	3395	warn "end emergency player save\n";
2903		3396
2904	warn "begin emergency map save\n";	3397	warn "begin emergency map save\n";
…		…
2952		3445
2953	warn "flushing outstanding aio requests";	3446	warn "flushing outstanding aio requests";
2954	for (;;) {	3447	for (;;) {
2955	BDB::flush;	3448	BDB::flush;
2956	IO::AIO::flush;	3449	IO::AIO::flush;
2957	Coro::cede;	3450	Coro::cede_notself;
2958	last unless IO::AIO::nreqs \|\| BDB::nreqs;	3451	last unless IO::AIO::nreqs \|\| BDB::nreqs;
2959	warn "iterate...";	3452	warn "iterate...";
2960	}	3453	}
2961		3454
2962	++$RELOAD;	3455	++$RELOAD;
…		…
3021	warn "reloading cf.pm";	3514	warn "reloading cf.pm";
3022	require cf;	3515	require cf;
3023	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3516	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3024		3517
3025	warn "loading config and database again";	3518	warn "loading config and database again";
3026	cf::cfg_load;	3519	cf::reload_config;
3027		3520
3028	warn "loading extensions";	3521	warn "loading extensions";
3029	cf::load_extensions;	3522	cf::load_extensions;
3030		3523
3031	warn "reattaching attachments to objects/players";	3524	warn "reattaching attachments to objects/players";
…		…
3067	register_command "reload" => sub {	3560	register_command "reload" => sub {
3068	my ($who, $arg) = @_;	3561	my ($who, $arg) = @_;
3069		3562
3070	if ($who->flag (FLAG_WIZ)) {	3563	if ($who->flag (FLAG_WIZ)) {
3071	$who->message ("reloading server.");	3564	$who->message ("reloading server.");
		3565	async {
		3566	$Coro::current->{desc} = "perl_reload";
3072	async { reload_perl };	3567	reload_perl;
		3568	};
3073	}	3569	}
3074	};	3570	};
3075		3571
3076	unshift @INC, $LIBDIR;	3572	unshift @INC, $LIBDIR;
3077		3573
…		…
3096	my $signal = new Coro::Signal;	3592	my $signal = new Coro::Signal;
3097	push @WAIT_FOR_TICK_BEGIN, $signal;	3593	push @WAIT_FOR_TICK_BEGIN, $signal;
3098	$signal->wait;	3594	$signal->wait;
3099	}	3595	}
3100		3596
3101	my $min = 1e6;#d#
3102	my $avg = 10;
3103	$TICK_WATCHER = Event->timer (	3597	$TICK_WATCHER = Event->timer (
3104	reentrant => 0,	3598	reentrant => 0,
3105	parked => 1,	3599	parked => 1,
3106	prio => 0,	3600	prio => 0,
3107	at => $NEXT_TICK \|\| $TICK,	3601	at => $NEXT_TICK \|\| $TICK,
…		…
3115		3609
3116	$NOW = $tick_start = Event::time;	3610	$NOW = $tick_start = Event::time;
3117		3611
3118	cf::server_tick; # one server iteration	3612	cf::server_tick; # one server iteration
3119		3613
3120	0 && sync_job {#d#
3121	for(1..10) {
3122	my $t = Event::time;
3123	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3124	or die;
3125
3126	$map->width (50);
3127	$map->height (50);
3128	$map->alloc;
3129	$map->_load_objects ("/tmp/x.map", 1);
3130	my $t = Event::time - $t;
3131
3132	#next unless $t < 0.0013;#d#
3133	if ($t < $min) {
3134	$min = $t;
3135	}
3136	$avg = $avg * 0.99 + $t * 0.01;
3137	}
3138	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3139	exit 0;
3140	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3141	};
3142
3143	$RUNTIME += $TICK;	3614	$RUNTIME += $TICK;
3144	$NEXT_TICK += $TICK;	3615	$NEXT_TICK += $TICK;
3145		3616
3146	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3617	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3147	$NEXT_RUNTIME_WRITE = $NOW + 10;	3618	$NEXT_RUNTIME_WRITE = $NOW + 10;
3148	Coro::async_pool {	3619	Coro::async_pool {
		3620	$Coro::current->{desc} = "runtime saver";
3149	write_runtime	3621	write_runtime
3150	or warn "ERROR: unable to write runtime file: $!";	3622	or warn "ERROR: unable to write runtime file: $!";
3151	};	3623	};
3152	}	3624	}
3153		3625
3154	# my $AFTER = Event::time;
3155	# warn $AFTER - $NOW;#d#
3156
3157	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3626	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3158	$sig->send;	3627	$sig->send;
3159	}	3628	}
3160	while (my $sig = shift @WAIT_FOR_TICK) {	3629	while (my $sig = shift @WAIT_FOR_TICK) {
3161	$sig->send;	3630	$sig->send;
…		…
3171		3640
3172	$LOAD = ($NOW - $tick_start) / $TICK;	3641	$LOAD = ($NOW - $tick_start) / $TICK;
3173	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3642	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3174		3643
3175	_post_tick;	3644	_post_tick;
3176
3177
3178	},	3645	},
3179	);	3646	);
3180		3647
3181	{	3648	{
		3649	BDB::min_parallel 8;
3182	BDB::max_poll_time $TICK * 0.1;	3650	BDB::max_poll_time $TICK * 0.1;
3183	$BDB_POLL_WATCHER = Event->io (	3651	$BDB_POLL_WATCHER = Event->io (
3184	reentrant => 0,	3652	reentrant => 0,
3185	fd => BDB::poll_fileno,	3653	fd => BDB::poll_fileno,
3186	poll => 'r',	3654	poll => 'r',
3187	prio => 0,	3655	prio => 0,
3188	data => WF_AUTOCANCEL,	3656	data => WF_AUTOCANCEL,
3189	cb => \&BDB::poll_cb,	3657	cb => \&BDB::poll_cb,
3190	);	3658	);
3191	BDB::min_parallel 8;
3192		3659
3193	BDB::set_sync_prepare {	3660	BDB::set_sync_prepare {
3194	my $status;	3661	my $status;
3195	my $current = $Coro::current;	3662	my $current = $Coro::current;
3196	(	3663	(
…		…
3205	)	3672	)
3206	};	3673	};
3207		3674
3208	unless ($DB_ENV) {	3675	unless ($DB_ENV) {
3209	$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);
3210		3681
3211	cf::sync_job {	3682	cf::sync_job {
3212	eval {	3683	eval {
3213	BDB::db_env_open	3684	BDB::db_env_open
3214	$DB_ENV,	3685	$DB_ENV,
…		…
3216	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
3217	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	3688	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
3218	0666;	3689	0666;
3219		3690
3220	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3691	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3221
3222	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
3223	$DB_ENV->set_lk_detect;
3224	};	3692	};
3225		3693
3226	cf::cleanup "db_env_open(db): $@" if $@;	3694	cf::cleanup "db_env_open(db): $@" if $@;
3227	};	3695	};
3228	}	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	);
3229	}	3728	}
3230		3729
3231	{	3730	{
3232	IO::AIO::min_parallel 8;	3731	IO::AIO::min_parallel 8;
3233		3732
…		…
3236	$AIO_POLL_WATCHER = Event->io (	3735	$AIO_POLL_WATCHER = Event->io (
3237	reentrant => 0,	3736	reentrant => 0,
3238	data => WF_AUTOCANCEL,	3737	data => WF_AUTOCANCEL,
3239	fd => IO::AIO::poll_fileno,	3738	fd => IO::AIO::poll_fileno,
3240	poll => 'r',	3739	poll => 'r',
3241	prio => 6,	3740	prio => 0,
3242	cb => \&IO::AIO::poll_cb,	3741	cb => \&IO::AIO::poll_cb,
3243	);	3742	);
3244	}	3743	}
3245		3744
3246	my $_log_backtrace;	3745	my $_log_backtrace;
…		…
3252		3751
3253	# limit the # of concurrent backtraces	3752	# limit the # of concurrent backtraces
3254	if ($_log_backtrace < 2) {	3753	if ($_log_backtrace < 2) {
3255	++$_log_backtrace;	3754	++$_log_backtrace;
3256	async {	3755	async {
		3756	$Coro::current->{desc} = "abt $msg";
		3757
3257	my @bt = fork_call {	3758	my @bt = fork_call {
3258	@addr = map { sprintf "%x", $_ } @addr;	3759	@addr = map { sprintf "%x", $_ } @addr;
3259	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3760	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3260	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 \|"
3261	or die "addr2line: $!";	3762	or die "addr2line: $!";

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.298 by root, Sun Jul 8 14:50:07 2007 UTC vs. Revision 1.395 by root, Sat Nov 10 22:41:59 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.395 by root, Sat Nov 10 22:41:59 2007 UTC