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.304 by root, Wed Jul 11 16:55:18 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
169	returns directly I<after> the tick processing (and consequently, can only wake one process	173	returns directly I<after> the tick processing (and consequently, can only wake one process
170	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	174	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171		175
		176	=item @cf::INVOKE_RESULTS
		177
		178	This array contains the results of the last C<invoke ()> call. When
		179	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
		180	that call.
		181
172	=back	182	=back
173		183
174	=cut	184	=cut
175		185
176	BEGIN {	186	BEGIN {
…		…
180	$msg .= "\n"	190	$msg .= "\n"
181	unless $msg =~ /\n$/;	191	unless $msg =~ /\n$/;
182		192
183	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	193	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
184		194
185	utf8::encode $msg;
186	LOG llevError, $msg;	195	LOG llevError, $msg;
187	};	196	};
188	}	197	}
189		198
190	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	199	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
265	Wait until the given lock is available and then acquires it and returns	274	Wait until the given lock is available and then acquires it and returns
266	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	275	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
267	for example when the coroutine gets canceled), the lock is automatically	276	for example when the coroutine gets canceled), the lock is automatically
268	returned.	277	returned.
269		278
		279	Locks are *not* recursive, locking from the same coro twice results in a
		280	deadlocked coro.
		281
270	Lock names should begin with a unique identifier (for example, cf::map::find	282	Lock names should begin with a unique identifier (for example, cf::map::find
271	uses map_find and cf::map::load uses map_load).	283	uses map_find and cf::map::load uses map_load).
272		284
273	=item $locked = cf::lock_active $string	285	=item $locked = cf::lock_active $string
274		286
275	Return true if the lock is currently active, i.e. somebody has locked it.	287	Return true if the lock is currently active, i.e. somebody has locked it.
276		288
277	=cut	289	=cut
278		290
279	our %LOCK;	291	our %LOCK;
		292	our %LOCKER;#d#
280		293
281	sub lock_wait($) {	294	sub lock_wait($) {
282	my ($key) = @_;	295	my ($key) = @_;
		296
		297	if ($LOCKER{$key} == $Coro::current) {#d#
		298	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
		299	return;#d#
		300	}#d#
283		301
284	# wait for lock, if any	302	# wait for lock, if any
285	while ($LOCK{$key}) {	303	while ($LOCK{$key}) {
286	push @{ $LOCK{$key} }, $Coro::current;	304	push @{ $LOCK{$key} }, $Coro::current;
287	Coro::schedule;	305	Coro::schedule;
…		…
293		311
294	# wait, to be sure we are not locked	312	# wait, to be sure we are not locked
295	lock_wait $key;	313	lock_wait $key;
296		314
297	$LOCK{$key} = [];	315	$LOCK{$key} = [];
		316	$LOCKER{$key} = $Coro::current;#d#
298		317
299	Coro::guard {	318	Coro::guard {
		319	delete $LOCKER{$key};#d#
300	# wake up all waiters, to be on the safe side	320	# wake up all waiters, to be on the safe side
301	$_->ready for @{ delete $LOCK{$key} };	321	$_->ready for @{ delete $LOCK{$key} };
302	}	322	}
303	}	323	}
304		324
…		…
316	};	336	};
317	$TICK_WATCHER->stop;	337	$TICK_WATCHER->stop;
318	$guard	338	$guard
319	}	339	}
320		340
		341	=item cf::get_slot $time[, $priority[, $name]]
		342
		343	Allocate $time seconds of blocking CPU time at priority C<$priority>:
		344	This call blocks and returns only when you have at least C<$time> seconds
		345	of cpu time till the next tick. The slot is only valid till the next cede.
		346
		347	The optional C<$name> can be used to identify the job to run. It might be
		348	used for statistical purposes and should identify the same time-class.
		349
		350	Useful for short background jobs.
		351
		352	=cut
		353
		354	our @SLOT_QUEUE;
		355	our $SLOT_QUEUE;
		356
		357	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
		358	$SLOT_QUEUE = Coro::async {
		359	$Coro::current->desc ("timeslot manager");
		360
		361	my $signal = new Coro::Signal;
		362
		363	while () {
		364	next_job:
		365	my $avail = cf::till_tick;
		366	if ($avail > 0.01) {
		367	for (0 .. $#SLOT_QUEUE) {
		368	if ($SLOT_QUEUE[$_][0] < $avail) {
		369	my $job = splice @SLOT_QUEUE, $_, 1, ();
		370	$job->[2]->send;
		371	Coro::cede;
		372	goto next_job;
		373	}
		374	}
		375	}
		376
		377	if (@SLOT_QUEUE) {
		378	# we do not use wait_for_tick() as it returns immediately when tick is inactive
		379	push @cf::WAIT_FOR_TICK, $signal;
		380	$signal->wait;
		381	} else {
		382	Coro::schedule;
		383	}
		384	}
		385	};
		386
		387	sub get_slot($;$$) {
		388	my ($time, $pri, $name) = @_;
		389
		390	$time = $TICK * .6 if $time > $TICK * .6;
		391	my $sig = new Coro::Signal;
		392
		393	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
		394	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
		395	$SLOT_QUEUE->ready;
		396	$sig->wait;
		397	}
		398
321	=item cf::async { BLOCK }	399	=item cf::async { BLOCK }
322		400
323	Currently the same as Coro::async_pool, meaning you cannot use	401	Currently the same as Coro::async_pool, meaning you cannot use
324	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only	402	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
325	thing you are allowed to do is call C<prio> on it.	403	thing you are allowed to do is call C<prio> on it.
…		…
328		406
329	BEGIN { *async = \&Coro::async_pool }	407	BEGIN { *async = \&Coro::async_pool }
330		408
331	=item cf::sync_job { BLOCK }	409	=item cf::sync_job { BLOCK }
332		410
333	The design of Crossfire TRT requires that the main coroutine ($Coro::main)	411	The design of Deliantra requires that the main coroutine ($Coro::main)
334	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
335	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
336	acceptable.	414	acceptable.
337		415
338	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
339	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
…		…
349	my $time = Event::time;	427	my $time = Event::time;
350		428
351	# this is the main coro, too bad, we have to block	429	# this is the main coro, too bad, we have to block
352	# till the operation succeeds, freezing the server :/	430	# till the operation succeeds, freezing the server :/
353		431
		432	LOG llevError, Carp::longmess "sync job";#d#
		433
