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.281 by root, Sat Jun 16 23:22:59 2007 UTC vs.
Revision 1.387 by root, Mon Oct 15 23:49:10 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
		26	use JSON::XS ();
25	use BDB ();	27	use BDB ();
26	use Data::Dumper;	28	use Data::Dumper;
27	use Digest::MD5;	29	use Digest::MD5;
28	use Fcntl;	30	use Fcntl;
29	use YAML::Syck ();	31	use YAML::Syck ();
30	use IO::AIO 2.32 ();	32	use IO::AIO 2.51 ();
31	use Time::HiRes;	33	use Time::HiRes;
32	use Compress::LZF;	34	use Compress::LZF;
		35	use Digest::MD5 ();
33		36
34	# configure various modules to our taste	37	# configure various modules to our taste
35	#	38	#
36	$Storable::canonical = 1; # reduce rsync transfers	39	$Storable::canonical = 1; # reduce rsync transfers
37	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
…		…
49	our %COMMAND = ();	52	our %COMMAND = ();
50	our %COMMAND_TIME = ();	53	our %COMMAND_TIME = ();
51		54
52	our @EXTS = (); # list of extension package names	55	our @EXTS = (); # list of extension package names
53	our %EXTCMD = ();	56	our %EXTCMD = ();
		57	our %EXTICMD = ();
54	our %EXT_CORO = (); # coroutines bound to extensions	58	our %EXT_CORO = (); # coroutines bound to extensions
55	our %EXT_MAP = (); # pluggable maps	59	our %EXT_MAP = (); # pluggable maps
56		60
57	our $RELOAD; # number of reloads so far	61	our $RELOAD; # number of reloads so far
58	our @EVENT;	62	our @EVENT;
…		…
76	our $NEXT_TICK;	80	our $NEXT_TICK;
77	our $NOW;	81	our $NOW;
78	our $USE_FSYNC = 1; # use fsync to write maps - default off	82	our $USE_FSYNC = 1; # use fsync to write maps - default off
79		83
80	our $BDB_POLL_WATCHER;	84	our $BDB_POLL_WATCHER;
		85	our $BDB_DEADLOCK_WATCHER;
		86	our $BDB_CHECKPOINT_WATCHER;
		87	our $BDB_TRICKLE_WATCHER;
81	our $DB_ENV;	88	our $DB_ENV;
82		89
83	our %CFG;	90	our %CFG;
84		91
85	our $UPTIME; $UPTIME ||= time;	92	our $UPTIME; $UPTIME ||= time;
86	our $RUNTIME;	93	our $RUNTIME;
87		94
88	our %PLAYER; # all users	95	our (%PLAYER, %PLAYER_LOADING); # all users
89	our %MAP; # all maps	96	our (%MAP, %MAP_LOADING ); # all maps
90	our $LINK_MAP; # the special {link} map, which is always available	97	our $LINK_MAP; # the special {link} map, which is always available
91		98
92	# 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 ∕
93	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	100	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94		101
…		…
164		171
165	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
166	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
167	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.
168		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
169	=back	182	=back
170		183
171	=cut	184	=cut
172		185
173	BEGIN {	186	BEGIN {
…		…
177	$msg .= "\n"	190	$msg .= "\n"
178	unless $msg =~ /\n$/;	191	unless $msg =~ /\n$/;
179		192
180	$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;
181		194
182	utf8::encode $msg;
183	LOG llevError, $msg;	195	LOG llevError, $msg;
184	};	196	};
185	}	197	}
186		198
187	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	199	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
236	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	248	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237	$d	249	$d
238	} || "[unable to dump $_[0]: '$@']";	250	} || "[unable to dump $_[0]: '$@']";
239	}	251	}
240		252
241	use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243	=item $ref = cf::from_json $json	253	=item $ref = cf::from_json $json
244		254
245	Converts a JSON string into the corresponding perl data structure.	255	Converts a JSON string into the corresponding perl data structure.
246		256
247	=item $json = cf::to_json $ref	257	=item $json = cf::to_json $ref
248		258
249	Converts a perl data structure into its JSON representation.	259	Converts a perl data structure into its JSON representation.
		260
		261	=cut
		262
		263	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
		264
		265	sub to_json ($) { $json_coder->encode ($_[0]) }
		266	sub from_json ($) { $json_coder->decode ($_[0]) }
250		267
251	=item cf::lock_wait $string	268	=item cf::lock_wait $string
252		269
253	Wait until the given lock is available. See cf::lock_acquire.	270	Wait until the given lock is available. See cf::lock_acquire.
254		271
…		…
257	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
258	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,
259	for example when the coroutine gets canceled), the lock is automatically	276	for example when the coroutine gets canceled), the lock is automatically
260	returned.	277	returned.
261		278
		279	Locks are *not* recursive, locking from the same coro twice results in a
		280	deadlocked coro.
		281
262	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
263	uses map_find and cf::map::load uses map_load).	283	uses map_find and cf::map::load uses map_load).
264		284
265	=item $locked = cf::lock_active $string	285	=item $locked = cf::lock_active $string
266		286
267	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.
268		288
269	=cut	289	=cut
270		290
271	our %LOCK;	291	our %LOCK;
		292	our %LOCKER;#d#
272		293
273	sub lock_wait($) {	294	sub lock_wait($) {
274	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#
275		301
276	# wait for lock, if any	302	# wait for lock, if any
277	while ($LOCK{$key}) {	303	while ($LOCK{$key}) {
278	push @{ $LOCK{$key} }, $Coro::current;	304	push @{ $LOCK{$key} }, $Coro::current;
279	Coro::schedule;	305	Coro::schedule;
…		…
285		311
286	# wait, to be sure we are not locked	312	# wait, to be sure we are not locked
287	lock_wait $key;	313	lock_wait $key;
288		314
289	$LOCK{$key} = [];	315	$LOCK{$key} = [];
		316	$LOCKER{$key} = $Coro::current;#d#
290		317
291	Coro::guard {	318	Coro::guard {
		319	delete $LOCKER{$key};#d#
292	# wake up all waiters, to be on the safe side	320	# wake up all waiters, to be on the safe side
293	$_->ready for @{ delete $LOCK{$key} };	321	$_->ready for @{ delete $LOCK{$key} };
294	}	322	}
295	}	323	}
296		324
…		…
308	};	336	};
309	$TICK_WATCHER->stop;	337	$TICK_WATCHER->stop;
310	$guard	338	$guard
311	}	339	}
312		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
313	=item cf::async { BLOCK }	399	=item cf::async { BLOCK }
314		400
315	Currently the same as Coro::async_pool, meaning you cannot use	401	Currently the same as Coro::async_pool, meaning you cannot use
316	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
317	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.
…		…
341	my $time = Event::time;	427	my $time = Event::time;
342		428
343	# this is the main coro, too bad, we have to block	429	# this is the main coro, too bad, we have to block
344	# till the operation succeeds, freezing the server :/	430	# till the operation succeeds, freezing the server :/
345		431
		432	LOG llevError, Carp::longmess "sync job";#d#
		433
