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.286 by root, Sun Jun 24 04:27:20 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
…		…
1358	sub expand_cfpod {	1554	sub expand_cfpod {
1359	((my $self), (local $_)) = @_;	1555	((my $self), (local $_)) = @_;
1360		1556
1361	# escape & and <	1557	# escape & and <
1362	s/&/&amp;/g;	1558	s/&/&amp;/g;
1363	s/(?<![BIUGH])</&lt;/g;	1559	s/(?<![BIUGHT])</&lt;/g;
1364		1560
1365	# this is buggy, it needs to properly take care of nested <'s	1561	# this is buggy, it needs to properly take care of nested <'s
1366		1562
1367	1 while	1563	1 while
1368	# replace B<>, I<>, U<> etc.	1564	# replace B<>, I<>, U<> etc.
1369	s/B<([^\>]*)>/<b>$1<\/b>/	1565	s/B<([^\>]*)>/<b>$1<\/b>/
1370	|| s/I<([^\>]*)>/<i>$1<\/i>/	1566	|| s/I<([^\>]*)>/<i>$1<\/i>/
1371	|| s/U<([^\>]*)>/<u>$1<\/u>/	1567	|| s/U<([^\>]*)>/<u>$1<\/u>/
		1568	|| s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1372	# replace G<male|female> tags	1569	# replace G<male|female> tags
1373	|| s{G<([^>|]*)\|([^>]*)>}{	1570	|| s{G<([^>|]*)\|([^>]*)>}{
1374	$self->gender ? $2 : $1	1571	$self->gender ? $2 : $1
1375	}ge	1572	}ge
1376	# replace H<hint text>	1573	# replace H<hint text>
1377	|| s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;	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;
1378		1581
1379	# create single paragraphs (very hackish)	1582	# create single paragraphs (very hackish)
1380	s/(?<=\S)\n(?=\w)/ /g;	1583	s/(?<=\S)\n(?=\w)/ /g;
1381		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
1382	$_	1591	$_
1383	}	1592	}
1384		1593
		1594	sub hintmode {
		1595	$_[0]{hintmode} = $_[1] if @_ > 1;
		1596	$_[0]{hintmode}
		1597	}
		1598