354	# TODO: use suspend/resume instead	434	# TODO: use suspend/resume instead
355	# (but this is cancel-safe)	435	# (but this is cancel-safe)
356	my $freeze_guard = freeze_mainloop;	436	my $freeze_guard = freeze_mainloop;
357		437
358	my $busy = 1;	438	my $busy = 1;
359	my @res;	439	my @res;
360		440
361	(async {	441	(async {
		442	$Coro::current->desc ("sync job coro");
362	@res = eval { $job->() };	443	@res = eval { $job->() };
363	warn $@ if $@;	444	warn $@ if $@;
364	undef $busy;	445	undef $busy;
365	})->prio (Coro::PRIO_MAX);	446	})->prio (Coro::PRIO_MAX);
366		447
367	while ($busy) {	448	while ($busy) {
		449	if (Coro::nready) {
		450	Coro::cede_notself;
		451	} else {
368	Coro::cede or Event::one_event;	452	Event::one_event;
		453	}
369	}	454	}
370		455
371	$time = Event::time - $time;	456	$time = Event::time - $time;
372		457
373	LOG llevError | logBacktrace, Carp::longmess "long sync job"	458	LOG llevError | logBacktrace, Carp::longmess "long sync job"
…		…
410	Coro::Storable. May, of course, block. Note that the executed sub may	495	Coro::Storable. May, of course, block. Note that the executed sub may
411	never block itself or use any form of Event handling.	496	never block itself or use any form of Event handling.
412		497
413	=cut	498	=cut
414		499
415	sub _store_scalar {
416	open my $fh, ">", \my $buf
417	or die "fork_call: cannot open fh-to-buf in child : $!";
418	Storable::store_fd $_[0], $fh;
419	close $fh;
420
421	$buf
422	}
423
424	sub fork_call(&@) {	500	sub fork_call(&@) {
425	my ($cb, @args) = @_;	501	my ($cb, @args) = @_;
426		502
427	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC	503	# we seemingly have to make a local copy of the whole thing,
428	# or die "socketpair: $!";	504	# otherwise perl prematurely frees the stuff :/
429	pipe my $fh1, my $fh2	505	# TODO: investigate and fix (likely this will be rather laborious)
430	or die "pipe: $!";
431		506
432	if (my $pid = fork) {	507	my @res = Coro::Util::fork_eval {
433	close $fh2;
434
435	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436	warn "pst<$res>" unless $res =~ /^pst/;
437	$res = Coro::Storable::thaw $res;
438
439	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
440
441	Carp::confess $$res unless "ARRAY" eq ref $res;
442
443	return wantarray ? @$res : $res->[-1];
444	} else {
445	reset_signals;	508	reset_signals;
446	local $SIG{__WARN__};	509	&$cb
447	local $SIG{__DIE__};	510	}, @args;
448	# just in case, this hack effectively disables event
449	# in the child. cleaner and slower would be canceling all watchers,
450	# but this works for the time being.
451	local $Coro::idle;
452	$Coro::current->prio (Coro::PRIO_MAX);
453		511
454	eval {	512	wantarray ? @res : $res[-1]
455	close $fh1;
456
457	my @res = eval { $cb->(@args) };
458
459	syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
460	close $fh2;
461	};
462
463	warn $@ if $@;
464	_exit 0;
465	}
466	}	513	}
467		514
468	=item $value = cf::db_get $family => $key	515	=item $value = cf::db_get $family => $key
469		516
470	Returns a single value from the environment database.	517	Returns a single value from the environment database.
…		…
472	=item cf::db_put $family => $key => $value	519	=item cf::db_put $family => $key => $value
473		520
474	Stores the given C<$value> in the family. It can currently store binary	521	Stores the given C<$value> in the family. It can currently store binary
475	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).	522	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
476		523
		524	=item $db = cf::db_table "name"
		525
		526	Create and/or open a new database table. The string must not be "db" and must be unique
		527	within each server.
		528
477	=cut	529	=cut
		530
		531	sub db_table($) {
		532	my ($name) = @_;
		533	my $db = BDB::db_create $DB_ENV;
		534
		535	eval {
		536	$db->set_flags (BDB::CHKSUM);
		537
		538	utf8::encode $name;
		539	BDB::db_open $db, undef, $name, undef, BDB::BTREE,
		540	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
		541	cf::cleanup "db_open(db): $!" if $!;
		542	};
		543	cf::cleanup "db_open(db): $@" if $@;
		544
		545	$db
		546	}