346	# TODO: use suspend/resume instead	434	# TODO: use suspend/resume instead
347	# (but this is cancel-safe)	435	# (but this is cancel-safe)
348	my $freeze_guard = freeze_mainloop;	436	my $freeze_guard = freeze_mainloop;
349		437
350	my $busy = 1;	438	my $busy = 1;
351	my @res;	439	my @res;
352		440
353	(async {	441	(async {
		442	$Coro::current->desc ("sync job coro");
354	@res = eval { $job->() };	443	@res = eval { $job->() };
355	warn $@ if $@;	444	warn $@ if $@;
356	undef $busy;	445	undef $busy;
357	})->prio (Coro::PRIO_MAX);	446	})->prio (Coro::PRIO_MAX);
358		447
359	while ($busy) {	448	while ($busy) {
		449	if (Coro::nready) {
		450	Coro::cede_notself;
		451	} else {
360	Coro::cede or Event::one_event;	452	Event::one_event;
		453	}
361	}	454	}
362		455
363	$time = Event::time - $time;	456	$time = Event::time - $time;
364		457
365	LOG llevError | logBacktrace, Carp::longmess "long sync job"	458	LOG llevError | logBacktrace, Carp::longmess "long sync job"
…		…
405	=cut	498	=cut
406		499
407	sub fork_call(&@) {	500	sub fork_call(&@) {
408	my ($cb, @args) = @_;	501	my ($cb, @args) = @_;
409		502
410	# 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,
411	# or die "socketpair: $!";	504	# otherwise perl prematurely frees the stuff :/
412	pipe my $fh1, my $fh2	505	# TODO: investigate and fix (likely this will be rather laborious)
413	or die "pipe: $!";
414		506
415	if (my $pid = fork) {	507	my @res = Coro::Util::fork_eval {
416	close $fh2;
417
418	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419	$res = Coro::Storable::thaw $res;
420
421	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423	die $$res unless "ARRAY" eq ref $res;
424
425	return wantarray ? @$res : $res->[-1];
426	} else {
427	reset_signals;	508	reset_signals;
428	local $SIG{__WARN__};	509	&$cb
429	local $SIG{__DIE__};	510	}, @args;
430	eval {
431	close $fh1;
432		511
433	my @res = eval { $cb->(@args) };	512	wantarray ? @res : $res[-1]
434	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435	};
436
437	warn $@ if $@;
438	_exit 0;
439	}
440	}	513	}
441		514
442	=item $value = cf::db_get $family => $key	515	=item $value = cf::db_get $family => $key
443		516
444	Returns a single value from the environment database.	517	Returns a single value from the environment database.
…		…
446	=item cf::db_put $family => $key => $value	519	=item cf::db_put $family => $key => $value
447		520
448	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
449	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).
450		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
451	=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	}
452		547
453	our $DB;	548	our $DB;
454		549
455	sub db_init {	550	sub db_init {
456	unless ($DB) {
457	$DB = BDB::db_create $DB_ENV;
458
459	cf::sync_job {	551	cf::sync_job {
460	eval {	552	$DB ||= db_table "db";
461	$DB->set_flags (BDB::CHKSUM);
462
463	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464	BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465	cf::cleanup "db_open(db): $!" if $!;
466	};
467	cf::cleanup "db_open(db): $@" if $@;
468	};
469	}	553	};
470	}	554	}
471		555
472	sub db_get($$) {	556	sub db_get($$) {
473	my $key = "$_[0]/$_[1]";	557	my $key = "$_[0]/$_[1]";
474		558
…		…
524	if (1) {	608	if (1) {
525	$md5 =	609	$md5 =
526	join "\x00",	610	join "\x00",
527	$processversion,	611	$processversion,
528	map {	612	map {
529	Coro::cede;	613	cf::cede_to_tick;
530	($src->[$_], Digest::MD5::md5_hex $data[$_])	614	($src->[$_], Digest::MD5::md5_hex $data[$_])
531	} 0.. $#$src;	615	} 0.. $#$src;
532		616
533		617
534	my $dbmd5 = db_get cache => "$id/md5";	618	my $dbmd5 = db_get cache => "$id/md5";
…		…
840	";	924	";
841	die if $@;	925	die if $@;
842	}	926	}
843		927
844	our $override;	928	our $override;
845	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?
846		930
847	sub override {	931	sub override {
848	$override = 1;	932	$override = 1;
849	@invoke_results = ();	933	@INVOKE_RESULTS = (@_);
850	}	934	}
851		935
852	sub do_invoke {	936	sub do_invoke {
853	my $event = shift;	937	my $event = shift;
854	my $callbacks = shift;	938	my $callbacks = shift;
855		939
856	@invoke_results = ();	940	@INVOKE_RESULTS = ();
857		941
858	local $override;	942	local $override;
859		943
860	for (@$callbacks) {	944	for (@$callbacks) {
861	eval { &{$_->[1]} };	945	eval { &{$_->[1]} };
…		…
878		962
879	Generate an object-specific event with the given arguments.	963	Generate an object-specific event with the given arguments.
880		964
881	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
882	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
883	results (if you must, access C<@cf::invoke_results> directly).	967	results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884		968
885	=back	969	=back
886		970
887	=cut	971	=cut
888		972
889	#############################################################################	973	#############################################################################
890	# 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	}
891		1017
892	sub reattach {	1018	sub reattach {
893	# basically do the same as instantiate, without calling instantiate	1019	# basically do the same as instantiate, without calling instantiate
894	my ($obj) = @_;	1020	my ($obj) = @_;
895		1021
…		…
942	sub object_freezer_save {	1068	sub object_freezer_save {
943	my ($filename, $rdata, $objs) = @_;	1069	my ($filename, $rdata, $objs) = @_;
944		1070
945	sync_job {	1071	sync_job {
946	if (length $$rdata) {	1072	if (length $$rdata) {
		1073	utf8::decode (my $decname = $filename);
947	warn sprintf "saving %s (%d,%d)\n",	1074	warn sprintf "saving %s (%d,%d)\n",
948	$filename, length $$rdata, scalar @$objs;	1075	$decname, length $$rdata, scalar @$objs;
949		1076
950	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1077	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951	chmod SAVE_MODE, $fh;	1078	chmod SAVE_MODE, $fh;
952	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1079	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953	aio_fsync $fh if $cf::USE_FSYNC;	1080	aio_fsync $fh if $cf::USE_FSYNC;
954	close $fh;	1081	close $fh;
955		1082
956	if (@$objs) {	1083	if (@$objs) {
957	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) {
958	chmod SAVE_MODE, $fh;	1085	chmod SAVE_MODE, $fh;
959	my $data = Storable::nfreeze { version => 1, objs => $objs };	1086	my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
960	aio_write $fh, 0, (length $data), $data, 0;	1087	aio_write $fh, 0, (length $data), $data, 0;
961	aio_fsync $fh if $cf::USE_FSYNC;	1088	aio_fsync $fh if $cf::USE_FSYNC;
962	close $fh;	1089	close $fh;
963	aio_rename "$filename.pst~", "$filename.pst";	1090	aio_rename "$filename.pst~", "$filename.pst";
964	}	1091	}
…		…
972	}	1099	}
973	} else {	1100	} else {
974	aio_unlink $filename;	1101	aio_unlink $filename;
975	aio_unlink "$filename.pst";	1102	aio_unlink "$filename.pst";
976	}	1103	}
977	}	1104	};
978	}	1105	}
979		1106
980	sub object_freezer_as_string {	1107	sub object_freezer_as_string {
981	my ($rdata, $objs) = @_;	1108	my ($rdata, $objs) = @_;
982		1109
…		…
994	or return;	1121	or return;
995		1122
996	unless (aio_stat "$filename.pst") {	1123	unless (aio_stat "$filename.pst") {
997	(aio_load "$filename.pst", $av) >= 0	1124	(aio_load "$filename.pst", $av) >= 0
998	or return;	1125	or return;
999	$av = eval { (Storable::thaw $av)->{objs} };
1000	}
1001		1126
		1127	my $st = eval { Coro::Storable::thaw $av }
		1128	|| eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
		1129	$av = $st->{objs};
		1130	}
		1131
		1132	utf8::decode (my $decname = $filename);
1002	warn sprintf "loading %s (%d)\n",	1133	warn sprintf "loading %s (%d,%d)\n",
1003	$filename, length $data, scalar @{$av || []};	1134	$decname, length $data, scalar @{$av || []};
		1135
1004	return ($data, $av);	1136	($data, $av)
1005	}	1137	}
1006		1138
1007	=head2 COMMAND CALLBACKS	1139	=head2 COMMAND CALLBACKS
1008		1140
1009	=over 4	1141	=over 4
…		…
1029	push @{ $COMMAND{$name} }, [$caller, $cb];	1161	push @{ $COMMAND{$name} }, [$caller, $cb];
1030	}	1162	}
1031		1163
1032	=item cf::register_extcmd $name => \&callback($pl,$packet);	1164	=item cf::register_extcmd $name => \&callback($pl,$packet);
1033		1165
1034	Register a callback fro execution when the client sends an extcmd packet.	1166	Register a callback for execution when the client sends an (synchronous)
		1167	extcmd packet. Ext commands will be processed in the order they are
		1168	received by the server, like other user commands. The first argument is
		1169	the logged-in player. Ext commands can only be processed after a player
		1170	has logged in successfully.
1035		1171
1036	If the callback returns something, it is sent back as if reply was being	1172	If the callback returns something, it is sent back as if reply was being
1037	called.	1173	called.
1038		1174
		1175	=item cf::register_exticmd $name => \&callback($ns,$packet);
		1176
		1177	Register a callback for execution when the client sends an (asynchronous)
		1178	exticmd packet. Exti commands are processed by the server as soon as they
		1179	are received, i.e. out of order w.r.t. other commands. The first argument
		1180	is a client socket. Exti commands can be received anytime, even before
		1181	log-in.
		1182
		1183	If the callback returns something, it is sent back as if reply was being
		1184	called.
		1185
1039	=cut	1186	=cut
1040		1187
1041	sub register_extcmd {	1188	sub register_extcmd {
1042	my ($name, $cb) = @_;	1189	my ($name, $cb) = @_;
1043		1190
1044	$EXTCMD{$name} = $cb;	1191	$EXTCMD{$name} = $cb;
		1192	}
		1193
		1194	sub register_exticmd {
		1195	my ($name, $cb) = @_;
		1196
		1197	$EXTICMD{$name} = $cb;
1045	}	1198	}
1046		1199
1047	cf::player->attach (	1200	cf::player->attach (
1048	on_command => sub {	1201	on_command => sub {
1049	my ($pl, $name, $params) = @_;	1202	my ($pl, $name, $params) = @_;
…		…
1058	cf::override;	1211	cf::override;
1059	},	1212	},
1060	on_extcmd => sub {	1213	on_extcmd => sub {
1061	my ($pl, $buf) = @_;	1214	my ($pl, $buf) = @_;
1062		1215
1063	my $msg = eval { from_json $buf };	1216	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064		1217
1065	if (ref $msg) {	1218	if (ref $msg) {
		1219	my ($type, $reply, @payload) =
		1220	"ARRAY" eq ref $msg
		1221	? @$msg
		1222	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		1223
		1224	my @reply;
		1225
1066	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1226	if (my $cb = $EXTCMD{$type}) {
1067	if (my %reply = $cb->($pl, $msg)) {	1227	@reply = $cb->($pl, @payload);
1068	$pl->ext_reply ($msg->{msgid}, %reply);
1069	}
1070	}	1228	}
		1229
		1230	$pl->ext_reply ($reply, @reply)
		1231	if $reply;
		1232
1071	} else {	1233	} else {
1072	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1234	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073	}	1235	}
1074		1236
1075	cf::override;	1237	cf::override;
…		…
1165		1327
1166	=head3 cf::player	1328	=head3 cf::player
1167		1329
1168	=over 4	1330	=over 4
1169		1331
		1332	=item cf::player::num_playing
		1333
		1334	Returns the official number of playing players, as per the Crossfire metaserver rules.
		1335
		1336	=cut
		1337
		1338	sub num_playing {
		1339	scalar grep
		1340	$_->ob->map
		1341	&& !$_->hidden
		1342	&& !$_->ob->flag (cf::FLAG_WIZ),
		1343	cf::player::list
		1344	}
		1345
1170	=item cf::player::find $login	1346	=item cf::player::find $login
1171		1347
1172	Returns the given player object, loading it if necessary (might block).	1348	Returns the given player object, loading it if necessary (might block).
1173		1349
1174	=cut	1350	=cut
…		…
1209	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";	1385	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";	1386	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211	aio_unlink +(playerdir $login) . "/$login.pl.pst";	1387	aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212	aio_unlink +(playerdir $login) . "/$login.pl";	1388	aio_unlink +(playerdir $login) . "/$login.pl";
1213		1389
1214	my $pl = load_pl path $login	1390	my $f = new_from_file cf::object::thawer path $login
1215	or return;	1391	or return;
		1392
		1393	my $pl = cf::player::load_pl $f
		1394	or return;
		1395	local $cf::PLAYER_LOADING{$login} = $pl;
		1396	$f->resolve_delayed_derefs;
1216	$cf::PLAYER{$login} = $pl	1397	$cf::PLAYER{$login} = $pl
1217	}	1398	}
1218	}	1399	}
1219	}	1400	}
1220		1401
…		…
1230		1411
1231	aio_mkdir playerdir $pl, 0770;	1412	aio_mkdir playerdir $pl, 0770;
1232	$pl->{last_save} = $cf::RUNTIME;	1413	$pl->{last_save} = $cf::RUNTIME;
1233		1414
1234	$pl->save_pl ($path);	1415	$pl->save_pl ($path);
1235	Coro::cede;	1416	cf::cede_to_tick;
1236	}	1417	}
1237		1418
1238	sub new($) {	1419	sub new($) {
1239	my ($login) = @_;	1420	my ($login) = @_;
1240		1421
…		…
1244	$self->{deny_save} = 1;	1425	$self->{deny_save} = 1;
1245		1426
1246	$cf::PLAYER{$login} = $self;	1427	$cf::PLAYER{$login} = $self;
1247		1428
1248	$self	1429	$self
		1430	}
		1431
		1432	=item $player->send_msg ($channel, $msg, $color, [extra...])
		1433
		1434	=cut
		1435
		1436	sub send_msg {
		1437	my $ns = shift->ns
		1438	or return;
		1439	$ns->send_msg (@_);
1249	}	1440	}
1250		1441
1251	=item $pl->quit_character	1442	=item $pl->quit_character
1252		1443
1253	Nukes the player without looking back. If logged in, the connection will	1444	Nukes the player without looking back. If logged in, the connection will
…		…
1308	or return [];	1499	or return [];
1309		1500
1310	my @logins;	1501	my @logins;
1311		1502
1312	for my $login (@$dirs) {	1503	for my $login (@$dirs) {
		1504	my $path = path $login;
		1505
		1506	# a .pst is a dead give-away for a valid player
		1507	unless (-e "$path.pst") {
1313	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;	1508	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314	aio_read $fh, 0, 512, my $buf, 0 or next;	1509	aio_read $fh, 0, 512, my $buf, 0 or next;
1315	$buf !~ /^password -------------$/m or next; # official not-valid tag	1510	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1511	}
1316		1512
1317	utf8::decode $login;	1513	utf8::decode $login;
1318	push @logins, $login;	1514	push @logins, $login;
1319	}	1515	}
1320		1516
…		…
1347	}	1543	}
1348		1544
1349	\@paths	1545	\@paths
1350	}	1546	}
1351		1547
		1548	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
		1549
		1550	Expand crossfire pod fragments into protocol xml.
		1551
		1552	=cut
		1553
		1554	sub expand_cfpod {
		1555	((my $self), (local $_)) = @_;
		1556
		1557	# escape & and <
		1558	s/&/&amp;/g;
		1559	s/(?<![BIUGHT])</&lt;/g;
		1560
		1561	# this is buggy, it needs to properly take care of nested <'s
		1562
		1563	1 while
		1564	# replace B<>, I<>, U<> etc.
		1565	s/B<([^\>]*)>/<b>$1<\/b>/
		1566	|| s/I<([^\>]*)>/<i>$1<\/i>/
		1567	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1568	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
		1569	# replace G<male|female> tags
		1570	|| s{G<([^>|]*)\|([^>]*)>}{
		1571	$self->gender ? $2 : $1
		1572	}ge
		1573	# replace H<hint text>
		1574	|| s{H<([^\>]*)>}
		1575	{
		1576	("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
		1577	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
		1578	"")
		1579	[$self->{hintmode}]
		1580	}ge;
		1581
		1582	# create single paragraphs (very hackish)
		1583	s/(?<=\S)\n(?=\w)/ /g;
		1584
		1585	# compress some whitespace
		1586	s/\s+\n/\n/g; # ws line-ends
		1587	s/\n\n+/\n/g; # double lines
		1588	s/^\n+//; # beginning lines
		1589	s/\n+$//; # ending lines
		1590
		1591	$_
		1592	}
		1593
		1594	sub hintmode {
		1595	$_[0]{hintmode} = $_[1] if @_ > 1;
		1596	$_[0]{hintmode}
		1597	}
		1598