1385	=item $player->ext_reply ($msgid, %msg)	1599	=item $player->ext_reply ($msgid, @msg)
1386		1600
1387	Sends an ext reply to the player.	1601	Sends an ext reply to the player.
1388		1602
1389	=cut	1603	=cut
1390		1604
1391	sub ext_reply($$%) {	1605	sub ext_reply($$@) {
1392	my ($self, $id, %msg) = @_;	1606	my ($self, $id, @msg) = @_;
1393		1607
1394	$msg{msgid} = $id;	1608	$self->ns->ext_reply ($id, @msg)
1395
1396	$self->send ("ext " . cf::to_json \%msg);
1397	}	1609	}
1398		1610
1399	=item $player->ext_event ($type, %msg)	1611	=item $player->ext_msg ($type, @msg)
1400		1612
1401	Sends an ext event to the client.	1613	Sends an ext event to the client.
1402		1614
1403	=cut	1615	=cut
1404		1616
1405	sub ext_event($$%) {	1617	sub ext_msg($$@) {
1406	my ($self, $type, %msg) = @_;	1618	my ($self, $type, @msg) = @_;
1407		1619
1408	$self->ns->ext_event ($type, %msg);	1620	$self->ns->ext_msg ($type, @msg);
1409	}	1621	}
1410		1622
1411	=head3 cf::region	1623	=head3 cf::region
1412		1624
1413	=over 4	1625	=over 4
…		…
1426	my ($path) = @_;	1638	my ($path) = @_;
1427		1639
1428	my ($match, $specificity);	1640	my ($match, $specificity);
1429		1641
1430	for my $region (list) {	1642	for my $region (list) {
1431	if ($region->match && $path =~ $region->match) {	1643	if ($region->{match} && $path =~ $region->{match}) {
1432	($match, $specificity) = ($region, $region->specificity)	1644	($match, $specificity) = ($region, $region->specificity)
1433	if $region->specificity > $specificity;	1645	if $region->specificity > $specificity;
1434	}	1646	}
1435	}	1647	}
1436		1648
…		…
1556	$self->init; # pass $1 etc.	1768	$self->init; # pass $1 etc.
1557	return $self;	1769	return $self;
1558	}	1770	}
1559	}	1771	}
1560		1772
1561	Carp::carp "unable to resolve path '$path' (base '$base').";	1773	Carp::cluck "unable to resolve path '$path' (base '$base').";
1562	()	1774	()
1563	}	1775	}
1564		1776
1565	sub init {	1777	sub init {
1566	my ($self) = @_;	1778	my ($self) = @_;
…		…
1629		1841
1630	sub load_header_from($) {	1842	sub load_header_from($) {
1631	my ($self, $path) = @_;	1843	my ($self, $path) = @_;
1632		1844
1633	utf8::encode $path;	1845	utf8::encode $path;
1634	#aio_open $path, O_RDONLY, 0	1846	my $f = new_from_file cf::object::thawer $path
1635	# or return;
1636
1637	$self->_load_header ($path)
1638	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;
1639		1854
1640	$self->{load_path} = $path;	1855	$self->{load_path} = $path;
1641		1856
1642	1	1857	1
1643	}	1858	}
…		…
1697	sub find {	1912	sub find {
1698	my ($path, $origin) = @_;	1913	my ($path, $origin) = @_;
1699		1914
1700	$path = normalise $path, $origin && $origin->path;	1915	$path = normalise $path, $origin && $origin->path;
1701		1916
		1917	cf::lock_wait "map_data:$path";#d#remove
1702	cf::lock_wait "map_find:$path";	1918	cf::lock_wait "map_find:$path";
1703		1919
1704	$cf::MAP{$path} || do {	1920	$cf::MAP{$path} || do {
1705	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
1706	my $map = new_from_path cf::map $path	1924	my $map = new_from_path cf::map $path
1707	or return;	1925	or return;
1708		1926
1709	$map->{last_save} = $cf::RUNTIME;	1927	$map->{last_save} = $cf::RUNTIME;
1710		1928
…		…
1712	or return;	1930	or return;
1713		1931
1714	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1932	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1715	# doing this can freeze the server in a sync job, obviously	1933	# doing this can freeze the server in a sync job, obviously
1716	#$cf::WAIT_FOR_TICK->wait;	1934	#$cf::WAIT_FOR_TICK->wait;
		1935	undef $guard1;
		1936	undef $guard2;
1717	$map->reset;	1937	$map->reset;
1718	undef $guard;
1719	return find $path;	1938	return find $path;
1720	}	1939	}
1721		1940
1722	$cf::MAP{$path} = $map	1941	$cf::MAP{$path} = $map
1723	}	1942	}
…		…
1732	local $self->{deny_reset} = 1; # loading can take a long time	1951	local $self->{deny_reset} = 1; # loading can take a long time
1733		1952
1734	my $path = $self->{path};	1953	my $path = $self->{path};
1735		1954
1736	{	1955	{
1737	my $guard = cf::lock_acquire "map_load:$path";	1956	my $guard = cf::lock_acquire "map_data:$path";
1738		1957
		1958	return unless $self->valid;
1739	return if $self->in_memory != cf::MAP_SWAPPED;	1959	return unless $self->in_memory == cf::MAP_SWAPPED;
1740		1960
1741	$self->in_memory (cf::MAP_LOADING);	1961	$self->in_memory (cf::MAP_LOADING);
1742		1962
1743	$self->alloc;	1963	$self->alloc;
1744		1964
1745	$self->pre_load;	1965	$self->pre_load;
1746	Coro::cede;	1966	cf::cede_to_tick;
1747		1967
		1968	my $f = new_from_file cf::object::thawer $self->{load_path};
		1969	$f->skip_block;
1748	$self->_load_objects ($self->{load_path}, 1)	1970	$self->_load_objects ($f)
1749	or return;	1971	or return;
1750		1972
1751	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1973	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1752	if delete $self->{load_original};	1974	if delete $self->{load_original};
1753		1975
1754	if (my $uniq = $self->uniq_path) {	1976	if (my $uniq = $self->uniq_path) {
1755	utf8::encode $uniq;	1977	utf8::encode $uniq;
1756	if (aio_open $uniq, O_RDONLY, 0) {	1978	unless (aio_stat $uniq) {
		1979	if (my $f = new_from_file cf::object::thawer $uniq) {
1757	$self->clear_unique_items;	1980	$self->clear_unique_items;
1758	$self->_load_objects ($uniq, 0);	1981	$self->_load_objects ($f);
		1982	$f->resolve_delayed_derefs;
		1983	}
1759	}	1984	}
1760	}	1985	}
1761		1986
1762	Coro::cede;	1987	$f->resolve_delayed_derefs;
		1988
		1989	cf::cede_to_tick;
1763	# now do the right thing for maps	1990	# now do the right thing for maps
1764	$self->link_multipart_objects;	1991	$self->link_multipart_objects;
1765	$self->difficulty ($self->estimate_difficulty)	1992	$self->difficulty ($self->estimate_difficulty)
1766	unless $self->difficulty;	1993	unless $self->difficulty;
1767	Coro::cede;	1994	cf::cede_to_tick;
1768		1995
1769	unless ($self->{deny_activate}) {	1996	unless ($self->{deny_activate}) {
1770	$self->decay_objects;	1997	$self->decay_objects;
1771	$self->fix_auto_apply;	1998	$self->fix_auto_apply;
1772	$self->update_buttons;	1999	$self->update_buttons;
1773	Coro::cede;	2000	cf::cede_to_tick;
1774	$self->set_darkness_map;	2001	$self->set_darkness_map;
1775	Coro::cede;	2002	cf::cede_to_tick;
1776	$self->activate;	2003	$self->activate;
1777	}	2004	}
		2005
		2006	$self->{last_save} = $cf::RUNTIME;
		2007	$self->last_access ($cf::RUNTIME);
1778		2008
1779	$self->in_memory (cf::MAP_IN_MEMORY);	2009	$self->in_memory (cf::MAP_IN_MEMORY);
1780	}	2010	}
1781		2011
1782	$self->post_load;	2012	$self->post_load;
…		…
1793		2023
1794	$self	2024	$self
1795	}	2025	}
1796		2026
1797	# 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
1798	sub load_diag {	2028	sub load_neighbours {
1799	my ($map) = @_;	2029	my ($map) = @_;
1800		2030
1801	my @diag; # diagonal neighbours	2031	my @neigh; # diagonal neighbours
1802		2032
1803	for (0 .. 3) {	2033	for (0 .. 3) {
1804	my $neigh = $map->tile_path ($_)	2034	my $neigh = $map->tile_path ($_)
1805	or next;	2035	or next;
1806	$neigh = find $neigh, $map	2036	$neigh = find $neigh, $map
1807	or next;	2037	or next;
1808	$neigh->load;	2038	$neigh->load;
1809		2039
		2040	push @neigh,
1810	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],	2041	[$neigh->tile_path (($_ + 3) % 4), $neigh],
1811	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2042	[$neigh->tile_path (($_ + 1) % 4), $neigh];
1812	}	2043	}
1813		2044
1814	for (@diag) {	2045	for (grep defined $_->[0], @neigh) {
		2046	my ($path, $origin) = @$_;
1815	my $neigh = find @$_	2047	my $neigh = find $path, $origin
1816	or next;	2048	or next;
1817	$neigh->load;	2049	$neigh->load;
1818	}	2050	}
1819	}	2051	}
1820		2052
…		…
1825	}	2057	}
1826		2058
1827	sub do_load_sync {	2059	sub do_load_sync {
1828	my ($map) = @_;	2060	my ($map) = @_;
1829		2061
		2062	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
		2063	if $Coro::current == $Coro::main;
		2064
1830	cf::sync_job { $map->load };	2065	cf::sync_job { $map->load };
1831	}	2066	}
1832		2067
1833	our %MAP_PREFETCH;	2068	our %MAP_PREFETCH;
1834	our $MAP_PREFETCHER = undef;	2069	our $MAP_PREFETCHER = undef;
1835		2070
1836	sub find_async {	2071	sub find_async {
1837	my ($path, $origin) = @_;	2072	my ($path, $origin, $load) = @_;
1838		2073
1839	$path = normalise $path, $origin && $origin->{path};	2074	$path = normalise $path, $origin && $origin->{path};
1840		2075
1841	if (my $map = $cf::MAP{$path}) {	2076	if (my $map = $cf::MAP{$path}) {
1842	return $map if $map->in_memory == cf::MAP_IN_MEMORY;	2077	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1843	}	2078	}
1844		2079
1845	undef $MAP_PREFETCH{$path};	2080	$MAP_PREFETCH{$path} |= $load;
		2081
1846	$MAP_PREFETCHER ||= cf::async {	2082	$MAP_PREFETCHER ||= cf::async {
		2083	$Coro::current->{desc} = "map prefetcher";
		2084
1847	while (%MAP_PREFETCH) {	2085	while (%MAP_PREFETCH) {
1848	for my $path (keys %MAP_PREFETCH) {	2086	while (my ($k, $v) = each %MAP_PREFETCH) {
1849	my $map = find $path	2087	if (my $map = find $k) {
1850	or next;
1851	$map->load;	2088	$map->load if $v;
		2089	}
1852		2090
1853	delete $MAP_PREFETCH{$path};	2091	delete $MAP_PREFETCH{$k};
1854	}	2092	}
1855	}	2093	}
1856	undef $MAP_PREFETCHER;	2094	undef $MAP_PREFETCHER;
1857	};	2095	};
1858	$MAP_PREFETCHER->prio (6);	2096	$MAP_PREFETCHER->prio (6);
…		…
1861	}	2099	}
1862		2100
1863	sub save {	2101	sub save {
1864	my ($self) = @_;	2102	my ($self) = @_;
1865		2103
1866	my $lock = cf::lock_acquire "map_data:" . $self->path;	2104	my $lock = cf::lock_acquire "map_data:$self->{path}";
1867		2105
1868	$self->{last_save} = $cf::RUNTIME;	2106	$self->{last_save} = $cf::RUNTIME;
1869		2107
1870	return unless $self->dirty;	2108	return unless $self->dirty;
1871		2109
…		…
1877	return if $self->{deny_save};	2115	return if $self->{deny_save};
1878		2116
1879	local $self->{last_access} = $self->last_access;#d#	2117	local $self->{last_access} = $self->last_access;#d#
1880		2118
1881	cf::async {	2119	cf::async {
		2120	$Coro::current->{desc} = "map player save";
1882	$_->contr->save for $self->players;	2121	$_->contr->save for $self->players;
1883	};	2122	};
1884		2123
1885	if ($uniq) {	2124	if ($uniq) {
1886	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2125	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
…		…
1894	my ($self) = @_;	2133	my ($self) = @_;
1895		2134
1896	# save first because save cedes	2135	# save first because save cedes
1897	$self->save;	2136	$self->save;
1898		2137
1899	my $lock = cf::lock_acquire "map_data:" . $self->path;	2138	my $lock = cf::lock_acquire "map_data:$self->{path}";
1900		2139
1901	return if $self->players;	2140	return if $self->players;
1902	return if $self->in_memory != cf::MAP_IN_MEMORY;	2141	return if $self->in_memory != cf::MAP_IN_MEMORY;
1903	return if $self->{deny_save};	2142	return if $self->{deny_save};
1904		2143
		2144	$self->in_memory (cf::MAP_SWAPPED);
		2145
		2146	$self->deactivate;
		2147	$_->clear_links_to ($self) for values %cf::MAP;
1905	$self->clear;	2148	$self->clear;
1906	$self->in_memory (cf::MAP_SWAPPED);
1907	}	2149	}
1908		2150
1909	sub reset_at {	2151	sub reset_at {
1910	my ($self) = @_;	2152	my ($self) = @_;
1911		2153
…		…
1943	if $uniq;	2185	if $uniq;
1944	}	2186	}
1945		2187
1946	delete $cf::MAP{$self->path};	2188	delete $cf::MAP{$self->path};
1947		2189
		2190	$self->deactivate;
		2191	$_->clear_links_to ($self) for values %cf::MAP;
1948	$self->clear;	2192	$self->clear;
1949
1950	$_->clear_links_to ($self) for values %cf::MAP;
1951		2193
1952	$self->unlink_save;	2194	$self->unlink_save;
1953	$self->destroy;	2195	$self->destroy;
1954	}	2196	}
1955		2197
1956	my $nuke_counter = "aaaa";	2198	my $nuke_counter = "aaaa";
1957		2199
1958	sub nuke {	2200	sub nuke {
1959	my ($self) = @_;	2201	my ($self) = @_;
1960		2202
		2203	{
		2204	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2205
1961	delete $cf::MAP{$self->path};	2206	delete $cf::MAP{$self->path};
1962		2207
1963	$self->unlink_save;	2208	$self->unlink_save;
1964		2209
1965	bless $self, "cf::map";	2210	bless $self, "cf::map";
1966	delete $self->{deny_reset};	2211	delete $self->{deny_reset};
1967	$self->{deny_save} = 1;	2212	$self->{deny_save} = 1;
1968	$self->reset_timeout (1);	2213	$self->reset_timeout (1);
1969	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2214	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1970		2215
1971	$cf::MAP{$self->path} = $self;	2216	$cf::MAP{$self->path} = $self;
		2217	}
1972		2218
1973	$self->reset; # polite request, might not happen	2219	$self->reset; # polite request, might not happen
1974	}	2220	}
1975		2221
1976	=item $maps = cf::map::tmp_maps	2222	=item $maps = cf::map::tmp_maps
…		…
2052		2298
2053	sub inv_recursive {	2299	sub inv_recursive {
2054	inv_recursive_ inv $_[0]	2300	inv_recursive_ inv $_[0]
2055	}	2301	}
2056		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
2057	package cf;	2331	package cf;
2058		2332
2059	=back	2333	=back
2060		2334
2061	=head3 cf::object::player	2335	=head3 cf::object::player
…		…
2083		2357
2084	} else {	2358	} else {
2085	my $pl = $self->contr;	2359	my $pl = $self->contr;
2086		2360
2087	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {	2361	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088	my $diag = $pl->{npc_dialog};	2362	my $dialog = $pl->{npc_dialog};
2089	$diag->{pl}->ext_reply (	2363	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2090	$diag->{id},
2091	msgtype => "reply",
2092	msg => $diag->{pl}->expand_cfpod ($msg),
2093	add_topics => []
2094	);
2095		2364
2096	} else {	2365	} else {
2097	$msg = $npc->name . " says: $msg" if $npc;	2366	$msg = $npc->name . " says: $msg" if $npc;
2098	$self->message ($msg, $flags);	2367	$self->message ($msg, $flags);
2099	}	2368	}
2100	}	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 (@_);
2101	}	2380	}
2102		2381
2103	=item $player_object->may ("access")	2382	=item $player_object->may ("access")
2104		2383
2105	Returns wether the given player is authorized to access resource "access"	2384	Returns wether the given player is authorized to access resource "access"
…		…
2184	# use -1 or undef as default coordinates, not 0, 0	2463	# use -1 or undef as default coordinates, not 0, 0
2185	($x, $y) = ($map->enter_x, $map->enter_y)	2464	($x, $y) = ($map->enter_x, $map->enter_y)
2186	if $x <=0 && $y <= 0;	2465	if $x <=0 && $y <= 0;
2187		2466
2188	$map->load;	2467	$map->load;
2189	$map->load_diag;	2468	$map->load_neighbours;
2190		2469
2191	return unless $self->contr->active;	2470	return unless $self->contr->active;
2192	$self->activate_recursive;	2471	$self->activate_recursive;
2193		2472
2194	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2473	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195	$self->enter_map ($map, $x, $y);	2474	$self->enter_map ($map, $x, $y);
2196	}	2475	}
2197		2476
2198	=item $player_object->goto ($path, $x, $y[, $check->($map)])	2477	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199		2478
2200	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
2201	her, loading and preparing them map, calling the provided $check callback	2480	her, loading and preparing them map, calling the provided $check callback
2202	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
2203	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.
2204		2484
2205	=cut	2485	=cut
2206		2486
2207	our $GOTOGEN;	2487	our $GOTOGEN;
2208		2488
2209	sub cf::object::player::goto {	2489	sub cf::object::player::goto {
2210	my ($self, $path, $x, $y, $check) = @_;	2490	my ($self, $path, $x, $y, $check, $done) = @_;
2211		2491
2212	# 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
2213	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2493	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214		2494
2215	$self->enter_link;	2495	$self->enter_link;
2216		2496
2217	(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
2218	my $map = eval {	2519	my $map = eval {
2219	my $map = cf::map::find $path;	2520	my $map = defined $path ? cf::map::find $path : undef;
2220		2521
2221	if ($map) {	2522	if ($map) {
2222	$map = $map->customise_for ($self);	2523	$map = $map->customise_for ($self);
2223	$map = $check->($map) if $check && $map;	2524	$map = $check->($map) if $check && $map;
2224	} else {	2525	} else {
2225	$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);
2226	}	2527	}
2227		2528
2228	$map	2529	$map
2229	};	2530	};
2230		2531
…		…
2235		2536
2236	if ($gen == $self->{_goto_generation}) {	2537	if ($gen == $self->{_goto_generation}) {
2237	delete $self->{_goto_generation};	2538	delete $self->{_goto_generation};
2238	$self->leave_link ($map, $x, $y);	2539	$self->leave_link ($map, $x, $y);
2239	}	2540	}
		2541
		2542	$done->() if $done;
2240	})->prio (1);	2543	})->prio (1);
2241	}	2544	}
2242		2545
2243	=item $player_object->enter_exit ($exit_object)	2546	=item $player_object->enter_exit ($exit_object)
2244		2547
…		…
2313	my $hp = $exit->stats->hp;	2616	my $hp = $exit->stats->hp;
2314	my $sp = $exit->stats->sp;	2617	my $sp = $exit->stats->sp;
2315		2618
2316	$self->enter_link;	2619	$self->enter_link;
2317		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
2318	(async {	2625	(async {
		2626	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";
		2627
2319	$self->deactivate_recursive; # just to be sure	2628	$self->deactivate_recursive; # just to be sure
2320	unless (eval {	2629	unless (eval {
2321	$self->goto ($slaying, $hp, $sp);	2630	$self->goto ($slaying, $hp, $sp);
2322		2631
2323	1;	2632	1;
…		…
2349		2658
2350	utf8::encode $text;	2659	utf8::encode $text;
2351	$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);
2352	}	2661	}
2353		2662
2354	=item $client->send_msg ($color, $type, $msg, [extra...])	2663	=item $client->send_msg ($channel, $msg, $color, [extra...])
2355		2664
2356	Send a drawinfo or msg packet to the client, formatting the msg for the	2665	Send a drawinfo or msg packet to the client, formatting the msg for the
2357	client if neccessary. C<$type> should be a string identifying the type of	2666	client if neccessary. C<$type> should be a string identifying the type of
2358	the message, with C<log> being the default. If C<$color> is negative, suppress	2667	the message, with C<log> being the default. If C<$color> is negative, suppress
2359	the message unless the client supports the msg packet.	2668	the message unless the client supports the msg packet.
2360		2669
2361	=cut	2670	=cut
2362		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
2363	sub cf::client::send_msg {	2693	sub cf::client::send_msg {
2364	my ($self, $color, $type, $msg, @extra) = @_;	2694	my ($self, $channel, $msg, $color, @extra) = @_;
2365		2695
2366	$msg = $self->pl->expand_cfpod ($msg);	2696	$msg = $self->pl->expand_cfpod ($msg);
2367		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
2368	if ($self->can_msg) {	2722	if ($self->can_msg) {
2369	$self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);	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]));
2370	} else {	2729	} else {
2371	# replace some tags by gcfclient-compatible ones
2372	for ($msg) {
2373	1 while
2374	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2379	}
2380
2381	if ($color >= 0) {	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
2382	if (0 && $msg =~ /\[/) {	2745	if (0 && $msg =~ /\[/) {
		2746	# COMMAND/INFO
2383	$self->send_packet ("drawextinfo $color 4 0 $msg")	2747	$self->send_packet ("drawextinfo $color 10 8 $msg")
2384	} else {	2748	} else {
2385	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;	2749	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2386	$self->send_packet ("drawinfo $color $msg")	2750	$self->send_packet ("drawinfo $color $msg")
2387	}	2751	}
2388	}	2752	}
2389	}	2753	}
2390	}	2754	}
2391		2755
2392	=item $client->ext_event ($type, %msg)	2756	=item $client->ext_msg ($type, @msg)
2393		2757
2394	Sends an exti event to the client.	2758	Sends an ext event to the client.
2395		2759
2396	=cut	2760	=cut
2397		2761
2398	sub cf::client::ext_event($$%) {	2762	sub cf::client::ext_msg($$@) {
2399	my ($self, $type, %msg) = @_;	2763	my ($self, $type, @msg) = @_;
2400		2764
		2765	if ($self->extcmd == 2) {
		2766	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
		2767	} elsif ($self->extcmd == 1) { # TODO: remove
2401	$msg{msgtype} = "event_$type";	2768	push @msg, msgtype => "event_$type";
2402	$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	}
2403	}	2789	}
2404		2790
2405	=item $success = $client->query ($flags, "text", \&cb)	2791	=item $success = $client->query ($flags, "text", \&cb)
2406		2792
2407	Queues a query to the client, calling the given callback with	2793	Queues a query to the client, calling the given callback with
2408	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>,
2409	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>.
2410		2796
2411	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
2412	reliable at some point in the future.	2798	become reliable at some point in the future.
2413		2799
2414	=cut	2800	=cut
2415		2801
2416	sub cf::client::query {	2802	sub cf::client::query {
2417	my ($self, $flags, $text, $cb) = @_;	2803	my ($self, $flags, $text, $cb) = @_;
…		…
2425	utf8::encode $text;	2811	utf8::encode $text;
2426	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];	2812	push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2427		2813
2428	$self->send_packet ($self->{query_queue}[0][0])	2814	$self->send_packet ($self->{query_queue}[0][0])
2429	if @{ $self->{query_queue} } == 1;	2815	if @{ $self->{query_queue} } == 1;
		2816
		2817	1
2430	}	2818	}
2431		2819
2432	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	},
2433	on_reply => sub {	2826	on_reply => sub {
2434	my ($ns, $msg) = @_;	2827	my ($ns, $msg) = @_;
2435		2828
2436	# this weird shuffling is so that direct followup queries	2829	# this weird shuffling is so that direct followup queries
2437	# get handled first	2830	# get handled first
…		…
2449	} else {	2842	} else {
2450	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;	2843	$ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2451	}	2844	}
2452	}	2845	}
2453	},	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	},
2454	);	2873	);
2455		2874
2456	=item $client->async (\&cb)	2875	=item $client->async (\&cb)
2457		2876
2458	Create a new coroutine, running the specified callback. The coroutine will	2877	Create a new coroutine, running the specified callback. The coroutine will
…		…
2499	our $safe = new Safe "safe";	2918	our $safe = new Safe "safe";
2500	our $safe_hole = new Safe::Hole;	2919	our $safe_hole = new Safe::Hole;
2501		2920
2502	$SIG{FPE} = 'IGNORE';	2921	$SIG{FPE} = 'IGNORE';
2503		2922
2504	$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	));
2505		2928
2506	# here we export the classes and methods available to script code	2929	# here we export the classes and methods available to script code
2507		2930
2508	=pod	2931	=pod
2509		2932
2510	The following functions and methods are available within a safe environment:	2933	The following functions and methods are available within a safe environment:
2511		2934
2512	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
2513	cf::object::player player	2939	cf::object::player
2514	cf::player peaceful	2940	player
2515	cf::map trigger	2941
		2942	cf::player
		2943	peaceful
		2944
		2945	cf::map
		2946	trigger