478		547
479	our $DB;	548	our $DB;
480		549
481	sub db_init {	550	sub db_init {
482	unless ($DB) {
483	$DB = BDB::db_create $DB_ENV;
484
485	cf::sync_job {	551	cf::sync_job {
486	eval {	552	$DB ||= db_table "db";
487	$DB->set_flags (BDB::CHKSUM);
488
489	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
490	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
491	cf::cleanup "db_open(db): $!" if $!;
492	};
493	cf::cleanup "db_open(db): $@" if $@;
494	};
495	}	553	};
496	}	554	}
497		555
498	sub db_get($$) {	556	sub db_get($$) {
499	my $key = "$_[0]/$_[1]";	557	my $key = "$_[0]/$_[1]";
500		558
…		…
550	if (1) {	608	if (1) {
551	$md5 =	609	$md5 =
552	join "\x00",	610	join "\x00",
553	$processversion,	611	$processversion,
554	map {	612	map {
555	Coro::cede;	613	cf::cede_to_tick;
556	($src->[$_], Digest::MD5::md5_hex $data[$_])	614	($src->[$_], Digest::MD5::md5_hex $data[$_])
557	} 0.. $#$src;	615	} 0.. $#$src;
558		616
559		617
560	my $dbmd5 = db_get cache => "$id/md5";	618	my $dbmd5 = db_get cache => "$id/md5";
…		…
604	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")
605	to it. All such attachable objects support the following methods.	663	to it. All such attachable objects support the following methods.
606		664
607	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>
608	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
609	Crossfire TRT).	667	Deliantra).
610		668
611	=over 4	669	=over 4
612		670
613	=item $attachable->attach ($attachment, key => $value...)	671	=item $attachable->attach ($attachment, key => $value...)
614		672
…		…
866	";	924	";
867	die if $@;	925	die if $@;
868	}	926	}
869		927
870	our $override;	928	our $override;
871	our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?	929	our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
872		930
873	sub override {	931	sub override {
874	$override = 1;	932	$override = 1;
875	@invoke_results = ();	933	@INVOKE_RESULTS = (@_);
876	}	934	}
877		935
878	sub do_invoke {	936	sub do_invoke {
879	my $event = shift;	937	my $event = shift;
880	my $callbacks = shift;	938	my $callbacks = shift;
881		939
882	@invoke_results = ();	940	@INVOKE_RESULTS = ();
883		941
884	local $override;	942	local $override;
885		943
886	for (@$callbacks) {	944	for (@$callbacks) {
887	eval { &{$_->[1]} };	945	eval { &{$_->[1]} };
…		…
904		962
905	Generate an object-specific event with the given arguments.	963	Generate an object-specific event with the given arguments.
906		964
907	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be	965	This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
908	removed in future versions), and there is no public API to access override	966	removed in future versions), and there is no public API to access override
909	results (if you must, access C<@cf::invoke_results> directly).	967	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910		968
911	=back	969	=back
912		970
913	=cut	971	=cut
914		972
915	#############################################################################	973	#############################################################################
916	# object support	974	# object support
		975
		976	sub _object_equal($$);
		977	sub _object_equal($$) {
		978	my ($a, $b) = @_;
		979
		980	return 0 unless (ref $a) eq (ref $b);
		981
		982	if ("HASH" eq ref $a) {
		983	my @ka = keys %$a;
		984	my @kb = keys %$b;
		985
		986	return 0 if @ka != @kb;
		987
		988	for (0 .. $#ka) {
		989	return 0 unless $ka[$_] eq $kb[$_];
		990	return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
		991	}
		992
		993	} elsif ("ARRAY" eq ref $a) {
		994
		995	return 0 if @$a != @$b;
		996
		997	for (0 .. $#$a) {
		998	return 0 unless _object_equal $a->[$_], $b->[$_];
		999	}
		1000
		1001	} elsif ($a ne $b) {
		1002	return 0;
		1003	}
		1004
		1005	1
		1006	}
		1007
		1008	our $SLOW_MERGES;#d#
		1009	sub _can_merge {
		1010	my ($ob1, $ob2) = @_;
		1011
		1012	++$SLOW_MERGES;#d#
		1013
		1014	# we do the slow way here
		1015	return _object_equal $ob1, $ob2
		1016	}
917		1017
918	sub reattach {	1018	sub reattach {
919	# basically do the same as instantiate, without calling instantiate	1019	# basically do the same as instantiate, without calling instantiate
920	my ($obj) = @_;	1020	my ($obj) = @_;
921		1021
…		…
968	sub object_freezer_save {	1068	sub object_freezer_save {
969	my ($filename, $rdata, $objs) = @_;	1069	my ($filename, $rdata, $objs) = @_;
970		1070
971	sync_job {	1071	sync_job {
972	if (length $$rdata) {	1072	if (length $$rdata) {
		1073	utf8::decode (my $decname = $filename);
973	warn sprintf "saving %s (%d,%d)\n",	1074	warn sprintf "saving %s (%d,%d)\n",
974	$filename, length $$rdata, scalar @$objs;	1075	$decname, length $$rdata, scalar @$objs;
975		1076
976	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1077	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
977	chmod SAVE_MODE, $fh;	1078	chmod SAVE_MODE, $fh;
978	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1079	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
979	aio_fsync $fh if $cf::USE_FSYNC;	1080	aio_fsync $fh if $cf::USE_FSYNC;
980	close $fh;	1081	close $fh;
981		1082
982	if (@$objs) {	1083	if (@$objs) {
983	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1084	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
984	chmod SAVE_MODE, $fh;	1085	chmod SAVE_MODE, $fh;
985	my $data = Storable::nfreeze { version => 1, objs => $objs };	1086	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
986	aio_write $fh, 0, (length $data), $data, 0;	1087	aio_write $fh, 0, (length $data), $data, 0;
987	aio_fsync $fh if $cf::USE_FSYNC;	1088	aio_fsync $fh if $cf::USE_FSYNC;
988	close $fh;	1089	close $fh;
989	aio_rename "$filename.pst~", "$filename.pst";	1090	aio_rename "$filename.pst~", "$filename.pst";
990	}	1091	}
…		…
998	}	1099	}
999	} else {	1100	} else {
1000	aio_unlink $filename;	1101	aio_unlink $filename;
1001	aio_unlink "$filename.pst";	1102	aio_unlink "$filename.pst";
1002	}	1103	}
1003	}	1104	};
1004	}	1105	}
1005		1106
1006	sub object_freezer_as_string {	1107	sub object_freezer_as_string {
1007	my ($rdata, $objs) = @_;	1108	my ($rdata, $objs) = @_;
1008		1109
…		…
1020	or return;	1121	or return;
1021		1122
1022	unless (aio_stat "$filename.pst") {	1123	unless (aio_stat "$filename.pst") {
1023	(aio_load "$filename.pst", $av) >= 0	1124	(aio_load "$filename.pst", $av) >= 0
1024	or return;	1125	or return;
		1126
1025	$av = eval { (Storable::thaw $av)->{objs} };	1127	my $st = eval { Coro::Storable::thaw $av };
		1128	$av = $st->{objs};
1026	}	1129	}
1027		1130
		1131	utf8::decode (my $decname = $filename);
1028	warn sprintf "loading %s (%d)\n",	1132	warn sprintf "loading %s (%d,%d)\n",
1029	$filename, length $data, scalar @{$av || []};	1133	$decname, length $data, scalar @{$av || []};
		1134
1030	return ($data, $av);	1135	($data, $av)
1031	}	1136	}
1032		1137
1033	=head2 COMMAND CALLBACKS	1138	=head2 COMMAND CALLBACKS
1034		1139
1035	=over 4	1140	=over 4
…		…
1108	my ($pl, $buf) = @_;	1213	my ($pl, $buf) = @_;
1109		1214
1110	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1215	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111		1216
1112	if (ref $msg) {	1217	if (ref $msg) {
		1218	my ($type, $reply, @payload) =
		1219	"ARRAY" eq ref $msg
		1220	? @$msg
		1221	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1222
		1223	my @reply;
		1224
1113	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1225	if (my $cb = $EXTCMD{$type}) {
1114	if (my %reply = $cb->($pl, $msg)) {	1226	@reply = $cb->($pl, @payload);
1115	$pl->ext_reply ($msg->{msgid}, %reply);
1116	}
1117	}	1227	}
		1228
		1229	$pl->ext_reply ($reply, @reply)
		1230	if $reply;
		1231
1118	} else {	1232	} else {
1119	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1233	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120	}	1234	}
1121		1235
1122	cf::override;	1236	cf::override;
…		…
1212		1326
1213	=head3 cf::player	1327	=head3 cf::player
1214		1328
1215	=over 4	1329	=over 4
1216		1330
		1331	=item cf::player::num_playing
		1332
		1333	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1334
		1335	=cut
		1336
		1337	sub num_playing {
		1338	scalar grep
		1339	$_->ob->map
		1340	&& !$_->hidden
		1341	&& !$_->ob->flag (cf::FLAG_WIZ),
		1342	cf::player::list
		1343	}
		1344
1217	=item cf::player::find $login	1345	=item cf::player::find $login
1218		1346
1219	Returns the given player object, loading it if necessary (might block).	1347	Returns the given player object, loading it if necessary (might block).
1220		1348
1221	=cut	1349	=cut
…		…
1256	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1384	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1385	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1386	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259	aio_unlink +(playerdir $login) . "/$login.pl";	1387	aio_unlink +(playerdir $login) . "/$login.pl";
1260		1388
1261	my $pl = load_pl path $login	1389	my $f = new_from_file cf::object::thawer path $login
1262	or return;	1390	or return;
		1391
		1392	my $pl = cf::player::load_pl $f
		1393	or return;
		1394	local $cf::PLAYER_LOADING{$login} = $pl;
		1395	$f->resolve_delayed_derefs;
1263	$cf::PLAYER{$login} = $pl	1396	$cf::PLAYER{$login} = $pl
1264	}	1397	}
1265	}	1398	}
1266	}	1399	}
1267		1400
…		…
1277		1410
1278	aio_mkdir playerdir $pl, 0770;	1411	aio_mkdir playerdir $pl, 0770;
1279	$pl->{last_save} = $cf::RUNTIME;	1412	$pl->{last_save} = $cf::RUNTIME;
1280		1413
1281	$pl->save_pl ($path);	1414	$pl->save_pl ($path);
1282	Coro::cede;	1415	cf::cede_to_tick;
1283	}	1416	}
1284		1417
1285	sub new($) {	1418	sub new($) {
1286	my ($login) = @_;	1419	my ($login) = @_;
1287		1420
…		…
1291	$self->{deny_save} = 1;	1424	$self->{deny_save} = 1;
1292		1425
1293	$cf::PLAYER{$login} = $self;	1426	$cf::PLAYER{$login} = $self;
1294		1427
1295	$self	1428	$self
		1429	}
		1430
		1431	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1432
		1433	=cut
		1434
		1435	sub send_msg {
		1436	my $ns = shift->ns
		1437	or return;
		1438	$ns->send_msg (@_);
1296	}	1439	}
1297		1440
1298	=item $pl->quit_character	1441	=item $pl->quit_character
1299		1442
1300	Nukes the player without looking back. If logged in, the connection will	1443	Nukes the player without looking back. If logged in, the connection will
…		…
1355	or return [];	1498	or return [];
1356		1499
1357	my @logins;	1500	my @logins;
1358		1501
1359	for my $login (@$dirs) {	1502	for my $login (@$dirs) {
		1503	my $path = path $login;
		1504
		1505	# a .pst is a dead give-away for a valid player
		1506	unless (-e "$path.pst") {
1360	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1507	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361	aio_read $fh, 0, 512, my $buf, 0 or next;	1508	aio_read $fh, 0, 512, my $buf, 0 or next;
1362	$buf !~ /^password -------------$/m or next; # official not-valid tag	1509	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1510	}
1363		1511
1364	utf8::decode $login;	1512	utf8::decode $login;
1365	push @logins, $login;	1513	push @logins, $login;
1366	}	1514	}
1367		1515
…		…
1400		1548
1401	Expand crossfire pod fragments into protocol xml.	1549	Expand crossfire pod fragments into protocol xml.
1402		1550
1403	=cut	1551	=cut
1404		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
1405	sub expand_cfpod {	1564	sub expand_cfpod {
1406	((my $self), (local $_)) = @_;	1565	my ($self, $pod) = @_;
1407		1566
1408	# escape & and <	1567	my $xml;
1409	s/&/&amp;/g;
1410	s/(?<![BIUGH])</&lt;/g;
1411		1568
1412	# this is buggy, it needs to properly take care of nested <'s	1569	while () {
		1570	if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
		1571	$group = $1;
1413		1572
1414	1 while	1573	$group =~ s/&/&amp;/g;
1415	# replace B<>, I<>, U<> etc.	1574	$group =~ s/</&lt;/g;
1416	s/B<([^\>]*)>/<b>$1<\/b>/	1575
1417	|| s/I<([^\>]*)>/<i>$1<\/i>/	1576	$xml .= $group;
1418	|| s/U<([^\>]*)>/<u>$1<\/u>/	1577	} elsif ($pod =~ m%\G
1419	# replace G<male|female> tags	1578	([BCGHITU])
1420	|| s{G<([^>|]*)\|([^>]*)>}{	1579	<
1421	$self->gender ? $2 : $1	1580	(?:
1422	}ge	1581	([^<>]*) (?{ $group = $^N })
1423	# replace H<hint text>	1582	| < $interior >
1424	|| s{H<([^\>]*)>}	1583	)
		1584	>
		1585	%gcsx
1425	{	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") {
1426	("<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>",
1427	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",	1605	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1428	"")	1606	"")
1429	[$self->{hintmode}]	1607	[$self->{hintmode}];
		1608	} else {
		1609	$xml .= "error processing '$code($data)' directive";
1430	}ge;	1610	}
		1611	} else {
		1612	if ($pod =~ /\G(.+)/) {
		1613	warn "parse error while expanding $pod (at $1)";
		1614	}
		1615	last;
		1616	}
		1617	}
1431		1618
		1619	for ($xml) {
1432	# create single paragraphs (very hackish)	1620	# create single paragraphs (very hackish)
1433	s/(?<=\S)\n(?=\w)/ /g;	1621	s/(?<=\S)\n(?=\w)/ /g;
1434		1622
1435	# compress some whitespace	1623	# compress some whitespace
1436	s/\s+\n/\n/g; # ws line-ends	1624	s/\s+\n/\n/g; # ws line-ends
1437	s/\n\n+/\n/g; # double lines	1625	s/\n\n+/\n/g; # double lines
1438	s/^\n+//; # beginning lines	1626	s/^\n+//; # beginning lines
1439	s/\n+$//; # ending lines	1627	s/\n+$//; # ending lines
		1628	}
1440		1629
1441	$_	1630	$xml
1442	}	1631	}
		1632
		1633	no re 'eval';