1352	=item $player->ext_reply ($msgid, %msg)	1599	=item $player->ext_reply ($msgid, @msg)
1353		1600
1354	Sends an ext reply to the player.	1601	Sends an ext reply to the player.
1355		1602
1356	=cut	1603	=cut
1357		1604
1358	sub ext_reply($$%) {	1605	sub ext_reply($$@) {
1359	my ($self, $id, %msg) = @_;	1606	my ($self, $id, @msg) = @_;
1360		1607
1361	$msg{msgid} = $id;	1608	$self->ns->ext_reply ($id, @msg)
1362
1363	$self->send ("ext " . cf::to_json \%msg);
1364	}	1609	}
1365		1610
1366	=item $player->ext_event ($type, %msg)	1611	=item $player->ext_msg ($type, @msg)
1367		1612
1368	Sends an ext event to the client.	1613	Sends an ext event to the client.
1369		1614
1370	=cut	1615	=cut
1371		1616
1372	sub ext_event($$%) {	1617	sub ext_msg($$@) {
1373	my ($self, $type, %msg) = @_;	1618	my ($self, $type, @msg) = @_;
1374		1619
1375	$self->ns->ext_event ($type, %msg);	1620	$self->ns->ext_msg ($type, @msg);
1376	}	1621	}
1377		1622
1378	=head3 cf::region	1623	=head3 cf::region
1379		1624
1380	=over 4	1625	=over 4
…		…
1393	my ($path) = @_;	1638	my ($path) = @_;
1394		1639
1395	my ($match, $specificity);	1640	my ($match, $specificity);
1396		1641
1397	for my $region (list) {	1642	for my $region (list) {
1398	if ($region->match && $path =~ $region->match) {	1643	if ($region->{match} && $path =~ $region->{match}) {
1399	($match, $specificity) = ($region, $region->specificity)	1644	($match, $specificity) = ($region, $region->specificity)
1400	if $region->specificity > $specificity;	1645	if $region->specificity > $specificity;
1401	}	1646	}
1402	}	1647	}
1403		1648
…		…
1523	$self->init; # pass $1 etc.	1768	$self->init; # pass $1 etc.
1524	return $self;	1769	return $self;
1525	}	1770	}
1526	}	1771	}
1527		1772
1528	Carp::carp "unable to resolve path '$path' (base '$base').";	1773	Carp::cluck "unable to resolve path '$path' (base '$base').";
1529	()	1774	()
1530	}	1775	}
1531		1776
1532	sub init {	1777	sub init {
1533	my ($self) = @_;	1778	my ($self) = @_;
…		…
1596		1841
1597	sub load_header_from($) {	1842	sub load_header_from($) {
1598	my ($self, $path) = @_;	1843	my ($self, $path) = @_;
1599		1844
1600	utf8::encode $path;	1845	utf8::encode $path;
1601	#aio_open $path, O_RDONLY, 0	1846	my $f = new_from_file cf::object::thawer $path
1602	# or return;
1603
1604	$self->_load_header ($path)
1605	or return;	1847	or return;
		1848
		1849	$self->_load_header ($f)
		1850	or return;
		1851
		1852	local $MAP_LOADING{$self->{path}} = $self;
		1853	$f->resolve_delayed_derefs;
1606		1854
1607	$self->{load_path} = $path;	1855	$self->{load_path} = $path;
1608		1856
1609	1	1857	1
1610	}	1858	}
…		…
1664	sub find {	1912	sub find {
1665	my ($path, $origin) = @_;	1913	my ($path, $origin) = @_;
1666		1914
1667	$path = normalise $path, $origin && $origin->path;	1915	$path = normalise $path, $origin && $origin->path;
1668		1916
		1917	cf::lock_wait "map_data:$path";#d#remove
1669	cf::lock_wait "map_find:$path";	1918	cf::lock_wait "map_find:$path";
1670		1919
1671	$cf::MAP{$path} || do {	1920	$cf::MAP{$path} || do {
1672	my $guard = cf::lock_acquire "map_find:$path";	1921	my $guard1 = cf::lock_acquire "map_find:$path";
		1922	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1923
1673	my $map = new_from_path cf::map $path	1924	my $map = new_from_path cf::map $path
1674	or return;	1925	or return;
1675		1926
1676	$map->{last_save} = $cf::RUNTIME;	1927	$map->{last_save} = $cf::RUNTIME;
1677		1928
…		…
1679	or return;	1930	or return;
1680		1931
1681	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1932	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1682	# doing this can freeze the server in a sync job, obviously	1933	# doing this can freeze the server in a sync job, obviously
1683	#$cf::WAIT_FOR_TICK->wait;	1934	#$cf::WAIT_FOR_TICK->wait;
		1935	undef $guard1;
		1936	undef $guard2;
1684	$map->reset;	1937	$map->reset;
1685	undef $guard;
1686	return find $path;	1938	return find $path;
1687	}	1939	}
1688		1940
1689	$cf::MAP{$path} = $map	1941	$cf::MAP{$path} = $map
1690	}	1942	}
…		…
1699	local $self->{deny_reset} = 1; # loading can take a long time	1951	local $self->{deny_reset} = 1; # loading can take a long time
1700		1952
1701	my $path = $self->{path};	1953	my $path = $self->{path};
1702		1954
1703	{	1955	{
1704	my $guard = cf::lock_acquire "map_load:$path";	1956	my $guard = cf::lock_acquire "map_data:$path";
1705		1957
		1958	return unless $self->valid;
1706	return if $self->in_memory != cf::MAP_SWAPPED;	1959	return unless $self->in_memory == cf::MAP_SWAPPED;
1707		1960
1708	$self->in_memory (cf::MAP_LOADING);	1961	$self->in_memory (cf::MAP_LOADING);
1709		1962
1710	$self->alloc;	1963	$self->alloc;
1711		1964
1712	$self->pre_load;	1965	$self->pre_load;
1713	Coro::cede;	1966	cf::cede_to_tick;
1714		1967
		1968	my $f = new_from_file cf::object::thawer $self->{load_path};
		1969	$f->skip_block;
1715	$self->_load_objects ($self->{load_path}, 1)	1970	$self->_load_objects ($f)
1716	or return;	1971	or return;
1717		1972
1718	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1973	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1719	if delete $self->{load_original};	1974	if delete $self->{load_original};
1720		1975
1721	if (my $uniq = $self->uniq_path) {	1976	if (my $uniq = $self->uniq_path) {
1722	utf8::encode $uniq;	1977	utf8::encode $uniq;
1723	if (aio_open $uniq, O_RDONLY, 0) {	1978	unless (aio_stat $uniq) {
		1979	if (my $f = new_from_file cf::object::thawer $uniq) {
1724	$self->clear_unique_items;	1980	$self->clear_unique_items;
1725	$self->_load_objects ($uniq, 0);	1981	$self->_load_objects ($f);
		1982	$f->resolve_delayed_derefs;
		1983	}
1726	}	1984	}
1727	}	1985	}
1728		1986
1729	Coro::cede;	1987	$f->resolve_delayed_derefs;
		1988
		1989	cf::cede_to_tick;
1730	# now do the right thing for maps	1990	# now do the right thing for maps
1731	$self->link_multipart_objects;	1991	$self->link_multipart_objects;
1732	$self->difficulty ($self->estimate_difficulty)	1992	$self->difficulty ($self->estimate_difficulty)
1733	unless $self->difficulty;	1993	unless $self->difficulty;
1734	Coro::cede;	1994	cf::cede_to_tick;
1735		1995
1736	unless ($self->{deny_activate}) {	1996	unless ($self->{deny_activate}) {
1737	$self->decay_objects;	1997	$self->decay_objects;
1738	$self->fix_auto_apply;	1998	$self->fix_auto_apply;
1739	$self->update_buttons;	1999	$self->update_buttons;
1740	Coro::cede;	2000	cf::cede_to_tick;
1741	$self->set_darkness_map;	2001	$self->set_darkness_map;
1742	Coro::cede;	2002	cf::cede_to_tick;
1743	$self->activate;	2003	$self->activate;
1744	}	2004	}
		2005
		2006	$self->{last_save} = $cf::RUNTIME;
		2007	$self->last_access ($cf::RUNTIME);
1745		2008
1746	$self->in_memory (cf::MAP_IN_MEMORY);	2009	$self->in_memory (cf::MAP_IN_MEMORY);
1747	}	2010	}
1748		2011
1749	$self->post_load;	2012	$self->post_load;
…		…
1760		2023
1761	$self	2024	$self
1762	}	2025	}
1763		2026
1764	# find and load all maps in the 3x3 area around a map	2027	# find and load all maps in the 3x3 area around a map
1765	sub load_diag {	2028	sub load_neighbours {
1766	my ($map) = @_;	2029	my ($map) = @_;
1767		2030
1768	my @diag; # diagonal neighbours	2031	my @neigh; # diagonal neighbours
1769		2032
1770	for (0 .. 3) {	2033	for (0 .. 3) {
1771	my $neigh = $map->tile_path ($_)	2034	my $neigh = $map->tile_path ($_)
1772	or next;	2035	or next;
1773	$neigh = find $neigh, $map	2036	$neigh = find $neigh, $map
1774	or next;	2037	or next;
1775	$neigh->load;	2038	$neigh->load;
1776		2039
		2040	push @neigh,
1777	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2041	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1778	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2042	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1779	}	2043	}
1780		2044
1781	for (@diag) {	2045	for (grep defined $_->[0], @neigh) {
		2046	my ($path, $origin) = @$_;
1782	my $neigh = find @$_	2047	my $neigh = find $path, $origin
1783	or next;	2048	or next;
1784	$neigh->load;	2049	$neigh->load;
1785	}	2050	}
1786	}	2051	}
1787		2052
…		…
1792	}	2057	}
1793		2058
1794	sub do_load_sync {	2059	sub do_load_sync {
1795	my ($map) = @_;	2060	my ($map) = @_;
1796		2061
		2062	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2063	if $Coro::current == $Coro::main;
		2064
1797	cf::sync_job { $map->load };	2065	cf::sync_job { $map->load };
1798	}	2066	}
1799		2067
1800	our %MAP_PREFETCH;	2068	our %MAP_PREFETCH;
1801	our $MAP_PREFETCHER = undef;	2069	our $MAP_PREFETCHER = undef;
1802		2070
1803	sub find_async {	2071	sub find_async {
1804	my ($path, $origin) = @_;	2072	my ($path, $origin, $load) = @_;
1805		2073
1806	$path = normalise $path, $origin && $origin->{path};	2074	$path = normalise $path, $origin && $origin->{path};
1807		2075
1808	if (my $map = $cf::MAP{$path}) {	2076	if (my $map = $cf::MAP{$path}) {
1809	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2077	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1810	}	2078	}
1811		2079
1812	undef $MAP_PREFETCH{$path};	2080	$MAP_PREFETCH{$path} |= $load;
		2081
1813	$MAP_PREFETCHER ||= cf::async {	2082	$MAP_PREFETCHER ||= cf::async {
		2083	$Coro::current->{desc} = "map prefetcher";
		2084
1814	while (%MAP_PREFETCH) {	2085	while (%MAP_PREFETCH) {
1815	for my $path (keys %MAP_PREFETCH) {	2086	while (my ($k, $v) = each %MAP_PREFETCH) {
1816	my $map = find $path	2087	if (my $map = find $k) {
1817	or next;
1818	$map->load;	2088	$map->load if $v;
		2089	}
1819		2090
1820	delete $MAP_PREFETCH{$path};	2091	delete $MAP_PREFETCH{$k};
1821	}	2092	}
1822	}	2093	}
1823	undef $MAP_PREFETCHER;	2094	undef $MAP_PREFETCHER;
1824	};	2095	};
1825	$MAP_PREFETCHER->prio (6);	2096	$MAP_PREFETCHER->prio (6);
…		…
1828	}	2099	}
1829		2100
1830	sub save {	2101	sub save {
1831	my ($self) = @_;	2102	my ($self) = @_;
1832		2103
1833	my $lock = cf::lock_acquire "map_data:" . $self->path;	2104	my $lock = cf::lock_acquire "map_data:$self->{path}";
1834		2105
1835	$self->{last_save} = $cf::RUNTIME;	2106	$self->{last_save} = $cf::RUNTIME;
1836		2107
1837	return unless $self->dirty;	2108	return unless $self->dirty;
1838		2109
…		…
1844	return if $self->{deny_save};	2115	return if $self->{deny_save};
1845		2116
1846	local $self->{last_access} = $self->last_access;#d#	2117	local $self->{last_access} = $self->last_access;#d#
1847		2118
1848	cf::async {	2119	cf::async {
		2120	$Coro::current->{desc} = "map player save";
1849	$_->contr->save for $self->players;	2121	$_->contr->save for $self->players;
1850	};	2122	};
1851		2123
1852	if ($uniq) {	2124	if ($uniq) {
1853	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2125	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
1861	my ($self) = @_;	2133	my ($self) = @_;
1862		2134
1863	# save first because save cedes	2135	# save first because save cedes
1864	$self->save;	2136	$self->save;
1865		2137
1866	my $lock = cf::lock_acquire "map_data:" . $self->path;	2138	my $lock = cf::lock_acquire "map_data:$self->{path}";
1867		2139
1868	return if $self->players;	2140	return if $self->players;
1869	return if $self->in_memory != cf::MAP_IN_MEMORY;	2141	return if $self->in_memory != cf::MAP_IN_MEMORY;
1870	return if $self->{deny_save};	2142	return if $self->{deny_save};
1871		2143
		2144	$self->in_memory (cf::MAP_SWAPPED);
		2145
		2146	$self->deactivate;
		2147	$_->clear_links_to ($self) for values %cf::MAP;
1872	$self->clear;	2148	$self->clear;
1873	$self->in_memory (cf::MAP_SWAPPED);
1874	}	2149	}
1875		2150
1876	sub reset_at {	2151	sub reset_at {
1877	my ($self) = @_;	2152	my ($self) = @_;
1878		2153
…		…
1910	if $uniq;	2185	if $uniq;
1911	}	2186	}
1912		2187
1913	delete $cf::MAP{$self->path};	2188	delete $cf::MAP{$self->path};
1914		2189
		2190	$self->deactivate;
		2191	$_->clear_links_to ($self) for values %cf::MAP;
1915	$self->clear;	2192	$self->clear;
1916
1917	$_->clear_links_to ($self) for values %cf::MAP;
1918		2193
1919	$self->unlink_save;	2194	$self->unlink_save;
1920	$self->destroy;	2195	$self->destroy;
1921	}	2196	}
1922		2197
1923	my $nuke_counter = "aaaa";	2198	my $nuke_counter = "aaaa";
1924		2199
1925	sub nuke {	2200	sub nuke {
1926	my ($self) = @_;	2201	my ($self) = @_;
1927		2202
		2203	{
		2204	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2205
1928	delete $cf::MAP{$self->path};	2206	delete $cf::MAP{$self->path};
1929		2207
1930	$self->unlink_save;	2208	$self->unlink_save;
1931		2209
1932	bless $self, "cf::map";	2210	bless $self, "cf::map";
1933	delete $self->{deny_reset};	2211	delete $self->{deny_reset};
1934	$self->{deny_save} = 1;	2212	$self->{deny_save} = 1;
1935	$self->reset_timeout (1);	2213	$self->reset_timeout (1);
1936	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2214	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1937		2215
1938	$cf::MAP{$self->path} = $self;	2216	$cf::MAP{$self->path} = $self;
		2217	}
1939		2218
1940	$self->reset; # polite request, might not happen	2219	$self->reset; # polite request, might not happen
1941	}	2220	}
1942		2221
1943	=item $maps = cf::map::tmp_maps	2222	=item $maps = cf::map::tmp_maps
…		…
2019		2298
2020	sub inv_recursive {	2299	sub inv_recursive {
2021	inv_recursive_ inv $_[0]	2300	inv_recursive_ inv $_[0]
2022	}	2301	}
2023		2302
		2303	=item $ref = $ob->ref
		2304
		2305	creates and returns a persistent reference to an objetc that can be stored as a string.
		2306
		2307	=item $ob = cf::object::deref ($refstring)
		2308
		2309	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
		2310	even if the object actually exists. May block.
		2311
		2312	=cut
		2313
		2314	sub deref {
		2315	my ($ref) = @_;
		2316
		2317	if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
		2318	my ($uuid, $name) = ($1, $2);
		2319	my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
		2320	or return;
		2321	$pl->ob->uuid eq $uuid
		2322	or return;
		2323
		2324	$pl->ob
		2325	} else {
		2326	warn "$ref: cannot resolve object reference\n";
		2327	undef
		2328	}
		2329	}
		2330