2516		2947
2517	=cut	2948	=cut
2518		2949
2519	for (	2950	for (
2520	["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)],
2521	["cf::object::player" => qw(player)],	2954	["cf::object::player" => qw(player)],
2522	["cf::player" => qw(peaceful)],	2955	["cf::player" => qw(peaceful)],
2523	["cf::map" => qw(trigger)],	2956	["cf::map" => qw(trigger)],
2524	) {	2957	) {
2525	no strict 'refs';	2958	no strict 'refs';
…		…
2601	# the server's init and main functions	3034	# the server's init and main functions
2602		3035
2603	sub load_facedata($) {	3036	sub load_facedata($) {
2604	my ($path) = @_;	3037	my ($path) = @_;
2605		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
2606	warn "loading facedata from $path\n";	3045	warn "loading facedata from $path\n";
2607		3046
2608	my $facedata;	3047	my $facedata;
2609	0 < aio_load $path, $facedata	3048	0 < aio_load $path, $facedata
2610	or die "$path: $!";	3049	or die "$path: $!";
…		…
2612	$facedata = Coro::Storable::thaw $facedata;	3051	$facedata = Coro::Storable::thaw $facedata;
2613		3052
2614	$facedata->{version} == 2	3053	$facedata->{version} == 2
2615	or cf::cleanup "$path: version mismatch, cannot proceed.";	3054	or cf::cleanup "$path: version mismatch, cannot proceed.";
2616		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
2617	{	3063	{
2618	my $faces = $facedata->{faceinfo};	3064	my $faces = $facedata->{faceinfo};
2619		3065
2620	while (my ($face, $info) = each %$faces) {	3066	while (my ($face, $info) = each %$faces) {
2621	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3067	my $idx = (cf::face::find $face) || cf::face::alloc $face;
2622	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	3068	cf::face::set_visibility $idx, $info->{visibility};
		3069	cf::face::set_magicmap $idx, $info->{magicmap};
2623	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	3070	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2624	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	3071	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2625	Coro::cede;	3072
		3073	cf::cede_to_tick;
2626	}	3074	}
2627		3075
2628	while (my ($face, $info) = each %$faces) {	3076	while (my ($face, $info) = each %$faces) {
2629	next unless $info->{smooth};	3077	next unless $info->{smooth};
2630	my $idx = cf::face::find $face	3078	my $idx = cf::face::find $face
2631	or next;	3079	or next;
2632	if (my $smooth = cf::face::find $info->{smooth}) {	3080	if (my $smooth = cf::face::find $info->{smooth}) {
		3081	cf::face::set_smooth $idx, $smooth;
2633	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};	3082	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2634	} else {	3083	} else {
2635	warn "smooth face '$info->{smooth}' not found for face '$face'";	3084	warn "smooth face '$info->{smooth}' not found for face '$face'";
2636	}	3085	}
2637	Coro::cede;	3086
		3087	cf::cede_to_tick;
2638	}	3088	}
2639	}	3089	}
2640		3090
2641	{	3091	{
2642	my $anims = $facedata->{animinfo};	3092	my $anims = $facedata->{animinfo};
2643		3093
2644	while (my ($anim, $info) = each %$anims) {	3094	while (my ($anim, $info) = each %$anims) {
2645	cf::anim::set $anim, $info->{frames}, $info->{facings};	3095	cf::anim::set $anim, $info->{frames}, $info->{facings};
2646	Coro::cede;	3096	cf::cede_to_tick;
2647	}	3097	}
2648		3098
2649	cf::anim::invalidate_all; # d'oh	3099	cf::anim::invalidate_all; # d'oh
2650	}	3100	}
2651		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
2652	1	3151	1
2653	}	3152	}
2654		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
2655	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
2656	load_resource_file "$MAPDIR/regions"	3167	load_resource_file "$MAPDIR/regions"
2657	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	}
2658	}	3174	}
2659		3175
2660	sub reload_facedata {	3176	sub reload_facedata {
2661	load_facedata "$DATADIR/facedata"	3177	load_facedata "$DATADIR/facedata"
2662	or die "unable to load facedata\n";	3178	or die "unable to load facedata\n";
2663	}	3179	}
2664		3180
2665	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)
2666	load_resource_file "$DATADIR/archetypes"	3187	load_resource_file "$DATADIR/archetypes"
2667	or die "unable to load archetypes\n";	3188	or die "unable to load archetypes\n";
2668	}	3189	}
2669		3190
2670	sub reload_treasures {	3191	sub reload_treasures {
…		…
2686		3207
2687	sub init {	3208	sub init {
2688	reload_resources;	3209	reload_resources;
2689	}	3210	}
2690		3211
2691	sub cfg_load {	3212	sub reload_config {
2692	open my $fh, "<:utf8", "$CONFDIR/config"	3213	open my $fh, "<:utf8", "$CONFDIR/config"
2693	or return;	3214	or return;
2694		3215
2695	local $/;	3216	local $/;
2696	*CFG = YAML::Syck::Load <$fh>;	3217	*CFG = YAML::Syck::Load <$fh>;
…		…
2712	sub main {	3233	sub main {
2713	# we must not ever block the main coroutine	3234	# we must not ever block the main coroutine
2714	local $Coro::idle = sub {	3235	local $Coro::idle = sub {
2715	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#
2716	(async {	3237	(async {
		3238	$Coro::current->{desc} = "IDLE BUG HANDLER";
2717	Event::one_event;	3239	Event::one_event;
2718	})->prio (Coro::PRIO_MAX);	3240	})->prio (Coro::PRIO_MAX);
2719	};	3241	};
2720		3242
2721	cfg_load;	3243	reload_config;
2722	db_init;	3244	db_init;
2723	load_extensions;	3245	load_extensions;
2724		3246
2725	$TICK_WATCHER->start;	3247	$TICK_WATCHER->start;
2726	Event::loop;	3248	Event::loop;
…		…
2793	# and maps saved/destroyed asynchronously.	3315	# and maps saved/destroyed asynchronously.
2794	warn "begin emergency player save\n";	3316	warn "begin emergency player save\n";
2795	for my $login (keys %cf::PLAYER) {	3317	for my $login (keys %cf::PLAYER) {
2796	my $pl = $cf::PLAYER{$login} or next;	3318	my $pl = $cf::PLAYER{$login} or next;
2797	$pl->valid or next;	3319	$pl->valid or next;
		3320	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2798	$pl->save;	3321	$pl->save;
2799	}	3322	}
2800	warn "end emergency player save\n";	3323	warn "end emergency player save\n";
2801		3324
2802	warn "begin emergency map save\n";	3325	warn "begin emergency map save\n";
…		…
2850		3373
2851	warn "flushing outstanding aio requests";	3374	warn "flushing outstanding aio requests";
2852	for (;;) {	3375	for (;;) {
2853	BDB::flush;	3376	BDB::flush;
2854	IO::AIO::flush;	3377	IO::AIO::flush;
2855	Coro::cede;	3378	Coro::cede_notself;
2856	last unless IO::AIO::nreqs || BDB::nreqs;	3379	last unless IO::AIO::nreqs || BDB::nreqs;
2857	warn "iterate...";	3380	warn "iterate...";
2858	}	3381	}
2859		3382
2860	++$RELOAD;	3383	++$RELOAD;
…		…
2864	%EXT_CORO = ();	3387	%EXT_CORO = ();
2865		3388
2866	warn "removing commands";	3389	warn "removing commands";
2867	%COMMAND = ();	3390	%COMMAND = ();
2868		3391
2869	warn "removing ext commands";	3392	warn "removing ext/exti commands";
2870	%EXTCMD = ();	3393	%EXTCMD = ();
		3394	%EXTICMD = ();
2871		3395
2872	warn "unloading/nuking all extensions";	3396	warn "unloading/nuking all extensions";
2873	for my $pkg (@EXTS) {	3397	for my $pkg (@EXTS) {
2874	warn "... unloading $pkg";	3398	warn "... unloading $pkg";
2875		3399
…		…
2918	warn "reloading cf.pm";	3442	warn "reloading cf.pm";
2919	require cf;	3443	require cf;
2920	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3444	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2921		3445
2922	warn "loading config and database again";	3446	warn "loading config and database again";
2923	cf::cfg_load;	3447	cf::reload_config;
2924		3448
2925	warn "loading extensions";	3449	warn "loading extensions";
2926	cf::load_extensions;	3450	cf::load_extensions;
2927		3451
2928	warn "reattaching attachments to objects/players";	3452	warn "reattaching attachments to objects/players";
…		…
2964	register_command "reload" => sub {	3488	register_command "reload" => sub {
2965	my ($who, $arg) = @_;	3489	my ($who, $arg) = @_;
2966		3490
2967	if ($who->flag (FLAG_WIZ)) {	3491	if ($who->flag (FLAG_WIZ)) {
2968	$who->message ("reloading server.");	3492	$who->message ("reloading server.");
		3493	async {
		3494	$Coro::current->{desc} = "perl_reload";
2969	async { reload_perl };	3495	reload_perl;
		3496	};
2970	}	3497	}
2971	};	3498	};
2972		3499
2973	unshift @INC, $LIBDIR;	3500	unshift @INC, $LIBDIR;
2974		3501
…		…
2993	my $signal = new Coro::Signal;	3520	my $signal = new Coro::Signal;
2994	push @WAIT_FOR_TICK_BEGIN, $signal;	3521	push @WAIT_FOR_TICK_BEGIN, $signal;
2995	$signal->wait;	3522	$signal->wait;
2996	}	3523	}
2997		3524
2998	my $min = 1e6;#d#
2999	my $avg = 10;
3000	$TICK_WATCHER = Event->timer (	3525	$TICK_WATCHER = Event->timer (
3001	reentrant => 0,	3526	reentrant => 0,
3002	parked => 1,	3527	parked => 1,
3003	prio => 0,	3528	prio => 0,
3004	at => $NEXT_TICK || $TICK,	3529	at => $NEXT_TICK || $TICK,
…		…
3012		3537
3013	$NOW = $tick_start = Event::time;	3538	$NOW = $tick_start = Event::time;
3014		3539
3015	cf::server_tick; # one server iteration	3540	cf::server_tick; # one server iteration
3016		3541
3017	0 && sync_job {#d#
3018	for(1..10) {
3019	my $t = Event::time;
3020	my $map = my $map = new_from_path cf::map "/tmp/x.map"
3021	or die;
3022
3023	$map->width (50);
3024	$map->height (50);
3025	$map->alloc;
3026	$map->_load_objects ("/tmp/x.map", 1);
3027	my $t = Event::time - $t;
3028
3029	#next unless $t < 0.0013;#d#
3030	if ($t < $min) {
3031	$min = $t;
3032	}
3033	$avg = $avg * 0.99 + $t * 0.01;
3034	}
3035	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3036	exit 0;
3037	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3038	};
3039
3040	$RUNTIME += $TICK;	3542	$RUNTIME += $TICK;
3041	$NEXT_TICK += $TICK;	3543	$NEXT_TICK += $TICK;
3042		3544
3043	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3545	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3044	$NEXT_RUNTIME_WRITE = $NOW + 10;	3546	$NEXT_RUNTIME_WRITE = $NOW + 10;
3045	Coro::async_pool {	3547	Coro::async_pool {
		3548	$Coro::current->{desc} = "runtime saver";
3046	write_runtime	3549	write_runtime
3047	or warn "ERROR: unable to write runtime file: $!";	3550	or warn "ERROR: unable to write runtime file: $!";
3048	};	3551	};
3049	}	3552	}
3050		3553
3051	# my $AFTER = Event::time;
3052	# warn $AFTER - $NOW;#d#
3053
3054	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3554	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3055	$sig->send;	3555	$sig->send;
3056	}	3556	}
3057	while (my $sig = shift @WAIT_FOR_TICK) {	3557	while (my $sig = shift @WAIT_FOR_TICK) {
3058	$sig->send;	3558	$sig->send;
…		…
3068		3568
3069	$LOAD = ($NOW - $tick_start) / $TICK;	3569	$LOAD = ($NOW - $tick_start) / $TICK;
3070	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	3570	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3071		3571
3072	_post_tick;	3572	_post_tick;
3073
3074
3075	},	3573	},
3076	);	3574	);
3077		3575
3078	{	3576	{
		3577	BDB::min_parallel 8;
3079	BDB::max_poll_time $TICK * 0.1;	3578	BDB::max_poll_time $TICK * 0.1;
3080	$BDB_POLL_WATCHER = Event->io (	3579	$BDB_POLL_WATCHER = Event->io (
3081	reentrant => 0,	3580	reentrant => 0,
3082	fd => BDB::poll_fileno,	3581	fd => BDB::poll_fileno,
3083	poll => 'r',	3582	poll => 'r',
3084	prio => 0,	3583	prio => 0,
3085	data => WF_AUTOCANCEL,	3584	data => WF_AUTOCANCEL,
3086	cb => \&BDB::poll_cb,	3585	cb => \&BDB::poll_cb,
3087	);	3586	);
3088	BDB::min_parallel 8;
3089		3587
3090	BDB::set_sync_prepare {	3588	BDB::set_sync_prepare {
3091	my $status;	3589	my $status;
3092	my $current = $Coro::current;	3590	my $current = $Coro::current;
3093	(	3591	(
…		…
3102	)	3600	)
3103	};	3601	};
3104		3602
3105	unless ($DB_ENV) {	3603	unless ($DB_ENV) {
3106	$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);
3107		3609
3108	cf::sync_job {	3610	cf::sync_job {
3109	eval {	3611	eval {
3110	BDB::db_env_open	3612	BDB::db_env_open
3111	$DB_ENV,	3613	$DB_ENV,
…		…
3113	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
3114	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	3616	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3115	0666;	3617	0666;
3116		3618
3117	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	3619	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3118
3119	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3120	$DB_ENV->set_lk_detect;
3121	};	3620	};
3122		3621
3123	cf::cleanup "db_env_open(db): $@" if $@;	3622	cf::cleanup "db_env_open(db): $@" if $@;
3124	};	3623	};
3125	}	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	);
3126	}	3656	}
3127		3657
3128	{	3658	{
3129	IO::AIO::min_parallel 8;	3659	IO::AIO::min_parallel 8;
3130		3660
…		…
3133	$AIO_POLL_WATCHER = Event->io (	3663	$AIO_POLL_WATCHER = Event->io (
3134	reentrant => 0,	3664	reentrant => 0,
3135	data => WF_AUTOCANCEL,	3665	data => WF_AUTOCANCEL,
3136	fd => IO::AIO::poll_fileno,	3666	fd => IO::AIO::poll_fileno,
3137	poll => 'r',	3667	poll => 'r',
3138	prio => 6,	3668	prio => 0,
3139	cb => \&IO::AIO::poll_cb,	3669	cb => \&IO::AIO::poll_cb,
3140	);	3670	);
3141	}	3671	}
3142		3672
3143	my $_log_backtrace;	3673	my $_log_backtrace;
…		…
3149		3679
3150	# limit the # of concurrent backtraces	3680	# limit the # of concurrent backtraces
3151	if ($_log_backtrace < 2) {	3681	if ($_log_backtrace < 2) {
3152	++$_log_backtrace;	3682	++$_log_backtrace;
3153	async {	3683	async {
		3684	$Coro::current->{desc} = "abt $msg";
		3685
3154	my @bt = fork_call {	3686	my @bt = fork_call {
3155	@addr = map { sprintf "%x", $_ } @addr;	3687	@addr = map { sprintf "%x", $_ } @addr;
3156	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;	3688	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3157	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 |"
3158	or die "addr2line: $!";	3690	or die "addr2line: $!";

Diff Legend

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