1443		1634
1444	sub hintmode {	1635	sub hintmode {
1445	$_[0]{hintmode} = $_[1] if @_ > 1;	1636	$_[0]{hintmode} = $_[1] if @_ > 1;
1446	$_[0]{hintmode}	1637	$_[0]{hintmode}
1447	}	1638	}
1448		1639
1449	=item $player->ext_reply ($msgid, %msg)	1640	=item $player->ext_reply ($msgid, @msg)
1450		1641
1451	Sends an ext reply to the player.	1642	Sends an ext reply to the player.
1452		1643
1453	=cut	1644	=cut
1454		1645
1455	sub ext_reply($$%) {	1646	sub ext_reply($$@) {
1456	my ($self, $id, %msg) = @_;	1647	my ($self, $id, @msg) = @_;
1457		1648
1458	$msg{msgid} = $id;	1649	$self->ns->ext_reply ($id, @msg)
1459	$self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460	}	1650	}
1461		1651
1462	=item $player->ext_event ($type, %msg)	1652	=item $player->ext_msg ($type, @msg)
1463		1653
1464	Sends an ext event to the client.	1654	Sends an ext event to the client.
1465		1655
1466	=cut	1656	=cut
1467		1657
1468	sub ext_event($$%) {	1658	sub ext_msg($$@) {
1469	my ($self, $type, %msg) = @_;	1659	my ($self, $type, @msg) = @_;
1470		1660
1471	$self->ns->ext_event ($type, %msg);	1661	$self->ns->ext_msg ($type, @msg);
1472	}	1662	}
1473		1663
1474	=head3 cf::region	1664	=head3 cf::region
1475		1665
1476	=over 4	1666	=over 4
…		…
1619	$self->init; # pass $1 etc.	1809	$self->init; # pass $1 etc.
1620	return $self;	1810	return $self;
1621	}	1811	}
1622	}	1812	}
1623		1813
1624	Carp::carp "unable to resolve path '$path' (base '$base').";	1814	Carp::cluck "unable to resolve path '$path' (base '$base').";
1625	()	1815	()
1626	}	1816	}
1627		1817
1628	sub init {	1818	sub init {
1629	my ($self) = @_;	1819	my ($self) = @_;
…		…
1692		1882
1693	sub load_header_from($) {	1883	sub load_header_from($) {
1694	my ($self, $path) = @_;	1884	my ($self, $path) = @_;
1695		1885
1696	utf8::encode $path;	1886	utf8::encode $path;
1697	#aio_open $path, O_RDONLY, 0	1887	my $f = new_from_file cf::object::thawer $path
1698	# or return;
1699
1700	$self->_load_header ($path)
1701	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;
1702		1895
1703	$self->{load_path} = $path;	1896	$self->{load_path} = $path;
1704		1897
1705	1	1898	1
1706	}	1899	}
…		…
1760	sub find {	1953	sub find {
1761	my ($path, $origin) = @_;	1954	my ($path, $origin) = @_;
1762		1955
1763	$path = normalise $path, $origin && $origin->path;	1956	$path = normalise $path, $origin && $origin->path;
1764		1957
		1958	cf::lock_wait "map_data:$path";#d#remove
1765	cf::lock_wait "map_find:$path";	1959	cf::lock_wait "map_find:$path";
1766		1960
1767	$cf::MAP{$path} || do {	1961	$cf::MAP{$path} || do {
1768	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
1769	my $map = new_from_path cf::map $path	1965	my $map = new_from_path cf::map $path
1770	or return;	1966	or return;
1771		1967
1772	$map->{last_save} = $cf::RUNTIME;	1968	$map->{last_save} = $cf::RUNTIME;
1773		1969
…		…
1775	or return;	1971	or return;
1776		1972
1777	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1973	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778	# doing this can freeze the server in a sync job, obviously	1974	# doing this can freeze the server in a sync job, obviously
1779	#$cf::WAIT_FOR_TICK->wait;	1975	#$cf::WAIT_FOR_TICK->wait;
		1976	undef $guard1;
		1977	undef $guard2;
1780	$map->reset;	1978	$map->reset;
1781	undef $guard;
1782	return find $path;	1979	return find $path;
1783	}	1980	}
1784		1981
1785	$cf::MAP{$path} = $map	1982	$cf::MAP{$path} = $map
1786	}	1983	}
…		…
1795	local $self->{deny_reset} = 1; # loading can take a long time	1992	local $self->{deny_reset} = 1; # loading can take a long time
1796		1993
1797	my $path = $self->{path};	1994	my $path = $self->{path};
1798		1995
1799	{	1996	{
1800	my $guard = cf::lock_acquire "map_load:$path";	1997	my $guard = cf::lock_acquire "map_data:$path";
1801		1998
		1999	return unless $self->valid;
1802	return if $self->in_memory != cf::MAP_SWAPPED;	2000	return unless $self->in_memory == cf::MAP_SWAPPED;
1803		2001
1804	$self->in_memory (cf::MAP_LOADING);	2002	$self->in_memory (cf::MAP_LOADING);
1805		2003
1806	$self->alloc;	2004	$self->alloc;
1807		2005
1808	$self->pre_load;	2006	$self->pre_load;
1809	Coro::cede;	2007	cf::cede_to_tick;
1810		2008
		2009	my $f = new_from_file cf::object::thawer $self->{load_path};
		2010	$f->skip_block;
1811	$self->_load_objects ($self->{load_path}, 1)	2011	$self->_load_objects ($f)
1812	or return;	2012	or return;
1813		2013
1814	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2014	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1815	if delete $self->{load_original};	2015	if delete $self->{load_original};
1816		2016
1817	if (my $uniq = $self->uniq_path) {	2017	if (my $uniq = $self->uniq_path) {
1818	utf8::encode $uniq;	2018	utf8::encode $uniq;
1819	if (aio_open $uniq, O_RDONLY, 0) {	2019	unless (aio_stat $uniq) {
		2020	if (my $f = new_from_file cf::object::thawer $uniq) {
1820	$self->clear_unique_items;	2021	$self->clear_unique_items;
1821	$self->_load_objects ($uniq, 0);	2022	$self->_load_objects ($f);
		2023	$f->resolve_delayed_derefs;
		2024	}
1822	}	2025	}
1823	}	2026	}
1824		2027
1825	Coro::cede;	2028	$f->resolve_delayed_derefs;
		2029
		2030	cf::cede_to_tick;
1826	# now do the right thing for maps	2031	# now do the right thing for maps
1827	$self->link_multipart_objects;	2032	$self->link_multipart_objects;
1828	$self->difficulty ($self->estimate_difficulty)	2033	$self->difficulty ($self->estimate_difficulty)
1829	unless $self->difficulty;	2034	unless $self->difficulty;
1830	Coro::cede;	2035	cf::cede_to_tick;
1831		2036
1832	unless ($self->{deny_activate}) {	2037	unless ($self->{deny_activate}) {
1833	$self->decay_objects;	2038	$self->decay_objects;
1834	$self->fix_auto_apply;	2039	$self->fix_auto_apply;
1835	$self->update_buttons;	2040	$self->update_buttons;
1836	Coro::cede;	2041	cf::cede_to_tick;
1837	$self->set_darkness_map;	2042	$self->set_darkness_map;
1838	Coro::cede;	2043	cf::cede_to_tick;
1839	$self->activate;	2044	$self->activate;
1840	}	2045	}
		2046
		2047	$self->{last_save} = $cf::RUNTIME;
		2048	$self->last_access ($cf::RUNTIME);
1841		2049
1842	$self->in_memory (cf::MAP_IN_MEMORY);	2050	$self->in_memory (cf::MAP_IN_MEMORY);
1843	}	2051	}
1844		2052
1845	$self->post_load;	2053	$self->post_load;
…		…
1856		2064
1857	$self	2065	$self
1858	}	2066	}
1859		2067
1860	# 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
1861	sub load_diag {	2069	sub load_neighbours {
1862	my ($map) = @_;	2070	my ($map) = @_;
1863		2071
1864	my @diag; # diagonal neighbours	2072	my @neigh; # diagonal neighbours
1865		2073
1866	for (0 .. 3) {	2074	for (0 .. 3) {
1867	my $neigh = $map->tile_path ($_)	2075	my $neigh = $map->tile_path ($_)
1868	or next;	2076	or next;
1869	$neigh = find $neigh, $map	2077	$neigh = find $neigh, $map
1870	or next;	2078	or next;
1871	$neigh->load;	2079	$neigh->load;
1872		2080
		2081	push @neigh,
1873	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2082	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1874	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2083	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1875	}	2084	}
1876		2085
1877	for (@diag) {	2086	for (grep defined $_->[0], @neigh) {
		2087	my ($path, $origin) = @$_;
1878	my $neigh = find @$_	2088	my $neigh = find $path, $origin
1879	or next;	2089	or next;
1880	$neigh->load;	2090	$neigh->load;
1881	}	2091	}
1882	}	2092	}
1883		2093
…		…
1888	}	2098	}
1889		2099
1890	sub do_load_sync {	2100	sub do_load_sync {
1891	my ($map) = @_;	2101	my ($map) = @_;
1892		2102
		2103	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2104	if $Coro::current == $Coro::main;
		2105
1893	cf::sync_job { $map->load };	2106	cf::sync_job { $map->load };
1894	}	2107	}
1895		2108
1896	our %MAP_PREFETCH;	2109	our %MAP_PREFETCH;
1897	our $MAP_PREFETCHER = undef;	2110	our $MAP_PREFETCHER = undef;
1898		2111
1899	sub find_async {	2112	sub find_async {
1900	my ($path, $origin) = @_;	2113	my ($path, $origin, $load) = @_;
1901		2114
1902	$path = normalise $path, $origin && $origin->{path};	2115	$path = normalise $path, $origin && $origin->{path};
1903		2116
1904	if (my $map = $cf::MAP{$path}) {	2117	if (my $map = $cf::MAP{$path}) {
1905	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2118	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1906	}	2119	}
1907		2120
1908	undef $MAP_PREFETCH{$path};	2121	$MAP_PREFETCH{$path} |= $load;
		2122
1909	$MAP_PREFETCHER ||= cf::async {	2123	$MAP_PREFETCHER ||= cf::async {
		2124	$Coro::current->{desc} = "map prefetcher";
		2125
1910	while (%MAP_PREFETCH) {	2126	while (%MAP_PREFETCH) {
1911	for my $path (keys %MAP_PREFETCH) {	2127	while (my ($k, $v) = each %MAP_PREFETCH) {
1912	my $map = find $path	2128	if (my $map = find $k) {
1913	or next;
1914	$map->load;	2129	$map->load if $v;
		2130	}
1915		2131
1916	delete $MAP_PREFETCH{$path};	2132	delete $MAP_PREFETCH{$k};
1917	}	2133	}
1918	}	2134	}
1919	undef $MAP_PREFETCHER;	2135	undef $MAP_PREFETCHER;
1920	};	2136	};
1921	$MAP_PREFETCHER->prio (6);	2137	$MAP_PREFETCHER->prio (6);
…		…
1924	}	2140	}
1925		2141
1926	sub save {	2142	sub save {
1927	my ($self) = @_;	2143	my ($self) = @_;
1928		2144
1929	my $lock = cf::lock_acquire "map_data:" . $self->path;	2145	my $lock = cf::lock_acquire "map_data:$self->{path}";
1930		2146
1931	$self->{last_save} = $cf::RUNTIME;	2147	$self->{last_save} = $cf::RUNTIME;
1932		2148
1933	return unless $self->dirty;	2149	return unless $self->dirty;
1934		2150
…		…
1940	return if $self->{deny_save};	2156	return if $self->{deny_save};
1941		2157
1942	local $self->{last_access} = $self->last_access;#d#	2158	local $self->{last_access} = $self->last_access;#d#
1943		2159
1944	cf::async {	2160	cf::async {
		2161	$Coro::current->{desc} = "map player save";
1945	$_->contr->save for $self->players;	2162	$_->contr->save for $self->players;
1946	};	2163	};
1947		2164
1948	if ($uniq) {	2165	if ($uniq) {
1949	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2166	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
1957	my ($self) = @_;	2174	my ($self) = @_;
1958		2175
1959	# save first because save cedes	2176	# save first because save cedes
1960	$self->save;	2177	$self->save;
1961		2178
1962	my $lock = cf::lock_acquire "map_data:" . $self->path;	2179	my $lock = cf::lock_acquire "map_data:$self->{path}";
1963		2180
1964	return if $self->players;	2181	return if $self->players;
1965	return if $self->in_memory != cf::MAP_IN_MEMORY;	2182	return if $self->in_memory != cf::MAP_IN_MEMORY;
1966	return if $self->{deny_save};	2183	return if $self->{deny_save};
1967		2184
		2185	$self->in_memory (cf::MAP_SWAPPED);
		2186
		2187	$self->deactivate;
		2188	$_->clear_links_to ($self) for values %cf::MAP;
1968	$self->clear;	2189	$self->clear;
1969	$self->in_memory (cf::MAP_SWAPPED);
1970	}	2190	}
1971		2191
1972	sub reset_at {	2192	sub reset_at {
1973	my ($self) = @_;	2193	my ($self) = @_;
1974		2194
…		…
2006	if $uniq;	2226	if $uniq;
2007	}	2227	}
2008		2228
2009	delete $cf::MAP{$self->path};	2229	delete $cf::MAP{$self->path};
2010		2230
		2231	$self->deactivate;
		2232	$_->clear_links_to ($self) for values %cf::MAP;
2011	$self->clear;	2233	$self->clear;
2012
2013	$_->clear_links_to ($self) for values %cf::MAP;
2014		2234
2015	$self->unlink_save;	2235	$self->unlink_save;
2016	$self->destroy;	2236	$self->destroy;
2017	}	2237	}
2018		2238
2019	my $nuke_counter = "aaaa";	2239	my $nuke_counter = "aaaa";
2020		2240
2021	sub nuke {	2241	sub nuke {
2022	my ($self) = @_;	2242	my ($self) = @_;
2023		2243
		2244	{
		2245	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2246
2024	delete $cf::MAP{$self->path};	2247	delete $cf::MAP{$self->path};
2025		2248
2026	$self->unlink_save;	2249	$self->unlink_save;
2027		2250
2028	bless $self, "cf::map";	2251	bless $self, "cf::map";
2029	delete $self->{deny_reset};	2252	delete $self->{deny_reset};
2030	$self->{deny_save} = 1;	2253	$self->{deny_save} = 1;
2031	$self->reset_timeout (1);	2254	$self->reset_timeout (1);
2032	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2255	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033		2256
2034	$cf::MAP{$self->path} = $self;	2257	$cf::MAP{$self->path} = $self;
		2258	}
2035		2259
2036	$self->reset; # polite request, might not happen	2260	$self->reset; # polite request, might not happen
2037	}	2261	}
2038		2262
2039	=item $maps = cf::map::tmp_maps	2263	=item $maps = cf::map::tmp_maps
…		…
2115		2339
2116	sub inv_recursive {	2340	sub inv_recursive {
2117	inv_recursive_ inv $_[0]	2341	inv_recursive_ inv $_[0]
2118	}	2342	}
2119		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
2120	package cf;	2372	package cf;
2121		2373
2122	=back	2374	=back
2123		2375
2124	=head3 cf::object::player	2376	=head3 cf::object::player
…		…
2146		2398
2147	} else {	2399	} else {
2148	my $pl = $self->contr;	2400	my $pl = $self->contr;
2149		2401
2150	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2402	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151	my $diag = $pl->{npc_dialog};	2403	my $dialog = $pl->{npc_dialog};
2152	$diag->{pl}->ext_reply (	2404	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153	$diag->{id},
2154	msgtype => "reply",
2155	msg => $diag->{pl}->expand_cfpod ($msg),
2156	add_topics => []
2157	);
2158		2405
2159	} else {	2406	} else {
2160	$msg = $npc->name . " says: $msg" if $npc;	2407	$msg = $npc->name . " says: $msg" if $npc;
2161	$self->message ($msg, $flags);	2408	$self->message ($msg, $flags);
2162	}	2409	}
2163	}	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 (@_);
2164	}	2421	}
2165		2422
2166	=item $player_object->may ("access")	2423	=item $player_object->may ("access")
2167		2424
2168	Returns wether the given player is authorized to access resource "access"	2425	Returns wether the given player is authorized to access resource "access"
…		…
2247	# use -1 or undef as default coordinates, not 0, 0	2504	# use -1 or undef as default coordinates, not 0, 0
2248	($x, $y) = ($map->enter_x, $map->enter_y)	2505	($x, $y) = ($map->enter_x, $map->enter_y)
2249	if $x <=0 && $y <= 0;	2506	if $x <=0 && $y <= 0;
2250		2507
2251	$map->load;	2508	$map->load;
2252	$map->load_diag;	2509	$map->load_neighbours;
2253		2510
2254	return unless $self->contr->active;	2511	return unless $self->contr->active;
2255	$self->activate_recursive;	2512	$self->activate_recursive;
2256		2513
2257	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2514	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258	$self->enter_map ($map, $x, $y);	2515	$self->enter_map ($map, $x, $y);
2259	}	2516	}
2260		2517
2261	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2518	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262		2519
2263	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
2264	her, loading and preparing them map, calling the provided $check callback	2521	her, loading and preparing them map, calling the provided $check callback
2265	that has to return the map if sucecssful, and then unfreezes the player on	2522	that has to return the map if sucecssful, and then unfreezes the player on
2266	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.
2267		2525
2268	=cut	2526	=cut
2269		2527
2270	our $GOTOGEN;	2528	our $GOTOGEN;
2271		2529
2272	sub cf::object::player::goto {	2530	sub cf::object::player::goto {
2273	my ($self, $path, $x, $y, $check) = @_;	2531	my ($self, $path, $x, $y, $check, $done) = @_;
2274		2532
2275	# 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
2276	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2534	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277		2535
2278	$self->enter_link;	2536	$self->enter_link;
2279		2537
2280	(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
2281	my $map = eval {	2560	my $map = eval {
2282	my $map = cf::map::find $path;	2561	my $map = defined $path ? cf::map::find $path : undef;
2283		2562
2284	if ($map) {	2563	if ($map) {
2285	$map = $map->customise_for ($self);	2564	$map = $map->customise_for ($self);
2286	$map = $check->($map) if $check && $map;	2565	$map = $check->($map) if $check && $map;
2287	} else {	2566	} else {
2288	$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);
2289	}	2568	}
2290		2569
2291	$map	2570	$map
2292	};	2571	};
2293		2572
…		…
2298		2577
2299	if ($gen == $self->{_goto_generation}) {	2578	if ($gen == $self->{_goto_generation}) {
2300	delete $self->{_goto_generation};	2579	delete $self->{_goto_generation};
2301	$self->leave_link ($map, $x, $y);	2580	$self->leave_link ($map, $x, $y);
2302	}	2581	}
		2582
		2583	$done->() if $done;
2303	})->prio (1);	2584	})->prio (1);
2304	}	2585	}
2305		2586
2306	=item $player_object->enter_exit ($exit_object)	2587	=item $player_object->enter_exit ($exit_object)
2307		2588
…		…
2381	# if exit is damned, update players death & WoR home-position	2662	# if exit is damned, update players death & WoR home-position
2382	$self->contr->savebed ($slaying, $hp, $sp)	2663	$self->contr->savebed ($slaying, $hp, $sp)
2383	if $exit->flag (FLAG_DAMNED);	2664	if $exit->flag (FLAG_DAMNED);
2384		2665
2385	(async {	2666	(async {
		2667	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2668
2386	$self->deactivate_recursive; # just to be sure	2669	$self->deactivate_recursive; # just to be sure
2387	unless (eval {	2670	unless (eval {
2388	$self->goto ($slaying, $hp, $sp);	2671	$self->goto ($slaying, $hp, $sp);
2389		2672
2390	1;	2673	1;
…		…
2416		2699
2417	utf8::encode $text;	2700	utf8::encode $text;
2418	$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);
2419	}	2702	}
2420		2703
2421	=item $client->send_msg ($color, $type, $msg, [extra...])	2704	=item $client->send_msg ($channel, $msg, $color, [extra...])
2422		2705
2423	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
2424	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
2425	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
2426	the message unless the client supports the msg packet.	2709	the message unless the client supports the msg packet.
2427		2710
2428	=cut	2711	=cut
2429		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
2430	sub cf::client::send_msg {	2765	sub cf::client::send_msg {
2431	my ($self, $color, $type, $msg, @extra) = @_;	2766	my ($self, $channel, $msg, $color, @extra) = @_;
2432		2767
2433	$msg = $self->pl->expand_cfpod ($msg);	2768	$msg = $self->pl->expand_cfpod ($msg);
2434		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
2435	return unless @extra || length $msg;	2792	return unless @extra || length $msg;
2436		2793
2437	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
2438	$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]));
2439	} else {	2801	} else {
2440	# replace some tags by gcfclient-compatible ones
2441	for ($msg) {
2442	1 while
2443	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448	}
2449
2450	if ($color >= 0) {	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
2451	if (0 && $msg =~ /\[/) {	2817	if (0 && $msg =~ /\[/) {
		2818	# COMMAND/INFO
2452	$self->send_packet ("drawextinfo $color 4 0 $msg")	2819	$self->send_packet ("drawextinfo $color 10 8 $msg")
2453	} else {	2820	} else {
2454	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	2821	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2455	$self->send_packet ("drawinfo $color $msg")	2822	$self->send_packet ("drawinfo $color $msg")
2456	}	2823	}
2457	}	2824	}
2458	}	2825	}
2459	}	2826	}
2460		2827
2461	=item $client->ext_event ($type, %msg)	2828	=item $client->ext_msg ($type, @msg)
2462		2829
2463	Sends an ext event to the client.	2830	Sends an ext event to the client.
2464		2831
2465	=cut	2832	=cut
2466		2833
2467	sub cf::client::ext_event($$%) {	2834	sub cf::client::ext_msg($$@) {
2468	my ($self, $type, %msg) = @_;	2835	my ($self, $type, @msg) = @_;
2469		2836
		2837	if ($self->extcmd == 2) {
		2838	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2839	} elsif ($self->extcmd == 1) { # TODO: remove
2470	$msg{msgtype} = "event_$type";	2840	push @msg, msgtype => "event_$type";
2471	$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	}
2472	}	2861	}
2473		2862
2474	=item $success = $client->query ($flags, "text", \&cb)	2863	=item $success = $client->query ($flags, "text", \&cb)
2475		2864
2476	Queues a query to the client, calling the given callback with	2865	Queues a query to the client, calling the given callback with
…		…
2531	my ($ns, $buf) = @_;	2920	my ($ns, $buf) = @_;
2532		2921
2533	my $msg = eval { $ns->{json_coder}->decode ($buf) };	2922	my $msg = eval { $ns->{json_coder}->decode ($buf) };
2534		2923
2535	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
2536	if (my $cb = $EXTICMD{$msg->{msgtype}}) {	2932	if (my $cb = $EXTICMD{$type}) {
2537	if (my %reply = $cb->($ns, $msg)) {	2933	@reply = $cb->($ns, @payload);
2538	$reply{msgid} = $msg->{msgid};
2539	$ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2540	}
2541	}	2934	}
		2935
		2936	$ns->ext_reply ($reply, @reply)
		2937	if $reply;
		2938
2542	} else {	2939	} else {
2543	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";
2544	}	2941	}
2545		2942
2546	cf::override;	2943	cf::override;
…		…
2593	our $safe = new Safe "safe";	2990	our $safe = new Safe "safe";
2594	our $safe_hole = new Safe::Hole;	2991	our $safe_hole = new Safe::Hole;
2595		2992
2596	$SIG{FPE} = 'IGNORE';	2993	$SIG{FPE} = 'IGNORE';
2597		2994
2598	$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	));
2599		3000
2600	# here we export the classes and methods available to script code	3001	# here we export the classes and methods available to script code
2601		3002
2602	=pod	3003	=pod
2603		3004
2604	The following functions and methods are available within a safe environment:	3005	The following functions and methods are available within a safe environment:
2605		3006
2606	cf::object	3007	cf::object
2607	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
2608	insert remove	3009	insert remove name archname title slaying race decrease_ob_nr
2609		3010
2610	cf::object::player	3011	cf::object::player
2611	player	3012	player
2612		3013
2613	cf::player	3014	cf::player
…		…
2618		3019
2619	=cut	3020	=cut
2620		3021
2621	for (	3022	for (
2622	["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
2623	insert remove)],	3025	decrease_ob_nr destroy)],
2624	["cf::object::player" => qw(player)],	3026	["cf::object::player" => qw(player)],
2625	["cf::player" => qw(peaceful)],	3027	["cf::player" => qw(peaceful)],
2626	["cf::map" => qw(trigger)],	3028	["cf::map" => qw(trigger)],
2627	) {	3029	) {
2628	no strict 'refs';	3030	no strict 'refs';
…		…
2704	# the server's init and main functions	3106	# the server's init and main functions
2705		3107
2706	sub load_facedata($) {	3108	sub load_facedata($) {
2707	my ($path) = @_;	3109	my ($path) = @_;
2708		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
2709	warn "loading facedata from $path\n";	3117	warn "loading facedata from $path\n";
2710		3118
2711	my $facedata;	3119	my $facedata;
2712	0 < aio_load $path, $facedata	3120	0 < aio_load $path, $facedata
2713	or die "$path: $!";	3121	or die "$path: $!";
2714		3122
2715	$facedata = Coro::Storable::thaw $facedata;	3123	$facedata = Coro::Storable::thaw $facedata;
2716		3124
2717	$facedata->{version} == 2	3125	$facedata->{version} == 2
2718	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;
2719		3134
2720	{	3135	{
2721	my $faces = $facedata->{faceinfo};	3136	my $faces = $facedata->{faceinfo};
2722		3137
2723	while (my ($face, $info) = each %$faces) {	3138	while (my ($face, $info) = each %$faces) {
2724	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3139	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2725	cf::face::set_visibility $idx, $info->{visibility};	3140	cf::face::set_visibility $idx, $info->{visibility};
2726	cf::face::set_magicmap $idx, $info->{magicmap};	3141	cf::face::set_magicmap $idx, $info->{magicmap};
2727	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3142	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2728	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3143	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2729		3144
2730	cf::cede_to_tick;	3145	cf::cede_to_tick;
2731	}	3146	}
2732		3147
2733	while (my ($face, $info) = each %$faces) {	3148	while (my ($face, $info) = each %$faces) {
…		…
2758		3173
2759	{	3174	{
2760	# TODO: for gcfclient pleasure, we should give resources	3175	# TODO: for gcfclient pleasure, we should give resources
2761	# that gcfclient doesn't grok a >10000 face index.	3176	# that gcfclient doesn't grok a >10000 face index.
2762	my $res = $facedata->{resource};	3177	my $res = $facedata->{resource};
2763	my $enc = JSON::XS->new->utf8->canonical;	3178
		3179	my $soundconf = delete $res->{"res/sound.conf"};
2764		3180
2765	while (my ($name, $info) = each %$res) {	3181	while (my ($name, $info) = each %$res) {
2766	my $meta = $enc->encode ({
2767	name => $name,
2768	type => $info->{type},
2769	copyright => $info->{copyright}, #TODO#
2770	});
2771	my $data = pack "(w/a*)*", $meta, $info->{data};
2772	my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2773
2774	my $idx = (cf::face::find $name) || cf::face::alloc $name;	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;
2775	cf::face::set_type $idx, 1;	3199	cf::face::set_type $idx, $info->{type};
2776	cf::face::set_data $idx, 0, $data, $chk;
2777		3200
2778	cf::cede_to_tick;	3201	cf::cede_to_tick;
2779	}	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	}
2780	}	3221	}
2781		3222
2782	1	3223	1
2783	}	3224	}
2784		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
2785	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
2786	load_resource_file "$MAPDIR/regions"	3239	load_resource_file "$MAPDIR/regions"
2787	or die "unable to load regions file\n";	3240	or die "unable to load regions file\n";
2788		3241
2789	for (cf::region::list) {	3242	for (cf::region::list) {
2790	$_->{match} = qr/$_->{match}/	3243	$_->{match} = qr/$_->{match}/
…		…
2826		3279
2827	sub init {	3280	sub init {
2828	reload_resources;	3281	reload_resources;
2829	}	3282	}
2830		3283
2831	sub cfg_load {	3284	sub reload_config {
2832	open my $fh, "<:utf8", "$CONFDIR/config"	3285	open my $fh, "<:utf8", "$CONFDIR/config"
2833	or return;	3286	or return;
2834		3287
2835	local $/;	3288	local $/;
2836	*CFG = YAML::Syck::Load <$fh>;	3289	*CFG = YAML::Syck::Load <$fh>;
…		…
2852	sub main {	3305	sub main {
2853	# we must not ever block the main coroutine	3306	# we must not ever block the main coroutine
2854	local $Coro::idle = sub {	3307	local $Coro::idle = sub {
2855	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#
2856	(async {	3309	(async {
		3310	$Coro::current->{desc} = "IDLE BUG HANDLER";
2857	Event::one_event;	3311	Event::one_event;
2858	})->prio (Coro::PRIO_MAX);	3312	})->prio (Coro::PRIO_MAX);
2859	};	3313	};
2860		3314
2861	cfg_load;	3315	reload_config;
2862	db_init;	3316	db_init;
2863	load_extensions;	3317	load_extensions;
2864		3318
2865	$TICK_WATCHER->start;	3319	$TICK_WATCHER->start;
2866	Event::loop;	3320	Event::loop;
…		…
2933	# and maps saved/destroyed asynchronously.	3387	# and maps saved/destroyed asynchronously.
2934	warn "begin emergency player save\n";	3388	warn "begin emergency player save\n";
2935	for my $login (keys %cf::PLAYER) {	3389	for my $login (keys %cf::PLAYER) {
2936	my $pl = $cf::PLAYER{$login} or next;	3390	my $pl = $cf::PLAYER{$login} or next;
2937	$pl->valid or next;	3391	$pl->valid or next;
		3392	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2938	$pl->save;	3393	$pl->save;
2939	}	3394	}
2940	warn "end emergency player save\n";	3395	warn "end emergency player save\n";
2941		3396
2942	warn "begin emergency map save\n";	3397	warn "begin emergency map save\n";
…		…
2990		3445
2991	warn "flushing outstanding aio requests";	3446	warn "flushing outstanding aio requests";
2992	for (;;) {	3447	for (;;) {
2993	BDB::flush;	3448	BDB::flush;
2994	IO::AIO::flush;	3449	IO::AIO::flush;
2995	Coro::cede;	3450	Coro::cede_notself;
2996	last unless IO::AIO::nreqs || BDB::nreqs;	3451	last unless IO::AIO::nreqs || BDB::nreqs;
2997	warn "iterate...";	3452	warn "iterate...";
2998	}	3453	}
2999		3454
3000	++$RELOAD;	3455	++$RELOAD;
…		…
3059	warn "reloading cf.pm";	3514	warn "reloading cf.pm";
3060	require cf;	3515	require cf;
3061	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3516	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3062		3517
3063	warn "loading config and database again";	3518	warn "loading config and database again";
3064	cf::cfg_load;	3519	cf::reload_config;
3065		3520
3066	warn "loading extensions";	3521	warn "loading extensions";
3067	cf::load_extensions;	3522	cf::load_extensions;
3068		3523
3069	warn "reattaching attachments to objects/players";	3524	warn "reattaching attachments to objects/players";
…		…
3105	register_command "reload" => sub {	3560	register_command "reload" => sub {
3106	my ($who, $arg) = @_;	3561	my ($who, $arg) = @_;
3107		3562
3108	if ($who->flag (FLAG_WIZ)) {	3563	if ($who->flag (FLAG_WIZ)) {
3109	$who->message ("reloading server.");	3564	$who->message ("reloading server.");
		3565	async {
		3566	$Coro::current->{desc} = "perl_reload";
3110	async { reload_perl };	3567	reload_perl;
		3568	};
3111	}	3569	}
3112	};	3570	};
3113		3571
3114	unshift @INC, $LIBDIR;	3572	unshift @INC, $LIBDIR;
3115		3573
…		…
3134	my $signal = new Coro::Signal;	3592	my $signal = new Coro::Signal;
3135	push @WAIT_FOR_TICK_BEGIN, $signal;	3593	push @WAIT_FOR_TICK_BEGIN, $signal;
3136	$signal->wait;	3594	$signal->wait;
3137	}	3595	}
3138		3596
3139	my $min = 1e6;#d#
3140	my $avg = 10;
3141	$TICK_WATCHER = Event->timer (	3597	$TICK_WATCHER = Event->timer (
3142	reentrant => 0,	3598	reentrant => 0,
3143	parked => 1,	3599	parked => 1,
3144	prio => 0,	3600	prio => 0,
3145	at => $NEXT_TICK || $TICK,	3601	at => $NEXT_TICK || $TICK,
…		…
3153		3609
3154	$NOW = $tick_start = Event::time;	3610	$NOW = $tick_start = Event::time;
3155		3611
3156	cf::server_tick; # one server iteration	3612	cf::server_tick; # one server iteration
3157		3613
3158	0 && sync_job {#d#
3159	for(1..10) {
3160	my $t = Event::time;
3161	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3162	or die;
3163
3164	$map->width (50);
3165	$map->height (50);
3166	$map->alloc;
3167	$map->_load_objects ("/tmp/x.map", 1);
3168	my $t = Event::time - $t;
3169
3170	#next unless $t < 0.0013;#d#
3171	if ($t < $min) {
3172	$min = $t;
3173	}
3174	$avg = $avg * 0.99 + $t * 0.01;
3175	}
3176	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3177	exit 0;
3178	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3179	};
3180
3181	$RUNTIME += $TICK;	3614	$RUNTIME += $TICK;
3182	$NEXT_TICK += $TICK;	3615	$NEXT_TICK += $TICK;
3183		3616
3184	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3617	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3185	$NEXT_RUNTIME_WRITE = $NOW + 10;	3618	$NEXT_RUNTIME_WRITE = $NOW + 10;
3186	Coro::async_pool {	3619	Coro::async_pool {
		3620	$Coro::current->{desc} = "runtime saver";
3187	write_runtime	3621	write_runtime
3188	or warn "ERROR: unable to write runtime file: $!";	3622	or warn "ERROR: unable to write runtime file: $!";
3189	};	3623	};
3190	}	3624	}
3191		3625
3192	# my $AFTER = Event::time;
3193	# warn $AFTER - $NOW;#d#
3194
3195	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3626	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3196	$sig->send;	3627	$sig->send;
3197	}	3628	}
3198	while (my $sig = shift @WAIT_FOR_TICK) {	3629	while (my $sig = shift @WAIT_FOR_TICK) {
3199	$sig->send;	3630	$sig->send;
…		…
3209		3640
3210	$LOAD = ($NOW - $tick_start) / $TICK;	3641	$LOAD = ($NOW - $tick_start) / $TICK;
3211	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3642	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3212		3643
3213	_post_tick;	3644	_post_tick;
3214
3215
3216	},	3645	},
3217	);	3646	);
3218		3647
3219	{	3648	{
		3649	BDB::min_parallel 8;
3220	BDB::max_poll_time $TICK * 0.1;	3650	BDB::max_poll_time $TICK * 0.1;
3221	$BDB_POLL_WATCHER = Event->io (	3651	$BDB_POLL_WATCHER = Event->io (
3222	reentrant => 0,	3652	reentrant => 0,
3223	fd => BDB::poll_fileno,	3653	fd => BDB::poll_fileno,
3224	poll => 'r',	3654	poll => 'r',
3225	prio => 0,	3655	prio => 0,
3226	data => WF_AUTOCANCEL,	3656	data => WF_AUTOCANCEL,
3227	cb => \&BDB::poll_cb,	3657	cb => \&BDB::poll_cb,
3228	);	3658	);
3229	BDB::min_parallel 8;
3230		3659
3231	BDB::set_sync_prepare {	3660	BDB::set_sync_prepare {
3232	my $status;	3661	my $status;
3233	my $current = $Coro::current;	3662	my $current = $Coro::current;
3234	(	3663	(
…		…
3243	)	3672	)
3244	};	3673	};
3245		3674
3246	unless ($DB_ENV) {	3675	unless ($DB_ENV) {
3247	$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);
3248		3681
3249	cf::sync_job {	3682	cf::sync_job {
3250	eval {	3683	eval {
3251	BDB::db_env_open	3684	BDB::db_env_open
3252	$DB_ENV,	3685	$DB_ENV,
…		…
3254	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
3255	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3688	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3256	0666;	3689	0666;
3257		3690
3258	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3691	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3259
3260	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3261	$DB_ENV->set_lk_detect;
3262	};	3692	};
3263		3693
3264	cf::cleanup "db_env_open(db): $@" if $@;	3694	cf::cleanup "db_env_open(db): $@" if $@;
3265	};	3695	};
3266	}	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	);
3267	}	3728	}
3268		3729
3269	{	3730	{
3270	IO::AIO::min_parallel 8;	3731	IO::AIO::min_parallel 8;
3271		3732
…		…
3274	$AIO_POLL_WATCHER = Event->io (	3735	$AIO_POLL_WATCHER = Event->io (
3275	reentrant => 0,	3736	reentrant => 0,
3276	data => WF_AUTOCANCEL,	3737	data => WF_AUTOCANCEL,
3277	fd => IO::AIO::poll_fileno,	3738	fd => IO::AIO::poll_fileno,
3278	poll => 'r',	3739	poll => 'r',
3279	prio => 6,	3740	prio => 0,
3280	cb => \&IO::AIO::poll_cb,	3741	cb => \&IO::AIO::poll_cb,
3281	);	3742	);
3282	}	3743	}
3283		3744
3284	my $_log_backtrace;	3745	my $_log_backtrace;
…		…
3290		3751
3291	# limit the # of concurrent backtraces	3752	# limit the # of concurrent backtraces
3292	if ($_log_backtrace < 2) {	3753	if ($_log_backtrace < 2) {
3293	++$_log_backtrace;	3754	++$_log_backtrace;
3294	async {	3755	async {
		3756	$Coro::current->{desc} = "abt $msg";
		3757
3295	my @bt = fork_call {	3758	my @bt = fork_call {
3296	@addr = map { sprintf "%x", $_ } @addr;	3759	@addr = map { sprintf "%x", $_ } @addr;
3297	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3760	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3298	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 |"
3299	or die "addr2line: $!";	3762	or die "addr2line: $!";

Diff Legend

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