2024	package cf;	2331	package cf;
2025		2332
2026	=back	2333	=back
2027		2334
2028	=head3 cf::object::player	2335	=head3 cf::object::player
…		…
2045		2352
2046	$flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;	2353	$flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
2047		2354
2048	if ($self->{record_replies}) {	2355	if ($self->{record_replies}) {
2049	push @{ $self->{record_replies} }, [$npc, $msg, $flags];	2356	push @{ $self->{record_replies} }, [$npc, $msg, $flags];
		2357
2050	} else {	2358	} else {
		2359	my $pl = $self->contr;
		2360
		2361	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
		2362	my $dialog = $pl->{npc_dialog};
		2363	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
		2364
		2365	} else {
2051	$msg = $npc->name . " says: $msg" if $npc;	2366	$msg = $npc->name . " says: $msg" if $npc;
2052	$self->message ($msg, $flags);	2367	$self->message ($msg, $flags);
		2368	}
2053	}	2369	}
		2370	}
		2371
		2372	=item $object->send_msg ($channel, $msg, $color, [extra...])
		2373
		2374	=cut
		2375
		2376	sub cf::object::send_msg {
		2377	my $pl = shift->contr
		2378	or return;
		2379	$pl->send_msg (@_);
2054	}	2380	}
2055		2381
2056	=item $player_object->may ("access")	2382	=item $player_object->may ("access")
2057		2383
2058	Returns wether the given player is authorized to access resource "access"	2384	Returns wether the given player is authorized to access resource "access"
…		…
2137	# use -1 or undef as default coordinates, not 0, 0	2463	# use -1 or undef as default coordinates, not 0, 0
2138	($x, $y) = ($map->enter_x, $map->enter_y)	2464	($x, $y) = ($map->enter_x, $map->enter_y)
2139	if $x <=0 && $y <= 0;	2465	if $x <=0 && $y <= 0;
2140		2466
2141	$map->load;	2467	$map->load;
2142	$map->load_diag;	2468	$map->load_neighbours;
2143		2469
2144	return unless $self->contr->active;	2470	return unless $self->contr->active;
2145	$self->activate_recursive;	2471	$self->activate_recursive;
2146		2472
2147	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2473	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2148	$self->enter_map ($map, $x, $y);	2474	$self->enter_map ($map, $x, $y);
2149	}	2475	}
2150		2476
2151	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2477	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2152		2478
2153	Moves the player to the given map-path and coordinates by first freezing	2479	Moves the player to the given map-path and coordinates by first freezing
2154	her, loading and preparing them map, calling the provided $check callback	2480	her, loading and preparing them map, calling the provided $check callback
2155	that has to return the map if sucecssful, and then unfreezes the player on	2481	that has to return the map if sucecssful, and then unfreezes the player on
2156	the new (success) or old (failed) map position.	2482	the new (success) or old (failed) map position. In either case, $done will
		2483	be called at the end of this process.
2157		2484
2158	=cut	2485	=cut
2159		2486
2160	our $GOTOGEN;	2487	our $GOTOGEN;
2161		2488
2162	sub cf::object::player::goto {	2489	sub cf::object::player::goto {
2163	my ($self, $path, $x, $y, $check) = @_;	2490	my ($self, $path, $x, $y, $check, $done) = @_;
2164		2491
2165	# do generation counting so two concurrent goto's will be executed in-order	2492	# do generation counting so two concurrent goto's will be executed in-order
2166	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2493	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2167		2494
2168	$self->enter_link;	2495	$self->enter_link;
2169		2496
2170	(async {	2497	(async {
		2498	$Coro::current->{desc} = "player::goto $path $x $y";
		2499
		2500	# *tag paths override both path and x|y
		2501	if ($path =~ /^\*(.*)$/) {
		2502	if (my @obs = grep $_->map, ext::map_tags::find $1) {
		2503	my $ob = $obs[rand @obs];
		2504
		2505	# see if we actually can go there
		2506	if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
		2507	$ob = $obs[rand @obs];
		2508	} else {
		2509	$self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
		2510	}
		2511	# else put us there anyways for now #d#
		2512
		2513	($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
		2514	} else {
		2515	($path, $x, $y) = (undef, undef, undef);
		2516	}
		2517	}
		2518
2171	my $map = eval {	2519	my $map = eval {
2172	my $map = cf::map::find $path;	2520	my $map = defined $path ? cf::map::find $path : undef;
2173		2521
2174	if ($map) {	2522	if ($map) {
2175	$map = $map->customise_for ($self);	2523	$map = $map->customise_for ($self);
2176	$map = $check->($map) if $check && $map;	2524	$map = $check->($map) if $check && $map;
2177	} else {	2525	} else {
2178	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);	2526	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2179	}	2527	}
2180		2528
2181	$map	2529	$map
2182	};	2530	};
2183		2531
…		…
2188		2536
2189	if ($gen == $self->{_goto_generation}) {	2537	if ($gen == $self->{_goto_generation}) {
2190	delete $self->{_goto_generation};	2538	delete $self->{_goto_generation};
2191	$self->leave_link ($map, $x, $y);	2539	$self->leave_link ($map, $x, $y);
2192	}	2540	}
		2541
		2542	$done->() if $done;
2193	})->prio (1);	2543	})->prio (1);
2194	}	2544	}
2195		2545
2196	=item $player_object->enter_exit ($exit_object)	2546	=item $player_object->enter_exit ($exit_object)
2197		2547
…		…
2266	my $hp = $exit->stats->hp;	2616	my $hp = $exit->stats->hp;
2267	my $sp = $exit->stats->sp;	2617	my $sp = $exit->stats->sp;
2268		2618
2269	$self->enter_link;	2619	$self->enter_link;
2270		2620
		2621	# if exit is damned, update players death & WoR home-position
		2622	$self->contr->savebed ($slaying, $hp, $sp)
		2623	if $exit->flag (FLAG_DAMNED);
		2624
2271	(async {	2625	(async {
		2626	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2627
2272	$self->deactivate_recursive; # just to be sure	2628	$self->deactivate_recursive; # just to be sure
2273	unless (eval {	2629	unless (eval {
2274	$self->goto ($slaying, $hp, $sp);	2630	$self->goto ($slaying, $hp, $sp);
2275		2631
2276	1;	2632	1;
…		…
2302		2658
2303	utf8::encode $text;	2659	utf8::encode $text;
2304	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2660	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2305	}	2661	}
2306		2662
		2663	=item $client->send_msg ($channel, $msg, $color, [extra...])
		2664
		2665	Send a drawinfo or msg packet to the client, formatting the msg for the
		2666	client if neccessary. C<$type> should be a string identifying the type of
		2667	the message, with C<log> being the default. If C<$color> is negative, suppress
		2668	the message unless the client supports the msg packet.
		2669
		2670	=cut
		2671
		2672	our %CHANNEL = (
		2673	"c/identify" => {
		2674	id => "infobox",
		2675	title => "Identify",
		2676	reply => undef,
		2677	tooltip => "Items recently identified",
		2678	},
		2679	"c/examine" => {
		2680	id => "infobox",
		2681	title => "Examine",
		2682	reply => undef,
		2683	tooltip => "Signs and other items you examined",
		2684	},
		2685	"c/lookat" => {
		2686	id => "infobox",
		2687	title => "Look",
		2688	reply => undef,
		2689	tooltip => "What you saw there",
		2690	},
		2691	);
		2692
		2693	sub cf::client::send_msg {
		2694	my ($self, $channel, $msg, $color, @extra) = @_;
		2695
		2696	$msg = $self->pl->expand_cfpod ($msg);
		2697
		2698	$color &= cf::NDI_CLIENT_MASK; # just in case...
		2699
		2700	# check predefined channels, for the benefit of C
		2701	if ($CHANNEL{$channel}) {
		2702	$channel = $CHANNEL{$channel};
		2703
		2704	$self->ext_msg (channel_info => $channel)
		2705	if $self->can_msg;
		2706
		2707	$channel = $channel->{id};
		2708
		2709	} elsif (ref $channel) {
		2710	# send meta info to client, if not yet sent
		2711	unless (exists $self->{channel}{$channel->{id}}) {
		2712	$self->{channel}{$channel->{id}} = $channel;
		2713	$self->ext_msg (channel_info => $channel)
		2714	if $self->can_msg;
		2715	}
		2716
		2717	$channel = $channel->{id};
		2718	}
		2719
		2720	return unless @extra || length $msg;
		2721
		2722	if ($self->can_msg) {
		2723	# default colour, mask it out
		2724	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
		2725	if $color & cf::NDI_DEF;
		2726
		2727	$self->send_packet ("msg " . $self->{json_coder}->encode (
		2728	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
		2729	} else {
		2730	if ($color >= 0) {
		2731	# replace some tags by gcfclient-compatible ones
		2732	for ($msg) {
		2733	1 while
		2734	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2735	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2736	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2737	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2738	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2739	}
		2740
		2741	$color &= cf::NDI_COLOR_MASK;
		2742
		2743	utf8::encode $msg;
		2744
		2745	if (0 && $msg =~ /\[/) {
		2746	# COMMAND/INFO
		2747	$self->send_packet ("drawextinfo $color 10 8 $msg")
		2748	} else {
		2749	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
		2750	$self->send_packet ("drawinfo $color $msg")
		2751	}
		2752	}
		2753	}
		2754	}
		2755
2307	=item $client->ext_event ($type, %msg)	2756	=item $client->ext_msg ($type, @msg)
2308		2757
2309	Sends an exti event to the client.	2758	Sends an ext event to the client.
2310		2759
2311	=cut	2760	=cut
2312		2761
2313	sub cf::client::ext_event($$%) {	2762	sub cf::client::ext_msg($$@) {
2314	my ($self, $type, %msg) = @_;	2763	my ($self, $type, @msg) = @_;
2315		2764
		2765	if ($self->extcmd == 2) {
		2766	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2767	} elsif ($self->extcmd == 1) { # TODO: remove
2316	$msg{msgtype} = "event_$type";	2768	push @msg, msgtype => "event_$type";
2317	$self->send_packet ("ext " . cf::to_json \%msg);	2769	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2770	}
		2771	}
		2772
		2773	=item $client->ext_reply ($msgid, @msg)
		2774
		2775	Sends an ext reply to the client.
		2776
		2777	=cut
		2778
		2779	sub cf::client::ext_reply($$@) {
		2780	my ($self, $id, @msg) = @_;
		2781
		2782	if ($self->extcmd == 2) {
		2783	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
		2784	} elsif ($self->extcmd == 1) {
		2785	#TODO: version 1, remove
		2786	unshift @msg, msgtype => "reply", msgid => $id;
		2787	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
		2788	}
2318	}	2789	}
2319		2790
2320	=item $success = $client->query ($flags, "text", \&cb)	2791	=item $success = $client->query ($flags, "text", \&cb)
2321		2792
2322	Queues a query to the client, calling the given callback with	2793	Queues a query to the client, calling the given callback with
2323	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2794	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2324	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.	2795	C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2325		2796
2326	Queries can fail, so check the return code. Or don't, as queries will become	2797	Queries can fail, so check the return code. Or don't, as queries will
2327	reliable at some point in the future.	2798	become reliable at some point in the future.
2328		2799
2329	=cut	2800	=cut
2330		2801
2331	sub cf::client::query {	2802	sub cf::client::query {
2332	my ($self, $flags, $text, $cb) = @_;	2803	my ($self, $flags, $text, $cb) = @_;
…		…
2340	utf8::encode $text;	2811	utf8::encode $text;
2341	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2812	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2342		2813
2343	$self->send_packet ($self->{query_queue}[0][0])	2814	$self->send_packet ($self->{query_queue}[0][0])
2344	if @{ $self->{query_queue} } == 1;	2815	if @{ $self->{query_queue} } == 1;
		2816
		2817	1
2345	}	2818	}
2346		2819
2347	cf::client->attach (	2820	cf::client->attach (
		2821	on_connect => sub {
		2822	my ($ns) = @_;
		2823
		2824	$ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
		2825	},
2348	on_reply => sub {	2826	on_reply => sub {
2349	my ($ns, $msg) = @_;	2827	my ($ns, $msg) = @_;
2350		2828
2351	# this weird shuffling is so that direct followup queries	2829	# this weird shuffling is so that direct followup queries
2352	# get handled first	2830	# get handled first
…		…
2364	} else {	2842	} else {
2365	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2843	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2366	}	2844	}
2367	}	2845	}
2368	},	2846	},
		2847	on_exticmd => sub {
		2848	my ($ns, $buf) = @_;
		2849
		2850	my $msg = eval { $ns->{json_coder}->decode ($buf) };
		2851
		2852	if (ref $msg) {
		2853	my ($type, $reply, @payload) =
		2854	"ARRAY" eq ref $msg
		2855	? @$msg
		2856	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
		2857
		2858	my @reply;
		2859
		2860	if (my $cb = $EXTICMD{$type}) {
		2861	@reply = $cb->($ns, @payload);
		2862	}
		2863
		2864	$ns->ext_reply ($reply, @reply)
		2865	if $reply;
		2866
		2867	} else {
		2868	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
		2869	}
		2870
		2871	cf::override;
		2872	},
2369	);	2873	);
2370		2874
2371	=item $client->async (\&cb)	2875	=item $client->async (\&cb)
2372		2876
2373	Create a new coroutine, running the specified callback. The coroutine will	2877	Create a new coroutine, running the specified callback. The coroutine will
…		…
2414	our $safe = new Safe "safe";	2918	our $safe = new Safe "safe";
2415	our $safe_hole = new Safe::Hole;	2919	our $safe_hole = new Safe::Hole;
2416		2920
2417	$SIG{FPE} = 'IGNORE';	2921	$SIG{FPE} = 'IGNORE';
2418		2922
2419	$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));	2923	$safe->permit_only (Opcode::opset qw(
		2924	:base_core :base_mem :base_orig :base_math
		2925	grepstart grepwhile mapstart mapwhile
		2926	sort time
		2927	));
2420		2928
2421	# here we export the classes and methods available to script code	2929	# here we export the classes and methods available to script code
2422		2930
2423	=pod	2931	=pod
2424		2932
2425	The following functions and methods are available within a safe environment:	2933	The following functions and methods are available within a safe environment:
2426		2934
2427	cf::object contr pay_amount pay_player map	2935	cf::object
		2936	contr pay_amount pay_player map x y force_find force_add destroy
		2937	insert remove name archname title slaying race decrease_ob_nr
		2938
2428	cf::object::player player	2939	cf::object::player
2429	cf::player peaceful	2940	player
2430	cf::map trigger	2941
		2942	cf::player
		2943	peaceful
		2944
		2945	cf::map
		2946	trigger
2431		2947
2432	=cut	2948	=cut
2433		2949
2434	for (	2950	for (
2435	["cf::object" => qw(contr pay_amount pay_player map)],	2951	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
		2952	insert remove inv name archname title slaying race
		2953	decrease_ob_nr destroy)],
2436	["cf::object::player" => qw(player)],	2954	["cf::object::player" => qw(player)],
2437	["cf::player" => qw(peaceful)],	2955	["cf::player" => qw(peaceful)],
2438	["cf::map" => qw(trigger)],	2956	["cf::map" => qw(trigger)],
2439	) {	2957	) {
2440	no strict 'refs';	2958	no strict 'refs';
…		…
2516	# the server's init and main functions	3034	# the server's init and main functions
2517		3035
2518	sub load_facedata($) {	3036	sub load_facedata($) {
2519	my ($path) = @_;	3037	my ($path) = @_;
2520		3038
		3039	# HACK to clear player env face cache, we need some signal framework
		3040	# for this (global event?)
		3041	%ext::player_env::MUSIC_FACE_CACHE = ();
		3042
		3043	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		3044
2521	warn "loading facedata from $path\n";	3045	warn "loading facedata from $path\n";
2522		3046
2523	my $facedata;	3047	my $facedata;
2524	0 < aio_load $path, $facedata	3048	0 < aio_load $path, $facedata
2525	or die "$path: $!";	3049	or die "$path: $!";
…		…
2527	$facedata = Coro::Storable::thaw $facedata;	3051	$facedata = Coro::Storable::thaw $facedata;
2528		3052
2529	$facedata->{version} == 2	3053	$facedata->{version} == 2
2530	or cf::cleanup "$path: version mismatch, cannot proceed.";	3054	or cf::cleanup "$path: version mismatch, cannot proceed.";
2531		3055
		3056	# patch in the exptable
		3057	$facedata->{resource}{"res/exp_table"} = {
		3058	type => FT_RSRC,
		3059	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
		3060	};
		3061	cf::cede_to_tick;
		3062
2532	{	3063	{
2533	my $faces = $facedata->{faceinfo};	3064	my $faces = $facedata->{faceinfo};
2534		3065
2535	while (my ($face, $info) = each %$faces) {	3066	while (my ($face, $info) = each %$faces) {
2536	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3067	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2537	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3068	cf::face::set_visibility $idx, $info->{visibility};
		3069	cf::face::set_magicmap $idx, $info->{magicmap};
2538	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3070	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2539	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3071	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2540	Coro::cede;	3072
		3073	cf::cede_to_tick;
2541	}	3074	}
2542		3075
2543	while (my ($face, $info) = each %$faces) {	3076	while (my ($face, $info) = each %$faces) {
2544	next unless $info->{smooth};	3077	next unless $info->{smooth};
2545	my $idx = cf::face::find $face	3078	my $idx = cf::face::find $face
2546	or next;	3079	or next;
2547	if (my $smooth = cf::face::find $info->{smooth}) {	3080	if (my $smooth = cf::face::find $info->{smooth}) {
		3081	cf::face::set_smooth $idx, $smooth;
2548	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3082	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2549	} else {	3083	} else {
2550	warn "smooth face '$info->{smooth}' not found for face '$face'";	3084	warn "smooth face '$info->{smooth}' not found for face '$face'";
2551	}	3085	}
2552	Coro::cede;	3086
		3087	cf::cede_to_tick;
2553	}	3088	}
2554	}	3089	}
2555		3090
2556	{	3091	{
2557	my $anims = $facedata->{animinfo};	3092	my $anims = $facedata->{animinfo};
2558		3093
2559	while (my ($anim, $info) = each %$anims) {	3094	while (my ($anim, $info) = each %$anims) {
2560	cf::anim::set $anim, $info->{frames}, $info->{facings};	3095	cf::anim::set $anim, $info->{frames}, $info->{facings};
2561	Coro::cede;	3096	cf::cede_to_tick;
2562	}	3097	}
2563		3098
2564	cf::anim::invalidate_all; # d'oh	3099	cf::anim::invalidate_all; # d'oh
2565	}	3100	}
2566		3101
		3102	{
		3103	# TODO: for gcfclient pleasure, we should give resources
		3104	# that gcfclient doesn't grok a >10000 face index.
		3105	my $res = $facedata->{resource};
		3106
		3107	my $soundconf = delete $res->{"res/sound.conf"};
		3108
		3109	while (my ($name, $info) = each %$res) {
		3110	my $idx = (cf::face::find $name) || cf::face::alloc $name;
		3111	my $data;
		3112
		3113	if ($info->{type} & 1) {
		3114	# prepend meta info
		3115
		3116	my $meta = $enc->encode ({
		3117	name => $name,
		3118	%{ $info->{meta} || {} },
		3119	});
		3120
		3121	$data = pack "(w/a*)*", $meta, $info->{data};
		3122	} else {
		3123	$data = $info->{data};
		3124	}
		3125
		3126	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
		3127	cf::face::set_type $idx, $info->{type};
		3128
		3129	cf::cede_to_tick;
		3130	}
		3131
		3132	if ($soundconf) {
		3133	$soundconf = $enc->decode (delete $soundconf->{data});
		3134
		3135	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3136	my $sound = $soundconf->{compat}[$_]
		3137	or next;
		3138
		3139	my $face = cf::face::find "sound/$sound->[1]";
		3140	cf::sound::set $sound->[0] => $face;
		3141	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3142	}
		3143
		3144	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3145	my $face = cf::face::find "sound/$v";
		3146	cf::sound::set $k => $face;
		3147	}
		3148	}
		3149	}
		3150
2567	1	3151	1
2568	}	3152	}
2569		3153
		3154	register_exticmd fx_want => sub {
		3155	my ($ns, $want) = @_;
		3156
		3157	while (my ($k, $v) = each %$want) {
		3158	$ns->fx_want ($k, $v);
		3159	}
		3160	};
		3161
2570	sub reload_regions {	3162	sub reload_regions {
		3163	# HACK to clear player env face cache, we need some signal framework
		3164	# for this (global event?)
		3165	%ext::player_env::MUSIC_FACE_CACHE = ();
		3166
2571	load_resource_file "$MAPDIR/regions"	3167	load_resource_file "$MAPDIR/regions"
2572	or die "unable to load regions file\n";	3168	or die "unable to load regions file\n";
		3169
		3170	for (cf::region::list) {
		3171	$_->{match} = qr/$_->{match}/
		3172	if exists $_->{match};
		3173	}
2573	}	3174	}
2574		3175
2575	sub reload_facedata {	3176	sub reload_facedata {
2576	load_facedata "$DATADIR/facedata"	3177	load_facedata "$DATADIR/facedata"
2577	or die "unable to load facedata\n";	3178	or die "unable to load facedata\n";
2578	}	3179	}
2579		3180
2580	sub reload_archetypes {	3181	sub reload_archetypes {
		3182	load_resource_file "$DATADIR/archetypes"
		3183	or die "unable to load archetypes\n";
		3184	#d# NEED to laod twice to resolve forward references
		3185	# this really needs to be done in an extra post-pass
		3186	# (which needs to be synchronous, so solve it differently)
2581	load_resource_file "$DATADIR/archetypes"	3187	load_resource_file "$DATADIR/archetypes"
2582	or die "unable to load archetypes\n";	3188	or die "unable to load archetypes\n";
2583	}	3189	}
2584		3190
2585	sub reload_treasures {	3191	sub reload_treasures {
…		…
2601		3207
2602	sub init {	3208	sub init {
2603	reload_resources;	3209	reload_resources;
2604	}	3210	}
2605		3211
2606	sub cfg_load {	3212	sub reload_config {
2607	open my $fh, "<:utf8", "$CONFDIR/config"	3213	open my $fh, "<:utf8", "$CONFDIR/config"
2608	or return;	3214	or return;
2609		3215
2610	local $/;	3216	local $/;
2611	*CFG = YAML::Syck::Load <$fh>;	3217	*CFG = YAML::Syck::Load <$fh>;
…		…
2627	sub main {	3233	sub main {
2628	# we must not ever block the main coroutine	3234	# we must not ever block the main coroutine
2629	local $Coro::idle = sub {	3235	local $Coro::idle = sub {
2630	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3236	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2631	(async {	3237	(async {
		3238	$Coro::current->{desc} = "IDLE BUG HANDLER";
2632	Event::one_event;	3239	Event::one_event;
2633	})->prio (Coro::PRIO_MAX);	3240	})->prio (Coro::PRIO_MAX);
2634	};	3241	};
2635		3242
2636	cfg_load;	3243	reload_config;
2637	db_init;	3244	db_init;
2638	load_extensions;	3245	load_extensions;
2639		3246
2640	$TICK_WATCHER->start;	3247	$TICK_WATCHER->start;
2641	Event::loop;	3248	Event::loop;
…		…
2708	# and maps saved/destroyed asynchronously.	3315	# and maps saved/destroyed asynchronously.
2709	warn "begin emergency player save\n";	3316	warn "begin emergency player save\n";
2710	for my $login (keys %cf::PLAYER) {	3317	for my $login (keys %cf::PLAYER) {
2711	my $pl = $cf::PLAYER{$login} or next;	3318	my $pl = $cf::PLAYER{$login} or next;
2712	$pl->valid or next;	3319	$pl->valid or next;
		3320	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2713	$pl->save;	3321	$pl->save;
2714	}	3322	}
2715	warn "end emergency player save\n";	3323	warn "end emergency player save\n";
2716		3324
2717	warn "begin emergency map save\n";	3325	warn "begin emergency map save\n";
…		…
2765		3373
2766	warn "flushing outstanding aio requests";	3374	warn "flushing outstanding aio requests";
2767	for (;;) {	3375	for (;;) {
2768	BDB::flush;	3376	BDB::flush;
2769	IO::AIO::flush;	3377	IO::AIO::flush;
2770	Coro::cede;	3378	Coro::cede_notself;
2771	last unless IO::AIO::nreqs || BDB::nreqs;	3379	last unless IO::AIO::nreqs || BDB::nreqs;
2772	warn "iterate...";	3380	warn "iterate...";
2773	}	3381	}
2774		3382
2775	++$RELOAD;	3383	++$RELOAD;
…		…
2779	%EXT_CORO = ();	3387	%EXT_CORO = ();
2780		3388
2781	warn "removing commands";	3389	warn "removing commands";
2782	%COMMAND = ();	3390	%COMMAND = ();
2783		3391
2784	warn "removing ext commands";	3392	warn "removing ext/exti commands";
2785	%EXTCMD = ();	3393	%EXTCMD = ();
		3394	%EXTICMD = ();
2786		3395
2787	warn "unloading/nuking all extensions";	3396	warn "unloading/nuking all extensions";
2788	for my $pkg (@EXTS) {	3397	for my $pkg (@EXTS) {
2789	warn "... unloading $pkg";	3398	warn "... unloading $pkg";
2790		3399
…		…
2833	warn "reloading cf.pm";	3442	warn "reloading cf.pm";
2834	require cf;	3443	require cf;
2835	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3444	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2836		3445
2837	warn "loading config and database again";	3446	warn "loading config and database again";
2838	cf::cfg_load;	3447	cf::reload_config;
2839		3448
2840	warn "loading extensions";	3449	warn "loading extensions";
2841	cf::load_extensions;	3450	cf::load_extensions;
2842		3451
2843	warn "reattaching attachments to objects/players";	3452	warn "reattaching attachments to objects/players";
…		…
2879	register_command "reload" => sub {	3488	register_command "reload" => sub {
2880	my ($who, $arg) = @_;	3489	my ($who, $arg) = @_;
2881		3490
2882	if ($who->flag (FLAG_WIZ)) {	3491	if ($who->flag (FLAG_WIZ)) {
2883	$who->message ("reloading server.");	3492	$who->message ("reloading server.");
		3493	async {
		3494	$Coro::current->{desc} = "perl_reload";
2884	async { reload_perl };	3495	reload_perl;
		3496	};
2885	}	3497	}
2886	};	3498	};
2887		3499
2888	unshift @INC, $LIBDIR;	3500	unshift @INC, $LIBDIR;
2889		3501
…		…
2908	my $signal = new Coro::Signal;	3520	my $signal = new Coro::Signal;
2909	push @WAIT_FOR_TICK_BEGIN, $signal;	3521	push @WAIT_FOR_TICK_BEGIN, $signal;
2910	$signal->wait;	3522	$signal->wait;
2911	}	3523	}
2912		3524
2913	my $min = 1e6;#d#
2914	my $avg = 10;
2915	$TICK_WATCHER = Event->timer (	3525	$TICK_WATCHER = Event->timer (
2916	reentrant => 0,	3526	reentrant => 0,
2917	parked => 1,	3527	parked => 1,
2918	prio => 0,	3528	prio => 0,
2919	at => $NEXT_TICK || $TICK,	3529	at => $NEXT_TICK || $TICK,
…		…
2927		3537
2928	$NOW = $tick_start = Event::time;	3538	$NOW = $tick_start = Event::time;
2929		3539
2930	cf::server_tick; # one server iteration	3540	cf::server_tick; # one server iteration
2931		3541
2932	0 && sync_job {#d#
2933	for(1..10) {
2934	my $t = Event::time;
2935	my $map = my $map = new_from_path cf::map "/tmp/x.map"
2936	or die;
2937
2938	$map->width (50);
2939	$map->height (50);
2940	$map->alloc;
2941	$map->_load_objects ("/tmp/x.map", 1);
2942	my $t = Event::time - $t;
2943
2944	#next unless $t < 0.0013;#d#
2945	if ($t < $min) {
2946	$min = $t;
2947	}
2948	$avg = $avg * 0.99 + $t * 0.01;
2949	}
2950	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2951	exit 0;
2952	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2953	};
2954
2955	$RUNTIME += $TICK;	3542	$RUNTIME += $TICK;
2956	$NEXT_TICK += $TICK;	3543	$NEXT_TICK += $TICK;
2957		3544
2958	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3545	if ($NOW >= $NEXT_RUNTIME_WRITE) {
2959	$NEXT_RUNTIME_WRITE = $NOW + 10;	3546	$NEXT_RUNTIME_WRITE = $NOW + 10;
2960	Coro::async_pool {	3547	Coro::async_pool {
		3548	$Coro::current->{desc} = "runtime saver";
2961	write_runtime	3549	write_runtime
2962	or warn "ERROR: unable to write runtime file: $!";	3550	or warn "ERROR: unable to write runtime file: $!";
2963	};	3551	};
2964	}	3552	}
2965		3553
2966	# my $AFTER = Event::time;
2967	# warn $AFTER - $NOW;#d#
2968
2969	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3554	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2970	$sig->send;	3555	$sig->send;
2971	}	3556	}
2972	while (my $sig = shift @WAIT_FOR_TICK) {	3557	while (my $sig = shift @WAIT_FOR_TICK) {
2973	$sig->send;	3558	$sig->send;
…		…
2983		3568
2984	$LOAD = ($NOW - $tick_start) / $TICK;	3569	$LOAD = ($NOW - $tick_start) / $TICK;
2985	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3570	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2986		3571
2987	_post_tick;	3572	_post_tick;
2988
2989
2990	},	3573	},
2991	);	3574	);
2992		3575
2993	{	3576	{
		3577	BDB::min_parallel 8;
2994	BDB::max_poll_time $TICK * 0.1;	3578	BDB::max_poll_time $TICK * 0.1;
2995	$BDB_POLL_WATCHER = Event->io (	3579	$BDB_POLL_WATCHER = Event->io (
2996	reentrant => 0,	3580	reentrant => 0,
2997	fd => BDB::poll_fileno,	3581	fd => BDB::poll_fileno,
2998	poll => 'r',	3582	poll => 'r',
2999	prio => 0,	3583	prio => 0,
3000	data => WF_AUTOCANCEL,	3584	data => WF_AUTOCANCEL,
3001	cb => \&BDB::poll_cb,	3585	cb => \&BDB::poll_cb,
3002	);	3586	);
3003	BDB::min_parallel 8;
3004		3587
3005	BDB::set_sync_prepare {	3588	BDB::set_sync_prepare {
3006	my $status;	3589	my $status;
3007	my $current = $Coro::current;	3590	my $current = $Coro::current;
3008	(	3591	(
…		…
3017	)	3600	)
3018	};	3601	};
3019		3602
3020	unless ($DB_ENV) {	3603	unless ($DB_ENV) {
3021	$DB_ENV = BDB::db_env_create;	3604	$DB_ENV = BDB::db_env_create;
		3605	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
		3606	| BDB::LOG_AUTOREMOVE, 1);
		3607	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
		3608	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3022		3609
3023	cf::sync_job {	3610	cf::sync_job {
3024	eval {	3611	eval {
3025	BDB::db_env_open	3612	BDB::db_env_open
3026	$DB_ENV,	3613	$DB_ENV,
…		…
3028	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	3615	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3029	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3616	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3030	0666;	3617	0666;
3031		3618
3032	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3619	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3033
3034	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3035	$DB_ENV->set_lk_detect;
3036	};	3620	};
3037		3621
3038	cf::cleanup "db_env_open(db): $@" if $@;	3622	cf::cleanup "db_env_open(db): $@" if $@;
3039	};	3623	};
3040	}	3624	}
		3625
		3626	$BDB_DEADLOCK_WATCHER = Event->timer (
		3627	after => 3,
		3628	interval => 1,
		3629	hard => 1,
		3630	prio => 0,
		3631	data => WF_AUTOCANCEL,
		3632	cb => sub {
		3633	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
		3634	},
		3635	);
		3636	$BDB_CHECKPOINT_WATCHER = Event->timer (
		3637	after => 11,
		3638	interval => 60,
		3639	hard => 1,
		3640	prio => 0,
		3641	data => WF_AUTOCANCEL,
		3642	cb => sub {
		3643	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		3644	},
		3645	);
		3646	$BDB_TRICKLE_WATCHER = Event->timer (
		3647	after => 5,
		3648	interval => 10,
		3649	hard => 1,
		3650	prio => 0,
		3651	data => WF_AUTOCANCEL,
		3652	cb => sub {
		3653	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
		3654	},
		3655	);
3041	}	3656	}
3042		3657
3043	{	3658	{
3044	IO::AIO::min_parallel 8;	3659	IO::AIO::min_parallel 8;
3045		3660
…		…
3048	$AIO_POLL_WATCHER = Event->io (	3663	$AIO_POLL_WATCHER = Event->io (
3049	reentrant => 0,	3664	reentrant => 0,
3050	data => WF_AUTOCANCEL,	3665	data => WF_AUTOCANCEL,
3051	fd => IO::AIO::poll_fileno,	3666	fd => IO::AIO::poll_fileno,
3052	poll => 'r',	3667	poll => 'r',
3053	prio => 6,	3668	prio => 0,
3054	cb => \&IO::AIO::poll_cb,	3669	cb => \&IO::AIO::poll_cb,
3055	);	3670	);
3056	}	3671	}
3057		3672
3058	my $_log_backtrace;	3673	my $_log_backtrace;
…		…
3064		3679
3065	# limit the # of concurrent backtraces	3680	# limit the # of concurrent backtraces
3066	if ($_log_backtrace < 2) {	3681	if ($_log_backtrace < 2) {
3067	++$_log_backtrace;	3682	++$_log_backtrace;
3068	async {	3683	async {
		3684	$Coro::current->{desc} = "abt $msg";
		3685
3069	my @bt = fork_call {	3686	my @bt = fork_call {
3070	@addr = map { sprintf "%x", $_ } @addr;	3687	@addr = map { sprintf "%x", $_ } @addr;
3071	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3688	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3072	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"	3689	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3073	or die "addr2line: $!";	3690	or die "addr2line: $!";

Diff Legend

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