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.528 by root, Fri Apr 23 04:42:12 2010 UTC vs.
Revision 1.578 by root, Wed Jan 4 02:48:57 2012 UTC

1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify it under	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# the terms of the Affero GNU General Public License as published by the	7	# the terms of the Affero GNU General Public License as published by the
8	# Free Software Foundation, either version 3 of the License, or (at your	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# option) any later version.	9	# option) any later version.
…		…
20	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
21	#	21	#
22		22
23	package cf;	23	package cf;
24		24
25	use 5.10.0;	25	use common::sense;
26	use utf8;
27	use strict qw(vars subs);
28		26
29	use Symbol;	27	use Symbol;
30	use List::Util;	28	use List::Util;
31	use Socket;	29	use Socket;
32	use EV;	30	use EV;
…		…
78	# strictly for debugging	76	# strictly for debugging
79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	77	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80		78
81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	79	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82		80
		81	our @ORIG_INC;
		82
83	our %COMMAND = ();	83	our %COMMAND = ();
84	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
85		85
86	our @EXTS = (); # list of extension package names	86	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	87	our %EXTCMD = ();
…		…
93	our @EVENT;	93	our @EVENT;
94	our @REFLECT; # set by XS	94	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	95	our %REFLECT; # set by us
96		96
97	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
		98
98	our $DATADIR = datadir;	99	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	100	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	101	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	102	our $MAPDIR = "$DATADIR/" . mapdir;
		103
102	our $LOCALDIR = localdir;	104	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	105	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	106	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	107	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	108	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	109	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	110	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	111	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		112
111	our %RESOURCE;	113	#our %RESOURCE; # unused
112		114
113	our $OUTPUT_RATE_MIN = 3000;	115	our $OUTPUT_RATE_MIN = 3000;
114	our $OUTPUT_RATE_MAX = 1000000;	116	our $OUTPUT_RATE_MAX = 1000000;
115		117
116	our $MAX_LINKS = 32; # how many chained exits to follow	118	our $MAX_LINKS = 32; # how many chained exits to follow
…		…
124	our $BDB_DEADLOCK_WATCHER;	126	our $BDB_DEADLOCK_WATCHER;
125	our $BDB_CHECKPOINT_WATCHER;	127	our $BDB_CHECKPOINT_WATCHER;
126	our $BDB_TRICKLE_WATCHER;	128	our $BDB_TRICKLE_WATCHER;
127	our $DB_ENV;	129	our $DB_ENV;
128		130
129	our @EXTRA_MODULES = qw(pod match mapscript);	131	our @EXTRA_MODULES = qw(pod match mapscript incloader);
130		132
131	our %CFG;	133	our %CFG;
132		134
133	our $UPTIME; $UPTIME ||= time;	135	our $UPTIME; $UPTIME ||= time;
134	our $RUNTIME;	136	our $RUNTIME = 0;
		137	our $SERVER_TICK = 0;
135	our $NOW;	138	our $NOW;
136		139
137	our (%PLAYER, %PLAYER_LOADING); # all users	140	our (%PLAYER, %PLAYER_LOADING); # all users
138	our (%MAP, %MAP_LOADING ); # all maps	141	our (%MAP, %MAP_LOADING ); # all maps
139	our $LINK_MAP; # the special {link} map, which is always available	142	our $LINK_MAP; # the special {link} map, which is always available
…		…
148		151
149	our @POST_INIT;	152	our @POST_INIT;
150		153
151	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	154	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152	our $REALLY_UNLOOP; # never set to true, please :)	155	our $REALLY_UNLOOP; # never set to true, please :)
		156
		157	our $WAIT_FOR_TICK = new Coro::Signal;
		158	our @WAIT_FOR_TICK_BEGIN;
153		159
154	binmode STDOUT;	160	binmode STDOUT;
155	binmode STDERR;	161	binmode STDERR;
156		162
157	# read virtual server time, if available	163	# read virtual server time, if available
…		…
191		197
192	=over 4	198	=over 4
193		199
194	=item $cf::UPTIME	200	=item $cf::UPTIME
195		201
196	The timestamp of the server start (so not actually an uptime).	202	The timestamp of the server start (so not actually an "uptime").
		203
		204	=item $cf::SERVER_TICK
		205
		206	An unsigned integer that starts at zero when the server is started and is
		207	incremented on every tick.
		208
		209	=item $cf::NOW
		210
		211	The (real) time of the last (current) server tick - updated before and
		212	after tick processing, so this is useful only as a rough "what time is it
		213	now" estimate.
		214
		215	=item $cf::TICK
		216
		217	The interval between each server tick, in seconds.
197		218
198	=item $cf::RUNTIME	219	=item $cf::RUNTIME
199		220
200	The time this server has run, starts at 0 and is increased by $cf::TICK on	221	The time this server has run, starts at 0 and is increased by $cf::TICK on
201	every server tick.	222	every server tick.
…		…
207	Various directories - "/etc", read-only install directory, perl-library	228	Various directories - "/etc", read-only install directory, perl-library
208	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	229	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209	unique-items directory, player file directory, random maps directory and	230	unique-items directory, player file directory, random maps directory and
210	database environment.	231	database environment.
211		232
212	=item $cf::NOW
213
214	The time of the last (current) server tick.
215
216	=item $cf::TICK
217
218	The interval between server ticks, in seconds.
219
220	=item $cf::LOADAVG	233	=item $cf::LOADAVG
221		234
222	The current CPU load on the server (alpha-smoothed), as a value between 0	235	The current CPU load on the server (alpha-smoothed), as a value between 0
223	(none) and 1 (overloaded), indicating how much time is spent on processing	236	(none) and 1 (overloaded), indicating how much time is spent on processing
224	objects per tick. Healthy values are < 0.5.	237	objects per tick. Healthy values are < 0.5.
…		…
233	from wherever your confdir points to.	246	from wherever your confdir points to.
234		247
235	=item cf::wait_for_tick, cf::wait_for_tick_begin	248	=item cf::wait_for_tick, cf::wait_for_tick_begin
236		249
237	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	250	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
238	returns directly I<after> the tick processing (and consequently, can only wake one process	251	returns directly I<after> the tick processing (and consequently, can only wake one thread
239	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	252	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
		253
		254	Note that cf::Wait_for_tick will immediately return when the server is not
		255	ticking, making it suitable for small pauses in threads that need to run
		256	when the server is paused. If that is not applicable (i.e. you I<really>
		257	want to wait, use C<$cf::WAIT_FOR_TICK>).
		258
		259	=item $cf::WAIT_FOR_TICK
		260
		261	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		262	variable contains a L<Coro::Signal> that is broadcats after every server
		263	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		264	next server tick.
		265
		266	=cut
		267
		268	sub wait_for_tick();
		269	sub wait_for_tick_begin();
240		270
241	=item @cf::INVOKE_RESULTS	271	=item @cf::INVOKE_RESULTS
242		272
243	This array contains the results of the last C<invoke ()> call. When	273	This array contains the results of the last C<invoke ()> call. When
244	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	274	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
…		…
252		282
253	=back	283	=back
254		284
255	=cut	285	=cut
256		286
		287	sub error(@) { LOG llevError, join "", @_ }
		288	sub warn (@) { LOG llevWarn , join "", @_ }
		289	sub info (@) { LOG llevInfo , join "", @_ }
		290	sub debug(@) { LOG llevDebug, join "", @_ }
		291	sub trace(@) { LOG llevTrace, join "", @_ }
		292
257	$Coro::State::WARNHOOK = sub {	293	$Coro::State::WARNHOOK = sub {
258	my $msg = join "", @_;	294	my $msg = join "", @_;
259		295
260	$msg .= "\n"	296	$msg .= "\n"
261	unless $msg =~ /\n$/;	297	unless $msg =~ /\n$/;
262		298
263	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	299	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
264		300
265	LOG llevError, $msg;	301	LOG llevWarn, $msg;
266	};	302	};
267		303
268	$Coro::State::DIEHOOK = sub {	304	$Coro::State::DIEHOOK = sub {
269	return unless $^S eq 0; # "eq", not "=="	305	return unless $^S eq 0; # "eq", not "=="
270		306
271	warn Carp::longmess $_[0];	307	error Carp::longmess $_[0];
272		308
273	if (in_main) {#d#	309	if (in_main) {#d#
274	warn "DIEHOOK called in main context, Coro bug?\n";#d#	310	error "DIEHOOK called in main context, Coro bug?\n";#d#
275	return;#d#	311	return;#d#
276	}#d#	312	}#d#
277		313
278	# kill coroutine otherwise	314	# kill coroutine otherwise
279	Coro::terminate	315	Coro::terminate
…		…
301	}	337	}
302		338
303	$EV::DIED = sub {	339	$EV::DIED = sub {
304	Carp::cluck "error in event callback: @_";	340	Carp::cluck "error in event callback: @_";
305	};	341	};
		342
		343	#############################################################################
		344
		345	sub fork_call(&@);
		346	sub get_slot($;$$);
306		347
307	#############################################################################	348	#############################################################################
308		349
309	=head2 UTILITY FUNCTIONS	350	=head2 UTILITY FUNCTIONS
310		351
…		…
331	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	372	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
332	$d	373	$d
333	} || "[unable to dump $_[0]: '$@']";	374	} || "[unable to dump $_[0]: '$@']";
334	}	375	}
335		376
		377	=item $scalar = load_file $path
		378
		379	Loads the given file from path and returns its contents. Croaks on error
		380	and can block.
		381
		382	=cut
		383
		384	sub load_file($) {
		385	0 <= aio_load $_[0], my $data
		386	or Carp::croak "$_[0]: $!";
		387
		388	$data
		389	}
		390
336	=item $ref = cf::decode_json $json	391	=item $ref = cf::decode_json $json
337		392
338	Converts a JSON string into the corresponding perl data structure.	393	Converts a JSON string into the corresponding perl data structure.
339		394
340	=item $json = cf::encode_json $ref	395	=item $json = cf::encode_json $ref
…		…
346	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	401	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
347		402
348	sub encode_json($) { $json_coder->encode ($_[0]) }	403	sub encode_json($) { $json_coder->encode ($_[0]) }
349	sub decode_json($) { $json_coder->decode ($_[0]) }	404	sub decode_json($) { $json_coder->decode ($_[0]) }
350		405
		406	=item $ref = cf::decode_storable $scalar
		407
		408	Same as Coro::Storable::thaw, so blocks.
		409
		410	=cut
		411
		412	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		413
		414	=item $ref = cf::decode_yaml $scalar
		415
		416	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		417
		418	=cut
		419
		420	sub decode_yaml($) {
		421	fork_call { YAML::XS::Load $_[0] } @_
		422	}
		423
		424	=item $scalar = cf::unlzf $scalar
		425
		426	Same as Compress::LZF::compress, but takes server ticks into account, so
		427	blocks.
		428
		429	=cut
		430
		431	sub unlzf($) {
		432	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		433	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		434	Compress::LZF::decompress $_[0]
		435	}
		436
351	=item cf::post_init { BLOCK }	437	=item cf::post_init { BLOCK }
352		438
353	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	439	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
354	but I<before> the server starts ticking again.	440	but I<before> the server starts ticking again.
355		441
356	The cdoeblock will have a single boolean argument to indicate whether this	442	The codeblock will have a single boolean argument to indicate whether this
357	is a reload or not.	443	is a reload or not.
358		444
359	=cut	445	=cut
360		446
361	sub post_init(&) {	447	sub post_init(&) {
362	push @POST_INIT, shift;	448	push @POST_INIT, shift;
		449	}
		450
		451	sub _post_init {
		452	trace "running post_init jobs";
		453
		454	# run them in parallel...
		455
		456	my @join;
		457
		458	while () {
		459	push @join, map &Coro::async ($_, 0), @POST_INIT;
		460	@POST_INIT = ();
		461
		462	@join or last;
		463
		464	(pop @join)->join;
		465	}
363	}	466	}
364		467
365	=item cf::lock_wait $string	468	=item cf::lock_wait $string
366		469
367	Wait until the given lock is available. See cf::lock_acquire.	470	Wait until the given lock is available. See cf::lock_acquire.
…		…
420	EV::periodic $start, $interval, 0, $cb	523	EV::periodic $start, $interval, 0, $cb
421	}	524	}
422		525
423	=item cf::get_slot $time[, $priority[, $name]]	526	=item cf::get_slot $time[, $priority[, $name]]
424		527
425	Allocate $time seconds of blocking CPU time at priority C<$priority>:	528	Allocate $time seconds of blocking CPU time at priority C<$priority>
426	This call blocks and returns only when you have at least C<$time> seconds	529	(default: 0): This call blocks and returns only when you have at least
427	of cpu time till the next tick. The slot is only valid till the next cede.	530	C<$time> seconds of cpu time till the next tick. The slot is only valid
		531	till the next cede.
		532
		533	Background jobs should use a priority les than zero, interactive jobs
		534	should use 100 or more.
428		535
429	The optional C<$name> can be used to identify the job to run. It might be	536	The optional C<$name> can be used to identify the job to run. It might be
430	used for statistical purposes and should identify the same time-class.	537	used for statistical purposes and should identify the same time-class.
431		538
432	Useful for short background jobs.	539	Useful for short background jobs.
…		…
461	}	568	}
462	}	569	}
463		570
464	if (@SLOT_QUEUE) {	571	if (@SLOT_QUEUE) {
465	# we do not use wait_for_tick() as it returns immediately when tick is inactive	572	# we do not use wait_for_tick() as it returns immediately when tick is inactive
466	push @cf::WAIT_FOR_TICK, $signal;	573	$WAIT_FOR_TICK->wait;
467	$signal->wait;
468	} else {	574	} else {
469	$busy = 0;	575	$busy = 0;
470	Coro::schedule;	576	Coro::schedule;
471	}	577	}
472	}	578	}
…		…
512	=cut	618	=cut
513		619
514	sub sync_job(&) {	620	sub sync_job(&) {
515	my ($job) = @_;	621	my ($job) = @_;
516		622
517	if ($Coro::current == $Coro::main) {	623	if (in_main) {
518	my $time = AE::time;	624	my $time = AE::time;
519		625
520	# this is the main coro, too bad, we have to block	626	# this is the main coro, too bad, we have to block
521	# till the operation succeeds, freezing the server :/	627	# till the operation succeeds, freezing the server :/
522		628
523	LOG llevError, Carp::longmess "sync job";#d#	629	#LOG llevError, Carp::longmess "sync job";#d#
524		630
525	my $freeze_guard = freeze_mainloop;	631	my $freeze_guard = freeze_mainloop;
526		632
527	my $busy = 1;	633	my $busy = 1;
528	my @res;	634	my @res;
529		635
530	(async {	636	(async {
531	$Coro::current->desc ("sync job coro");	637	$Coro::current->desc ("sync job coro");
532	@res = eval { $job->() };	638	@res = eval { $job->() };
533	warn $@ if $@;	639	error $@ if $@;
534	undef $busy;	640	undef $busy;
535	})->prio (Coro::PRIO_MAX);	641	})->prio (Coro::PRIO_MAX);
536		642
537	while ($busy) {	643	while ($busy) {
538	if (Coro::nready) {	644	if (Coro::nready) {
…		…
572	$EXT_CORO{$coro+0} = $coro;	678	$EXT_CORO{$coro+0} = $coro;
573		679
574	$coro	680	$coro
575	}	681	}
576		682
577	=item fork_call { }, $args	683	=item fork_call { }, @args
578		684
579	Executes the given code block with the given arguments in a seperate	685	Executes the given code block with the given arguments in a seperate
580	process, returning the results. Everything must be serialisable with	686	process, returning the results. Everything must be serialisable with
581	Coro::Storable. May, of course, block. Note that the executed sub may	687	Coro::Storable. May, of course, block. Note that the executed sub may
582	never block itself or use any form of event handling.	688	never block itself or use any form of event handling.
583		689
584	=cut	690	=cut
585		691
		692	sub post_fork {
		693	reset_signals;
		694	}
		695
586	sub fork_call(&@) {	696	sub fork_call(&@) {
587	my ($cb, @args) = @_;	697	my ($cb, @args) = @_;
588		698
589	# we seemingly have to make a local copy of the whole thing,	699	# we seemingly have to make a local copy of the whole thing,
590	# otherwise perl prematurely frees the stuff :/	700	# otherwise perl prematurely frees the stuff :/
591	# TODO: investigate and fix (likely this will be rather laborious)	701	# TODO: investigate and fix (likely this will be rather laborious)
592		702
593	my @res = Coro::Util::fork_eval {	703	my @res = Coro::Util::fork_eval {
594	reset_signals;	704	cf::post_fork;
595	&$cb	705	&$cb
596	}, @args;	706	} @args;
597		707
598	wantarray ? @res : $res[-1]	708	wantarray ? @res : $res[-1]
599	}	709	}
600		710
601	sub objinfo {	711	sub objinfo {
…		…
651	within each server.	761	within each server.
652		762
653	=cut	763	=cut
654		764
655	sub db_table($) {	765	sub db_table($) {
		766	cf::error "db_get called from main context"
		767	if $Coro::current == $Coro::main;
		768
656	my ($name) = @_;	769	my ($name) = @_;
657	my $db = BDB::db_create $DB_ENV;	770	my $db = BDB::db_create $DB_ENV;
658		771
659	eval {	772	eval {
660	$db->set_flags (BDB::CHKSUM);	773	$db->set_flags (BDB::CHKSUM);
…		…
670	}	783	}
671		784
672	our $DB;	785	our $DB;
673		786
674	sub db_init {	787	sub db_init {
675	cf::sync_job {
676	$DB ||= db_table "db";	788	$DB ||= db_table "db";
677	};
678	}	789	}
679		790
680	sub db_get($$) {	791	sub db_get($$) {
681	my $key = "$_[0]/$_[1]";	792	my $key = "$_[0]/$_[1]";
682		793
683	cf::sync_job {	794	cf::error "db_get called from main context"
		795	if $Coro::current == $Coro::main;
		796
684	BDB::db_get $DB, undef, $key, my $data;	797	BDB::db_get $DB, undef, $key, my $data;
685		798
686	$! ? ()	799	$! ? ()
687	: $data	800	: $data
688	}
689	}	801	}
690		802
691	sub db_put($$$) {	803	sub db_put($$$) {
692	BDB::dbreq_pri 4;	804	BDB::dbreq_pri 4;
693	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	805	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
721		833
722	my @data;	834	my @data;
723	my $md5;	835	my $md5;
724		836
725	for (0 .. $#$src) {	837	for (0 .. $#$src) {
726	0 <= aio_load $src->[$_], $data[$_]	838	$data[$_] = load_file $src->[$_];
727	or Carp::croak "$src->[$_]: $!";
728	}	839	}
729		840
730	# if processing is expensive, check	841	# if processing is expensive, check
731	# checksum first	842	# checksum first
732	if (1) {	843	if (1) {
…		…
749		860
750	my $t1 = Time::HiRes::time;	861	my $t1 = Time::HiRes::time;
751	my $data = $process->(\@data);	862	my $data = $process->(\@data);
752	my $t2 = Time::HiRes::time;	863	my $t2 = Time::HiRes::time;
753		864
754	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	865	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
755		866
756	db_put cache => "$id/data", $data;	867	db_put cache => "$id/data", $data;
757	db_put cache => "$id/md5" , $md5;	868	db_put cache => "$id/md5" , $md5;
758	db_put cache => "$id/meta", $meta;	869	db_put cache => "$id/meta", $meta;
759		870
…		…
769		880
770	=cut	881	=cut
771		882
772	sub datalog($@) {	883	sub datalog($@) {
773	my ($type, %kv) = @_;	884	my ($type, %kv) = @_;
774	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	885	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
775	}	886	}
776		887
777	=back	888	=back
778		889
779	=cut	890	=cut
…		…
974		1085
975	} elsif (exists $cb_id{$type}) {	1086	} elsif (exists $cb_id{$type}) {
976	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1087	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
977		1088
978	} elsif (ref $type) {	1089	} elsif (ref $type) {
979	warn "attaching objects not supported, ignoring.\n";	1090	error "attaching objects not supported, ignoring.\n";
980		1091
981	} else {	1092	} else {
982	shift @arg;	1093	shift @arg;
983	warn "attach argument '$type' not supported, ignoring.\n";	1094	error "attach argument '$type' not supported, ignoring.\n";
984	}	1095	}
985	}	1096	}
986	}	1097	}
987		1098
988	sub _object_attach {	1099	sub _object_attach {
…		…
998	_attach $registry, $klass, @attach;	1109	_attach $registry, $klass, @attach;
999	}	1110	}
1000		1111
1001	$obj->{$name} = \%arg;	1112	$obj->{$name} = \%arg;
1002	} else {	1113	} else {
1003	warn "object uses attachment '$name' which is not available, postponing.\n";	1114	info "object uses attachment '$name' which is not available, postponing.\n";
1004	}	1115	}
1005		1116
1006	$obj->{_attachment}{$name} = undef;	1117	$obj->{_attachment}{$name} = undef;
1007	}	1118	}
1008		1119
…		…
1067		1178
1068	for (@$callbacks) {	1179	for (@$callbacks) {
1069	eval { &{$_->[1]} };	1180	eval { &{$_->[1]} };
1070		1181
1071	if ($@) {	1182	if ($@) {
1072	warn "$@";
1073	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1183	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1074	override;	1184	override;
1075	}	1185	}
1076		1186
1077	return 1 if $override;	1187	return 1 if $override;
1078	}	1188	}
…		…
1157	for (@$attach) {	1267	for (@$attach) {
1158	my ($klass, @attach) = @$_;	1268	my ($klass, @attach) = @$_;
1159	_attach $registry, $klass, @attach;	1269	_attach $registry, $klass, @attach;
1160	}	1270	}
1161	} else {	1271	} else {
1162	warn "object uses attachment '$name' that is not available, postponing.\n";	1272	info "object uses attachment '$name' that is not available, postponing.\n";
1163	}	1273	}
1164	}	1274	}
1165	}	1275	}
1166		1276
1167	cf::attachable->attach (	1277	cf::attachable->attach (
…		…
1194	my ($filename, $rdata, $objs) = @_;	1304	my ($filename, $rdata, $objs) = @_;
1195		1305
1196	sync_job {	1306	sync_job {
1197	if (length $$rdata) {	1307	if (length $$rdata) {
1198	utf8::decode (my $decname = $filename);	1308	utf8::decode (my $decname = $filename);
1199	warn sprintf "saving %s (%d,%d)\n",	1309	trace sprintf "saving %s (%d,%d)\n",
1200	$decname, length $$rdata, scalar @$objs	1310	$decname, length $$rdata, scalar @$objs
1201	if $VERBOSE_IO;	1311	if $VERBOSE_IO;
1202		1312
1203	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1313	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1204	aio_chmod $fh, SAVE_MODE;	1314	aio_chmod $fh, SAVE_MODE;
1205	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1315	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
…		…
1228	aio_rename "$filename~", $filename;	1338	aio_rename "$filename~", $filename;
1229		1339
1230	$filename =~ s%/[^/]+$%%;	1340	$filename =~ s%/[^/]+$%%;
1231	aio_pathsync $filename if $cf::USE_FSYNC;	1341	aio_pathsync $filename if $cf::USE_FSYNC;
1232	} else {	1342	} else {
1233	warn "unable to save objects: $filename~: $!\n";	1343	error "unable to save objects: $filename~: $!\n";
1234	}	1344	}
1235	} else {	1345	} else {
1236	aio_unlink $filename;	1346	aio_unlink $filename;
1237	aio_unlink "$filename.pst";	1347	aio_unlink "$filename.pst";
1238	}	1348	}
…		…
1262	my $st = eval { Coro::Storable::thaw $av };	1372	my $st = eval { Coro::Storable::thaw $av };
1263	$av = $st->{objs};	1373	$av = $st->{objs};
1264	}	1374	}
1265		1375
1266	utf8::decode (my $decname = $filename);	1376	utf8::decode (my $decname = $filename);
1267	warn sprintf "loading %s (%d,%d)\n",	1377	trace sprintf "loading %s (%d,%d)\n",
1268	$decname, length $data, scalar @{$av || []}	1378	$decname, length $data, scalar @{$av || []}
1269	if $VERBOSE_IO;	1379	if $VERBOSE_IO;
1270		1380
1271	($data, $av)	1381	($data, $av)
1272	}	1382	}
1273		1383
…		…
1351	my ($pl, $buf) = @_;	1461	my ($pl, $buf) = @_;
1352		1462
1353	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1463	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1354		1464
1355	if (ref $msg) {	1465	if (ref $msg) {
1356	my ($type, $reply, @payload) =	1466	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1357	"ARRAY" eq ref $msg
1358	? @$msg
1359	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1360		1467
1361	my @reply;	1468	my @reply;
1362		1469
1363	if (my $cb = $EXTCMD{$type}) {	1470	if (my $cb = $EXTCMD{$type}) {
1364	@reply = $cb->($pl, @payload);	1471	@reply = $cb->($pl, @payload);
…		…
1366		1473
1367	$pl->ext_reply ($reply, @reply)	1474	$pl->ext_reply ($reply, @reply)
1368	if $reply;	1475	if $reply;
1369		1476
1370	} else {	1477	} else {
1371	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1478	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1372	}	1479	}
1373		1480
1374	cf::override;	1481	cf::override;
1375	},	1482	},
1376	);	1483	);
…		…
1387		1494
1388	$grp	1495	$grp
1389	}	1496	}
1390		1497
1391	sub load_extensions {	1498	sub load_extensions {
		1499	info "loading extensions...";
		1500
1392	cf::sync_job {	1501	cf::sync_job {
1393	my %todo;	1502	my %todo;
1394		1503
1395	for my $path (<$LIBDIR/*.ext>) {	1504	for my $path (<$LIBDIR/*.ext>) {
1396	next unless -r $path;	1505	next unless -r $path;
…		…
1414		1523
1415	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1524	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1416	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1525	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1417		1526
1418	$ext{source} =	1527	$ext{source} =
1419	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1528	"package $pkg; use common::sense;\n"
1420	. "#line 1 \"$path\"\n{\n"	1529	. "#line 1 \"$path\"\n{\n"
1421	. $source	1530	. $source
1422	. "\n};\n1";	1531	. "\n};\n1";
1423		1532
1424	$todo{$base} = \%ext;	1533	$todo{$base} = \%ext;
…		…
1436	for (split /,\s*/, $v->{meta}{depends}) {	1545	for (split /,\s*/, $v->{meta}{depends}) {
1437	next ext	1546	next ext
1438	unless exists $done{$_};	1547	unless exists $done{$_};
1439	}	1548	}
1440		1549
1441	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1550	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1442		1551
1443	my $active = eval $v->{source};	1552	my $active = eval $v->{source};
1444		1553
1445	if (length $@) {	1554	if (length $@) {
1446	warn "$v->{path}: $@\n";	1555	error "$v->{path}: $@\n";
1447		1556
1448	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1557	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1449	if exists $v->{meta}{mandatory};	1558	if exists $v->{meta}{mandatory};
1450		1559
1451	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";	1560	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
…		…
1453	} else {	1562	} else {
1454	$done{$k} = delete $todo{$k};	1563	$done{$k} = delete $todo{$k};
1455	push @EXTS, $v->{pkg};	1564	push @EXTS, $v->{pkg};
1456	$progress = 1;	1565	$progress = 1;
1457		1566
1458	warn "$v->{base}: extension inactive.\n"	1567	info "$v->{base}: extension inactive.\n"
1459	unless $active;	1568	unless $active;
1460	}	1569	}
1461	}	1570	}
1462		1571
1463	unless ($progress) {	1572	unless ($progress) {
…		…
1465		1574
1466	while (my ($k, $v) = each %todo) {	1575	while (my ($k, $v) = each %todo) {
1467	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1576	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1468	if exists $v->{meta}{mandatory};	1577	if exists $v->{meta}{mandatory};
1469	}	1578	}
		1579
		1580	last;
1470	}	1581	}
1471	}	1582	}
1472	};	1583	};
1473	}	1584	}
1474		1585
…		…
1632	my $name = $pl->ob->name;	1743	my $name = $pl->ob->name;
1633		1744
1634	$pl->{deny_save} = 1;	1745	$pl->{deny_save} = 1;
1635	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1746	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1636		1747
1637	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1748	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1638	$pl->deactivate;	1749	$pl->deactivate;
		1750
1639	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1751	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1640	$pl->ob->check_score;
1641	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1752	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1753	ext::highscore::check ($pl->ob);
		1754
1642	$pl->ns->destroy if $pl->ns;	1755	$pl->ns->destroy if $pl->ns;
1643		1756
1644	my $path = playerdir $pl;	1757	my $path = playerdir $pl;
1645	my $temp = "$path~$cf::RUNTIME~deleting~";	1758	my $temp = "$path~$cf::RUNTIME~deleting~";
1646	aio_rename $path, $temp;	1759	aio_rename $path, $temp;
…		…
1812	sub generate_random_map {	1925	sub generate_random_map {
1813	my ($self, $rmp) = @_;	1926	my ($self, $rmp) = @_;
1814		1927
1815	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1928	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1816		1929
1817	# mit "rum" bekleckern, nicht
1818	$self->_create_random_map (	1930	$self->_create_random_map ($rmp);
1819	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1820	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1821	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1822	$rmp->{exit_on_final_map},
1823	$rmp->{xsize}, $rmp->{ysize},
1824	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1825	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1826	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1827	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1828	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1829	(cf::region::find $rmp->{region}), $rmp->{custom}
1830	)
1831	}	1931	}
1832		1932
1833	=item cf::map->register ($regex, $prio)	1933	=item cf::map->register ($regex, $prio)
1834		1934
1835	Register a handler for the map path matching the given regex at the	1935	Register a handler for the map path matching the given regex at the
…		…
1840		1940
1841	sub register {	1941	sub register {
1842	my (undef, $regex, $prio) = @_;	1942	my (undef, $regex, $prio) = @_;
1843	my $pkg = caller;	1943	my $pkg = caller;
1844		1944
1845	no strict;
1846	push @{"$pkg\::ISA"}, __PACKAGE__;	1945	push @{"$pkg\::ISA"}, __PACKAGE__;
1847		1946
1848	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1947	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1849	}	1948	}
1850		1949
…		…
1862	}	1961	}
1863		1962
1864	sub normalise {	1963	sub normalise {
1865	my ($path, $base) = @_;	1964	my ($path, $base) = @_;
1866		1965
1867	$path = "$path"; # make sure its a string	1966	$path = "$path"; # make sure it's a string
1868		1967
1869	$path =~ s/\.map$//;	1968	$path =~ s/\.map$//;
1870		1969
1871	# map plan:	1970	# map plan:
1872	#	1971	#
…		…
1887	$base =~ s{[^/]+/?$}{};	1986	$base =~ s{[^/]+/?$}{};
1888	$path = "$base/$path";	1987	$path = "$base/$path";
1889	}	1988	}
1890		1989
1891	for ($path) {	1990	for ($path) {
1892	redo if s{//}{/};
1893	redo if s{/\.?/}{/};	1991	redo if s{/\.?/}{/};
1894	redo if s{/[^/]+/\.\./}{/};	1992	redo if s{/[^/]+/\.\./}{/};
1895	}	1993	}
1896		1994
1897	$path	1995	$path
…		…
1911	$self->init; # pass $1 etc.	2009	$self->init; # pass $1 etc.
1912	return $self;	2010	return $self;
1913	}	2011	}
1914	}	2012	}
1915		2013
1916	Carp::cluck "unable to resolve path '$path' (base '$base').";	2014	Carp::cluck "unable to resolve path '$path' (base '$base')";
1917	()	2015	()
1918	}	2016	}
1919		2017
		2018	# may re-bless or do other evil things
1920	sub init {	2019	sub init {
1921	my ($self) = @_;	2020	my ($self) = @_;
1922		2021
1923	$self	2022	$self
1924	}	2023	}
…		…
1989	$self->{load_path} = $path;	2088	$self->{load_path} = $path;
1990		2089
1991	1	2090	1
1992	}	2091	}
1993		2092
		2093	# used to laod the header of an original map
1994	sub load_header_orig {	2094	sub load_header_orig {
1995	my ($self) = @_;	2095	my ($self) = @_;
1996		2096
1997	$self->load_header_from ($self->load_path)	2097	$self->load_header_from ($self->load_path)
1998	}	2098	}
1999		2099
		2100	# used to laod the header of an instantiated map
2000	sub load_header_temp {	2101	sub load_header_temp {
2001	my ($self) = @_;	2102	my ($self) = @_;
2002		2103
2003	$self->load_header_from ($self->save_path)	2104	$self->load_header_from ($self->save_path)
2004	}	2105	}
2005		2106
		2107	# called after loading the header from an instantiated map
2006	sub prepare_temp {	2108	sub prepare_temp {
2007	my ($self) = @_;	2109	my ($self) = @_;
2008		2110
2009	$self->last_access ((delete $self->{last_access})	2111	$self->last_access ((delete $self->{last_access})
2010	|| $cf::RUNTIME); #d#	2112	|| $cf::RUNTIME); #d#
2011	# safety	2113	# safety
2012	$self->{instantiate_time} = $cf::RUNTIME	2114	$self->{instantiate_time} = $cf::RUNTIME
2013	if $self->{instantiate_time} > $cf::RUNTIME;	2115	if $self->{instantiate_time} > $cf::RUNTIME;
2014	}	2116	}
2015		2117
		2118	# called after loading the header from an original map
2016	sub prepare_orig {	2119	sub prepare_orig {
2017	my ($self) = @_;	2120	my ($self) = @_;
2018		2121
2019	$self->{load_original} = 1;	2122	$self->{load_original} = 1;
2020	$self->{instantiate_time} = $cf::RUNTIME;	2123	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2044		2147
2045	sub find;	2148	sub find;
2046	sub find {	2149	sub find {
2047	my ($path, $origin) = @_;	2150	my ($path, $origin) = @_;
2048		2151
		2152	cf::cede_to_tick;
		2153
2049	$path = normalise $path, $origin && $origin->path;	2154	$path = normalise $path, $origin;
2050		2155
2051	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2156	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2052	my $guard2 = cf::lock_acquire "map_find:$path";	2157	my $guard2 = cf::lock_acquire "map_find:$path";
2053		2158
2054	$cf::MAP{$path} || do {	2159	$cf::MAP{$path} || do {
…		…
2085		2190
2086	{	2191	{
2087	my $guard = cf::lock_acquire "map_data:$path";	2192	my $guard = cf::lock_acquire "map_data:$path";
2088		2193
2089	return unless $self->valid;	2194	return unless $self->valid;
2090	return unless $self->in_memory == cf::MAP_SWAPPED;	2195	return unless $self->state == cf::MAP_SWAPPED;
2091
2092	$self->in_memory (cf::MAP_LOADING);
2093		2196
2094	$self->alloc;	2197	$self->alloc;
2095		2198
2096	$self->pre_load;	2199	$self->pre_load;
2097	cf::cede_to_tick;	2200	cf::cede_to_tick;
2098		2201
		2202	if (exists $self->{load_path}) {
2099	my $f = new_from_file cf::object::thawer $self->{load_path};	2203	my $f = new_from_file cf::object::thawer $self->{load_path};
2100	$f->skip_block;	2204	$f->skip_block;
2101	$self->_load_objects ($f)	2205	$self->_load_objects ($f)
2102	or return;	2206	or return;
2103		2207
2104	$self->post_load_original	2208	$self->post_load_original
2105	if delete $self->{load_original};	2209	if delete $self->{load_original};
2106		2210
2107	if (my $uniq = $self->uniq_path) {	2211	if (my $uniq = $self->uniq_path) {
2108	utf8::encode $uniq;	2212	utf8::encode $uniq;
2109	unless (aio_stat $uniq) {	2213	unless (aio_stat $uniq) {
2110	if (my $f = new_from_file cf::object::thawer $uniq) {	2214	if (my $f = new_from_file cf::object::thawer $uniq) {
2111	$self->clear_unique_items;	2215	$self->clear_unique_items;
2112	$self->_load_objects ($f);	2216	$self->_load_objects ($f);
2113	$f->resolve_delayed_derefs;	2217	$f->resolve_delayed_derefs;
		2218	}
2114	}	2219	}
2115	}	2220	}
2116	}
2117		2221
2118	$f->resolve_delayed_derefs;	2222	$f->resolve_delayed_derefs;
		2223	} else {
		2224	$self->post_load_original
		2225	if delete $self->{load_original};
		2226	}
		2227
		2228	$self->state (cf::MAP_INACTIVE);
2119		2229
2120	cf::cede_to_tick;	2230	cf::cede_to_tick;
2121	# now do the right thing for maps	2231	# now do the right thing for maps
2122	$self->link_multipart_objects;	2232	$self->link_multipart_objects;
2123	$self->difficulty ($self->estimate_difficulty)	2233	$self->difficulty ($self->estimate_difficulty)
…		…
2127	unless ($self->{deny_activate}) {	2237	unless ($self->{deny_activate}) {
2128	$self->decay_objects;	2238	$self->decay_objects;
2129	$self->fix_auto_apply;	2239	$self->fix_auto_apply;
2130	$self->update_buttons;	2240	$self->update_buttons;
2131	cf::cede_to_tick;	2241	cf::cede_to_tick;
2132	$self->activate;	2242	#$self->activate; # no longer activate maps automatically
2133	}	2243	}
2134		2244
2135	$self->{last_save} = $cf::RUNTIME;	2245	$self->{last_save} = $cf::RUNTIME;
2136	$self->last_access ($cf::RUNTIME);	2246	$self->last_access ($cf::RUNTIME);
2137
2138	$self->in_memory (cf::MAP_ACTIVE);
2139	}	2247	}
2140		2248
2141	$self->post_load;	2249	$self->post_load;
		2250
		2251	1
2142	}	2252	}
2143		2253
2144	# customize the map for a given player, i.e.	2254	# customize the map for a given player, i.e.
2145	# return the _real_ map. used by e.g. per-player	2255	# return the _real_ map. used by e.g. per-player
2146	# maps to change the path to ~playername/mappath	2256	# maps to change the path to ~playername/mappath
…		…
2154	# if $self->per_party;	2264	# if $self->per_party;
2155		2265
2156	$self	2266	$self
2157	}	2267	}
2158		2268
2159	# find and load all maps in the 3x3 area around a map
2160	sub load_neighbours {
2161	my ($map) = @_;
2162
2163	my @neigh; # diagonal neighbours
2164
2165	for (0 .. 3) {
2166	my $neigh = $map->tile_path ($_)
2167	or next;
2168	$neigh = find $neigh, $map
2169	or next;
2170	$neigh->load;
2171
2172	# now find the diagonal neighbours
2173	push @neigh,
2174	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2175	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2176	}
2177
2178	for (grep defined $_->[0], @neigh) {
2179	my ($path, $origin) = @$_;
2180	my $neigh = find $path, $origin
2181	or next;
2182	$neigh->load;
2183	}
2184	}
2185
2186	sub find_sync {	2269	sub find_sync {
2187	my ($path, $origin) = @_;	2270	my ($path, $origin) = @_;
2188		2271
2189	cf::sync_job { find $path, $origin }	2272	# it's a bug to call this from the main context
		2273	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2274	if $Coro::current == $Coro::main;
		2275
		2276	find $path, $origin
2190	}	2277	}
2191		2278
2192	sub do_load_sync {	2279	sub do_load_sync {
2193	my ($map) = @_;	2280	my ($map) = @_;
2194		2281
		2282	# it's a bug to call this from the main context
2195	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2283	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2196	if $Coro::current == $Coro::main;	2284	if $Coro::current == $Coro::main;
2197		2285
2198	cf::sync_job { $map->load };	2286	$map->load;
2199	}	2287	}
2200		2288
2201	our %MAP_PREFETCH;	2289	our %MAP_PREFETCH;
2202	our $MAP_PREFETCHER = undef;	2290	our $MAP_PREFETCHER = undef;
2203		2291
2204	sub find_async {	2292	sub find_async {
2205	my ($path, $origin, $load) = @_;	2293	my ($path, $origin, $load) = @_;
2206		2294
2207	$path = normalise $path, $origin && $origin->{path};	2295	$path = normalise $path, $origin;
2208		2296
2209	if (my $map = $cf::MAP{$path}) {	2297	if (my $map = $cf::MAP{$path}) {
2210	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2298	return $map if !$load || $map->linkable;
2211	}	2299	}
2212		2300
2213	$MAP_PREFETCH{$path} |= $load;	2301	$MAP_PREFETCH{$path} |= $load;
2214		2302
2215	$MAP_PREFETCHER ||= cf::async {	2303	$MAP_PREFETCHER ||= cf::async {
…		…
2274	sub swap_out {	2362	sub swap_out {
2275	my ($self) = @_;	2363	my ($self) = @_;
2276		2364
2277	my $lock = cf::lock_acquire "map_data:$self->{path}";	2365	my $lock = cf::lock_acquire "map_data:$self->{path}";
2278		2366
2279	return if $self->in_memory != cf::MAP_ACTIVE;	2367	return if !$self->linkable;
2280	return if $self->{deny_save};	2368	return if $self->{deny_save};
2281	return if $self->players;	2369	return if $self->players;
2282		2370
2283	# first deactivate the map and "unlink" it from the core	2371	# first deactivate the map and "unlink" it from the core
2284	$self->deactivate;	2372	$self->deactivate;
2285	$_->clear_links_to ($self) for values %cf::MAP;	2373	$_->clear_links_to ($self) for values %cf::MAP;
2286	$self->in_memory (cf::MAP_SWAPPED);	2374	$self->state (cf::MAP_SWAPPED);
2287		2375
2288	# then atomically save	2376	# then atomically save
2289	$self->_save;	2377	$self->_save;
2290		2378
2291	# then free the map	2379	# then free the map
…		…
2315		2403
2316	my $lock = cf::lock_acquire "map_data:$self->{path}";	2404	my $lock = cf::lock_acquire "map_data:$self->{path}";
2317		2405
2318	return if $self->players;	2406	return if $self->players;
2319		2407
2320	warn "resetting map ", $self->path, "\n";	2408	cf::trace "resetting map ", $self->path, "\n";
2321		2409
2322	$self->in_memory (cf::MAP_SWAPPED);	2410	$self->state (cf::MAP_SWAPPED);
2323		2411
2324	# need to save uniques path	2412	# need to save uniques path
2325	unless ($self->{deny_save}) {	2413	unless ($self->{deny_save}) {
2326	my $uniq = $self->uniq_path; utf8::encode $uniq;	2414	my $uniq = $self->uniq_path; utf8::encode $uniq;
2327		2415
…		…
2657	# use -1 or undef as default coordinates, not 0, 0	2745	# use -1 or undef as default coordinates, not 0, 0
2658	($x, $y) = ($map->enter_x, $map->enter_y)	2746	($x, $y) = ($map->enter_x, $map->enter_y)
2659	if $x <= 0 && $y <= 0;	2747	if $x <= 0 && $y <= 0;
2660		2748
2661	$map->load;	2749	$map->load;
2662	$map->load_neighbours;
2663		2750
2664	return unless $self->contr->active;	2751	return unless $self->contr->active;
2665		2752
2666	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2753	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2667	if ($self->enter_map ($map, $x, $y)) {	2754	if ($self->enter_map ($map, $x, $y)) {
…		…
2690		2777
2691	sub cf::object::player::goto {	2778	sub cf::object::player::goto {
2692	my ($self, $path, $x, $y, $check, $done) = @_;	2779	my ($self, $path, $x, $y, $check, $done) = @_;
2693		2780
2694	if ($self->{_link_recursion} >= $MAX_LINKS) {	2781	if ($self->{_link_recursion} >= $MAX_LINKS) {
2695	warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";	2782	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2696	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");	2783	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2697	($path, $x, $y) = @$EMERGENCY_POSITION;	2784	($path, $x, $y) = @$EMERGENCY_POSITION;
2698	}	2785	}
2699		2786
2700	# do generation counting so two concurrent goto's will be executed in-order	2787	# do generation counting so two concurrent goto's will be executed in-order
…		…
2723	($path, $x, $y) = (undef, undef, undef);	2810	($path, $x, $y) = (undef, undef, undef);
2724	}	2811	}
2725	}	2812	}
2726		2813
2727	my $map = eval {	2814	my $map = eval {
2728	my $map = defined $path ? cf::map::find $path : undef;	2815	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2729		2816
2730	if ($map) {	2817	if ($map) {
2731	$map = $map->customise_for ($self);	2818	$map = $map->customise_for ($self);
2732	$map = $check->($map, $x, $y, $self) if $check && $map;	2819	$map = $check->($map, $x, $y, $self) if $check && $map;
2733	} else {	2820	} else {
…		…
2823	$Coro::current->{desc} = "enter_exit";	2910	$Coro::current->{desc} = "enter_exit";
2824		2911
2825	unless (eval {	2912	unless (eval {
2826	$self->deactivate_recursive; # just to be sure	2913	$self->deactivate_recursive; # just to be sure
2827		2914
2828	# random map handling
2829	{
2830	my $guard = cf::lock_acquire "exit_prepare:$exit";
2831
2832	prepare_random_map $exit
2833	if $exit->slaying eq "/!";
2834	}
2835
2836	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2915	my $map = cf::map::normalise $exit->slaying, $exit->map;
2837	my $x = $exit->stats->hp;	2916	my $x = $exit->stats->hp;
2838	my $y = $exit->stats->sp;	2917	my $y = $exit->stats->sp;
		2918
		2919	# special map handling
		2920	my $slaying = $exit->slaying;
		2921
		2922	# special map handling
		2923	if ($slaying eq "/!") {
		2924	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2925
		2926	prepare_random_map $exit
		2927	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		2928
		2929	$map = $exit->slaying;
		2930
		2931	} elsif ($slaying eq '!up') {
		2932	$map = $exit->map->tile_path (cf::TILE_UP);
		2933	$x = $exit->x;
		2934	$y = $exit->y;
		2935
		2936	} elsif ($slaying eq '!down') {
		2937	$map = $exit->map->tile_path (cf::TILE_DOWN);
		2938	$x = $exit->x;
		2939	$y = $exit->y;
		2940	}
2839		2941
2840	$self->goto ($map, $x, $y);	2942	$self->goto ($map, $x, $y);
2841		2943
2842	# if exit is damned, update players death & WoR home-position	2944	# if exit is damned, update players death & WoR home-position
2843	$self->contr->savebed ($map, $x, $y)	2945	$self->contr->savebed ($map, $x, $y)
…		…
2848	$self->message ("Something went wrong deep within the deliantra server. "	2950	$self->message ("Something went wrong deep within the deliantra server. "
2849	. "I'll try to bring you back to the map you were before. "	2951	. "I'll try to bring you back to the map you were before. "
2850	. "Please report this to the dungeon master!",	2952	. "Please report this to the dungeon master!",
2851	cf::NDI_UNIQUE | cf::NDI_RED);	2953	cf::NDI_UNIQUE | cf::NDI_RED);
2852		2954
2853	warn "ERROR in enter_exit: $@";	2955	error "ERROR in enter_exit: $@";
2854	$self->leave_link;	2956	$self->leave_link;
2855	}	2957	}
2856	})->prio (1);	2958	})->prio (1);
2857	}	2959	}
2858		2960
…		…
3085	=cut	3187	=cut
3086		3188
3087	sub cf::client::ext_reply($$@) {	3189	sub cf::client::ext_reply($$@) {
3088	my ($self, $id, @msg) = @_;	3190	my ($self, $id, @msg) = @_;
3089		3191
3090	if ($self->extcmd == 2) {	3192	return unless $self->extcmd == 2;
		3193
3091	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3194	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3092	} elsif ($self->extcmd == 1) {
3093	#TODO: version 1, remove
3094	unshift @msg, msgtype => "reply", msgid => $id;
3095	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3096	}
3097	}	3195	}
3098		3196
3099	=item $success = $client->query ($flags, "text", \&cb)	3197	=item $success = $client->query ($flags, "text", \&cb)
3100		3198
3101	Queues a query to the client, calling the given callback with	3199	Queues a query to the client, calling the given callback with
…		…
3156	my ($ns, $buf) = @_;	3254	my ($ns, $buf) = @_;
3157		3255
3158	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3256	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3159		3257
3160	if (ref $msg) {	3258	if (ref $msg) {
3161	my ($type, $reply, @payload) =	3259	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3162	"ARRAY" eq ref $msg
3163	? @$msg
3164	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3165		3260
3166	my @reply;	3261	my @reply;
3167		3262
3168	if (my $cb = $EXTICMD{$type}) {	3263	if (my $cb = $EXTICMD{$type}) {
3169	@reply = $cb->($ns, @payload);	3264	@reply = $cb->($ns, @payload);
…		…
3171		3266
3172	$ns->ext_reply ($reply, @reply)	3267	$ns->ext_reply ($reply, @reply)
3173	if $reply;	3268	if $reply;
3174		3269
3175	} else {	3270	} else {
3176	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3271	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3177	}	3272	}
3178		3273
3179	cf::override;	3274	cf::override;
3180	},	3275	},
3181	);	3276	);
…		…
3262	decrease split destroy change_exp value msg lore send_msg)],	3357	decrease split destroy change_exp value msg lore send_msg)],
3263	["cf::object::player" => qw(player)],	3358	["cf::object::player" => qw(player)],
3264	["cf::player" => qw(peaceful send_msg)],	3359	["cf::player" => qw(peaceful send_msg)],
3265	["cf::map" => qw(trigger)],	3360	["cf::map" => qw(trigger)],
3266	) {	3361	) {
3267	no strict 'refs';
3268	my ($pkg, @funs) = @$_;	3362	my ($pkg, @funs) = @$_;
3269	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3363	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3270	for @funs;	3364	for @funs;
3271	}	3365	}
3272		3366
…		…
3311	local @cf::_safe_eval_args = values %vars;	3405	local @cf::_safe_eval_args = values %vars;
3312	@res = wantarray ? eval eval : scalar eval $eval;	3406	@res = wantarray ? eval eval : scalar eval $eval;
3313	}	3407	}
3314		3408
3315	if ($@) {	3409	if ($@) {
3316	warn "$@";	3410	warn "$@",
3317	warn "while executing safe code '$code'\n";	3411	"while executing safe code '$code'\n",
3318	warn "with arguments " . (join " ", %vars) . "\n";	3412	"with arguments " . (join " ", %vars) . "\n";
3319	}	3413	}
3320		3414
3321	wantarray ? @res : $res[0]	3415	wantarray ? @res : $res[0]
3322	}	3416	}
3323		3417
…		…
3357	# for this (global event?)	3451	# for this (global event?)
3358	%ext::player_env::MUSIC_FACE_CACHE = ();	3452	%ext::player_env::MUSIC_FACE_CACHE = ();
3359		3453
3360	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3454	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3361		3455
3362	warn "loading facedata from $path\n";	3456	trace "loading facedata from $path\n";
3363		3457
3364	my $facedata;	3458	my $facedata = decode_storable load_file $path;
3365	0 < aio_load $path, $facedata
3366	or die "$path: $!";
3367
3368	$facedata = Coro::Storable::thaw $facedata;
3369		3459
3370	$facedata->{version} == 2	3460	$facedata->{version} == 2
3371	or cf::cleanup "$path: version mismatch, cannot proceed.";	3461	or cf::cleanup "$path: version mismatch, cannot proceed.";
3372		3462
3373	# patch in the exptable	3463	# patch in the exptable
…		…
3387		3477
3388	cf::face::set_visibility $idx, $info->{visibility};	3478	cf::face::set_visibility $idx, $info->{visibility};
3389	cf::face::set_magicmap $idx, $info->{magicmap};	3479	cf::face::set_magicmap $idx, $info->{magicmap};
3390	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3480	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3391	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3481	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3482	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3392		3483
3393	cf::cede_to_tick;	3484	cf::cede_to_tick;
3394	}	3485	}
3395		3486
3396	while (my ($face, $info) = each %$faces) {	3487	while (my ($face, $info) = each %$faces) {
…		…
3401		3492
3402	if (my $smooth = cf::face::find $info->{smooth}) {	3493	if (my $smooth = cf::face::find $info->{smooth}) {
3403	cf::face::set_smooth $idx, $smooth;	3494	cf::face::set_smooth $idx, $smooth;
3404	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3495	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3405	} else {	3496	} else {
3406	warn "smooth face '$info->{smooth}' not found for face '$face'";	3497	error "smooth face '$info->{smooth}' not found for face '$face'";
3407	}	3498	}
3408		3499
3409	cf::cede_to_tick;	3500	cf::cede_to_tick;
3410	}	3501	}
3411	}	3502	}
…		…
3423		3514
3424	{	3515	{
3425	my $res = $facedata->{resource};	3516	my $res = $facedata->{resource};
3426		3517
3427	while (my ($name, $info) = each %$res) {	3518	while (my ($name, $info) = each %$res) {
3428	if (defined $info->{type}) {	3519	if (defined (my $type = delete $info->{type})) {
		3520	# TODO: different hash - must free and use new index, or cache ixface data queue
3429	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3521	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3430		3522
3431	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3523	cf::face::set_data $idx, 0, delete $info->{data}, delete $info->{hash};
3432	cf::face::set_type $idx, $info->{type};	3524	cf::face::set_type $idx, $type;
		3525	cf::face::set_meta $idx, (keys %$info && (~$type & 1)) ? $info : undef; # any keys left are stashed into meta unless prepended
3433	} else {	3526	} else {
3434	$RESOURCE{$name} = $info;	3527	# $RESOURCE{$name} = $info; # unused
3435	}	3528	}
3436		3529
3437	cf::cede_to_tick;	3530	cf::cede_to_tick;
3438	}	3531	}
3439	}	3532	}
3440		3533
3441	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3534	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3442		3535
3443	1	3536	1
3444	}	3537	}
3445
3446	cf::global->attach (on_resource_update => sub {
3447	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3448	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3449
3450	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3451	my $sound = $soundconf->{compat}[$_]
3452	or next;
3453
3454	my $face = cf::face::find "sound/$sound->[1]";
3455	cf::sound::set $sound->[0] => $face;
3456	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3457	}
3458
3459	while (my ($k, $v) = each %{$soundconf->{event}}) {
3460	my $face = cf::face::find "sound/$v";
3461	cf::sound::set $k => $face;
3462	}
3463	}
3464	});
3465		3538
3466	register_exticmd fx_want => sub {	3539	register_exticmd fx_want => sub {
3467	my ($ns, $want) = @_;	3540	my ($ns, $want) = @_;
3468		3541
3469	while (my ($k, $v) = each %$want) {	3542	while (my ($k, $v) = each %$want) {
…		…
3508	sub reload_treasures {	3581	sub reload_treasures {
3509	load_resource_file "$DATADIR/treasures"	3582	load_resource_file "$DATADIR/treasures"
3510	or die "unable to load treasurelists\n";	3583	or die "unable to load treasurelists\n";
3511	}	3584	}
3512		3585
		3586	sub reload_sound {
		3587	trace "loading sound config from $DATADIR/sound\n";
		3588
		3589	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3590
		3591	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3592	my $sound = $soundconf->{compat}[$_]
		3593	or next;
		3594
		3595	my $face = cf::face::find "sound/$sound->[1]";
		3596	cf::sound::set $sound->[0] => $face;
		3597	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3598	}
		3599
		3600	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3601	my $face = cf::face::find "sound/$v";
		3602	cf::sound::set $k => $face;
		3603	}
		3604	}
		3605
3513	sub reload_resources {	3606	sub reload_resources {
3514	warn "reloading resource files...\n";	3607	trace "reloading resource files...\n";
3515		3608
		3609	reload_exp_table;
		3610	reload_materials;
3516	reload_facedata;	3611	reload_facedata;
		3612	reload_sound;
3517	reload_archetypes;	3613	reload_archetypes;
3518	reload_regions;	3614	reload_regions;
3519	reload_treasures;	3615	reload_treasures;
3520		3616
3521	warn "finished reloading resource files\n";	3617	trace "finished reloading resource files\n";
3522	}	3618	}
3523		3619
3524	sub reload_config {	3620	sub reload_config {
3525	warn "reloading config file...\n";	3621	trace "reloading config file...\n";
3526		3622
3527	open my $fh, "<:utf8", "$CONFDIR/config"	3623	my $config = load_file "$CONFDIR/config";
3528	or return;	3624	utf8::decode $config;
3529		3625	*CFG = decode_yaml $config;
3530	local $/;
3531	*CFG = YAML::XS::Load scalar <$fh>;
3532		3626
3533	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3627	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3534		3628
3535	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3629	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3536	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3630	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3540	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3634	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3541	and die "WARNING: m(un)lockall failed: $!\n";	3635	and die "WARNING: m(un)lockall failed: $!\n";
3542	};	3636	};
3543	warn $@ if $@;	3637	warn $@ if $@;
3544	}	3638	}
3545
3546	warn "finished reloading resource files\n";
3547	}	3639	}
3548		3640
3549	sub pidfile() {	3641	sub pidfile() {
3550	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3642	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3551	or die "$PIDFILE: $!";	3643	or die "$PIDFILE: $!";
…		…
3564	seek $fh, 0, 0;	3656	seek $fh, 0, 0;
3565	print $fh $$;	3657	print $fh $$;
3566	}	3658	}
3567		3659
3568	sub main_loop {	3660	sub main_loop {
3569	warn "EV::loop starting\n";	3661	trace "EV::loop starting\n";
3570	if (1) {	3662	if (1) {
3571	EV::loop;	3663	EV::loop;
3572	}	3664	}
3573	warn "EV::loop returned\n";	3665	trace "EV::loop returned\n";
3574	goto &main_loop unless $REALLY_UNLOOP;	3666	goto &main_loop unless $REALLY_UNLOOP;
3575	}	3667	}
3576		3668
3577	sub main {	3669	sub main {
3578	cf::init_globals; # initialise logging	3670	cf::init_globals; # initialise logging
3579		3671
3580	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3672	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3581	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3673	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3582	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3674	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3583	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3675	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3584		3676
3585	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3677	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3586		3678
…		…
3594	};	3686	};
3595		3687
3596	evthread_start IO::AIO::poll_fileno;	3688	evthread_start IO::AIO::poll_fileno;
3597		3689
3598	cf::sync_job {	3690	cf::sync_job {
3599	cf::init_experience;	3691	cf::incloader::init ();
		3692
3600	cf::init_anim;	3693	cf::init_anim;
3601	cf::init_attackmess;	3694	cf::init_attackmess;
3602	cf::init_dynamic;	3695	cf::init_dynamic;
3603		3696
3604	cf::load_settings;	3697	cf::load_settings;
3605	cf::load_materials;
3606		3698
3607	reload_resources;	3699	reload_resources;
3608	reload_config;	3700	reload_config;
3609	db_init;	3701	db_init;
3610		3702
…		…
3622		3714
3623	# no (long-running) fork's whatsoever before this point(!)	3715	# no (long-running) fork's whatsoever before this point(!)
3624	use POSIX ();	3716	use POSIX ();
3625	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3717	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3626		3718
3627	(pop @POST_INIT)->(0) while @POST_INIT;	3719	cf::_post_init 0;
3628	};	3720	};
3629		3721
3630	cf::object::thawer::errors_are_fatal 0;	3722	cf::object::thawer::errors_are_fatal 0;
3631	warn "parse errors in files are no longer fatal from this point on.\n";	3723	info "parse errors in files are no longer fatal from this point on.\n";
3632		3724
		3725	AE::postpone {
		3726	undef &main; # free gobs of memory :)
		3727	};
		3728
3633	main_loop;	3729	goto &main_loop;
3634	}	3730	}
3635		3731
3636	#############################################################################	3732	#############################################################################
3637	# initialisation and cleanup	3733	# initialisation and cleanup
3638		3734
…		…
3677	or return;	3773	or return;
3678		3774
3679	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3775	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3680	and return;	3776	and return;
3681		3777
3682	warn sprintf "runtime file written (%gs).\n", AE::time - $t0;	3778	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3683		3779
3684	1	3780	1
3685	}	3781	}
3686		3782
3687	our $uuid_lock;	3783	our $uuid_lock;
…		…
3699	or return;	3795	or return;
3700		3796
3701	my $value = uuid_seq uuid_cur;	3797	my $value = uuid_seq uuid_cur;
3702		3798
3703	unless ($value) {	3799	unless ($value) {
3704	warn "cowardly refusing to write zero uuid value!\n";	3800	info "cowardly refusing to write zero uuid value!\n";
3705	return;	3801	return;
3706	}	3802	}
3707		3803
3708	my $value = uuid_str $value + $uuid_skip;	3804	my $value = uuid_str $value + $uuid_skip;
3709	$uuid_skip = 0;	3805	$uuid_skip = 0;
…		…
3719	or return;	3815	or return;
3720		3816
3721	aio_rename "$uuid~", $uuid	3817	aio_rename "$uuid~", $uuid
3722	and return;	3818	and return;
3723		3819
3724	warn "uuid file written ($value).\n";	3820	trace "uuid file written ($value).\n";
3725		3821
3726	1	3822	1
3727		3823
3728	}	3824	}
3729		3825
…		…
3735	}	3831	}
3736		3832
3737	sub emergency_save() {	3833	sub emergency_save() {
3738	my $freeze_guard = cf::freeze_mainloop;	3834	my $freeze_guard = cf::freeze_mainloop;
3739		3835
3740	warn "emergency_perl_save: enter\n";	3836	info "emergency_perl_save: enter\n";
		3837
		3838	# this is a trade-off: we want to be very quick here, so
		3839	# save all maps without fsync, and later call a global sync
		3840	# (which in turn might be very very slow)
		3841	local $USE_FSYNC = 0;
3741		3842
3742	cf::sync_job {	3843	cf::sync_job {
3743	# this is a trade-off: we want to be very quick here, so	3844	cf::write_runtime_sync; # external watchdog should not bark
3744	# save all maps without fsync, and later call a global sync
3745	# (which in turn might be very very slow)
3746	local $USE_FSYNC = 0;
3747		3845
3748	# use a peculiar iteration method to avoid tripping on perl	3846	# use a peculiar iteration method to avoid tripping on perl
3749	# refcount bugs in for. also avoids problems with players	3847	# refcount bugs in for. also avoids problems with players
3750	# and maps saved/destroyed asynchronously.	3848	# and maps saved/destroyed asynchronously.
3751	warn "emergency_perl_save: begin player save\n";	3849	info "emergency_perl_save: begin player save\n";
3752	for my $login (keys %cf::PLAYER) {	3850	for my $login (keys %cf::PLAYER) {
3753	my $pl = $cf::PLAYER{$login} or next;	3851	my $pl = $cf::PLAYER{$login} or next;
3754	$pl->valid or next;	3852	$pl->valid or next;
3755	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3853	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3756	$pl->save;	3854	$pl->save;
3757	}	3855	}
3758	warn "emergency_perl_save: end player save\n";	3856	info "emergency_perl_save: end player save\n";
3759		3857
		3858	cf::write_runtime_sync; # external watchdog should not bark
		3859
3760	warn "emergency_perl_save: begin map save\n";	3860	info "emergency_perl_save: begin map save\n";
3761	for my $path (keys %cf::MAP) {	3861	for my $path (keys %cf::MAP) {
3762	my $map = $cf::MAP{$path} or next;	3862	my $map = $cf::MAP{$path} or next;
3763	$map->valid or next;	3863	$map->valid or next;
3764	$map->save;	3864	$map->save;
3765	}	3865	}
3766	warn "emergency_perl_save: end map save\n";	3866	info "emergency_perl_save: end map save\n";
3767		3867
		3868	cf::write_runtime_sync; # external watchdog should not bark
		3869
3768	warn "emergency_perl_save: begin database checkpoint\n";	3870	info "emergency_perl_save: begin database checkpoint\n";
3769	BDB::db_env_txn_checkpoint $DB_ENV;	3871	BDB::db_env_txn_checkpoint $DB_ENV;
3770	warn "emergency_perl_save: end database checkpoint\n";	3872	info "emergency_perl_save: end database checkpoint\n";
3771		3873
3772	warn "emergency_perl_save: begin write uuid\n";	3874	info "emergency_perl_save: begin write uuid\n";
3773	write_uuid_sync 1;	3875	write_uuid_sync 1;
3774	warn "emergency_perl_save: end write uuid\n";	3876	info "emergency_perl_save: end write uuid\n";
		3877
		3878	cf::write_runtime_sync; # external watchdog should not bark
		3879
		3880	trace "emergency_perl_save: syncing database to disk";
		3881	BDB::db_env_txn_checkpoint $DB_ENV;
		3882
		3883	info "emergency_perl_save: starting sync\n";
		3884	IO::AIO::aio_sync sub {
		3885	info "emergency_perl_save: finished sync\n";
		3886	};
		3887
		3888	cf::write_runtime_sync; # external watchdog should not bark
		3889
		3890	trace "emergency_perl_save: flushing outstanding aio requests";
		3891	while (IO::AIO::nreqs || BDB::nreqs) {
		3892	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		3893	}
		3894
		3895	cf::write_runtime_sync; # external watchdog should not bark
3775	};	3896	};
3776		3897
3777	warn "emergency_perl_save: starting sync()\n";
3778	IO::AIO::aio_sync sub {
3779	warn "emergency_perl_save: finished sync()\n";
3780	};
3781
3782	warn "emergency_perl_save: leave\n";	3898	info "emergency_perl_save: leave\n";
3783	}	3899	}
3784		3900
3785	sub post_cleanup {	3901	sub post_cleanup {
3786	my ($make_core) = @_;	3902	my ($make_core) = @_;
3787		3903
		3904	IO::AIO::flush;
		3905
3788	warn Carp::longmess "post_cleanup backtrace"	3906	error Carp::longmess "post_cleanup backtrace"
3789	if $make_core;	3907	if $make_core;
3790		3908
3791	my $fh = pidfile;	3909	my $fh = pidfile;
3792	unlink $PIDFILE if <$fh> == $$;	3910	unlink $PIDFILE if <$fh> == $$;
3793	}	3911	}
…		…
3817	}	3935	}
3818	}	3936	}
3819		3937
3820	sub do_reload_perl() {	3938	sub do_reload_perl() {
3821	# can/must only be called in main	3939	# can/must only be called in main
3822	if (in_main) {	3940	unless (in_main) {
3823	warn "can only reload from main coroutine";	3941	error "can only reload from main coroutine";
3824	return;	3942	return;
3825	}	3943	}
3826		3944
3827	return if $RELOAD++;	3945	return if $RELOAD++;
3828		3946
3829	my $t1 = AE::time;	3947	my $t1 = AE::time;
3830		3948
3831	while ($RELOAD) {	3949	while ($RELOAD) {
3832	warn "reloading...";	3950	cf::get_slot 0.1, -1, "reload_perl";
		3951	info "perl_reload: reloading...";
3833		3952
3834	warn "entering sync_job";	3953	trace "perl_reload: entering sync_job";
3835		3954
3836	cf::sync_job {	3955	cf::sync_job {
3837	cf::write_runtime_sync; # external watchdog should not bark
3838	cf::emergency_save;	3956	#cf::emergency_save;
3839	cf::write_runtime_sync; # external watchdog should not bark
3840		3957
3841	warn "syncing database to disk";
3842	BDB::db_env_txn_checkpoint $DB_ENV;
3843
3844	# if anything goes wrong in here, we should simply crash as we already saved
3845
3846	warn "flushing outstanding aio requests";
3847	while (IO::AIO::nreqs || BDB::nreqs) {
3848	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3849	}
3850
3851	warn "cancelling all extension coros";	3958	trace "perl_reload: cancelling all extension coros";
3852	$_->cancel for values %EXT_CORO;	3959	$_->cancel for values %EXT_CORO;
3853	%EXT_CORO = ();	3960	%EXT_CORO = ();
3854		3961
3855	warn "removing commands";	3962	trace "perl_reload: removing commands";
3856	%COMMAND = ();	3963	%COMMAND = ();
3857		3964
3858	warn "removing ext/exti commands";	3965	trace "perl_reload: removing ext/exti commands";
3859	%EXTCMD = ();	3966	%EXTCMD = ();
3860	%EXTICMD = ();	3967	%EXTICMD = ();
3861		3968
3862	warn "unloading/nuking all extensions";	3969	trace "perl_reload: unloading/nuking all extensions";
3863	for my $pkg (@EXTS) {	3970	for my $pkg (@EXTS) {
3864	warn "... unloading $pkg";	3971	trace "... unloading $pkg";
3865		3972
3866	if (my $cb = $pkg->can ("unload")) {	3973	if (my $cb = $pkg->can ("unload")) {
3867	eval {	3974	eval {
3868	$cb->($pkg);	3975	$cb->($pkg);
3869	1	3976	1
3870	} or warn "$pkg unloaded, but with errors: $@";	3977	} or error "$pkg unloaded, but with errors: $@";
3871	}	3978	}
3872		3979
3873	warn "... clearing $pkg";	3980	trace "... clearing $pkg";
3874	clear_package $pkg;	3981	clear_package $pkg;
3875	}	3982	}
3876		3983
3877	warn "unloading all perl modules loaded from $LIBDIR";	3984	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3878	while (my ($k, $v) = each %INC) {	3985	while (my ($k, $v) = each %INC) {
3879	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3986	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3880		3987
3881	warn "... unloading $k";	3988	trace "... unloading $k";
3882	delete $INC{$k};	3989	delete $INC{$k};
3883		3990
3884	$k =~ s/\.pm$//;	3991	$k =~ s/\.pm$//;
3885	$k =~ s/\//::/g;	3992	$k =~ s/\//::/g;
3886		3993
…		…
3889	}	3996	}
3890		3997
3891	clear_package $k;	3998	clear_package $k;
3892	}	3999	}
3893		4000
3894	warn "getting rid of safe::, as good as possible";	4001	trace "perl_reload: getting rid of safe::, as good as possible";
3895	clear_package "safe::$_"	4002	clear_package "safe::$_"
3896	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4003	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3897		4004
3898	warn "unloading cf.pm \"a bit\"";	4005	trace "perl_reload: unloading cf.pm \"a bit\"";
3899	delete $INC{"cf.pm"};	4006	delete $INC{"cf.pm"};
3900	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4007	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3901		4008
3902	# don't, removes xs symbols, too,	4009	# don't, removes xs symbols, too,
3903	# and global variables created in xs	4010	# and global variables created in xs
3904	#clear_package __PACKAGE__;	4011	#clear_package __PACKAGE__;
3905		4012
3906	warn "unload completed, starting to reload now";	4013	info "perl_reload: unload completed, starting to reload now";
3907		4014
3908	warn "reloading cf.pm";	4015	trace "perl_reload: reloading cf.pm";
3909	require cf;	4016	require cf;
3910	cf::_connect_to_perl_1;	4017	cf::_connect_to_perl_1;
3911		4018
3912	warn "loading config and database again";	4019	trace "perl_reload: loading config and database again";
3913	cf::reload_config;	4020	cf::reload_config;
3914		4021
3915	warn "loading extensions";	4022	trace "perl_reload: loading extensions";
3916	cf::load_extensions;	4023	cf::load_extensions;
3917		4024
3918	if ($REATTACH_ON_RELOAD) {	4025	if ($REATTACH_ON_RELOAD) {
3919	warn "reattaching attachments to objects/players";	4026	trace "perl_reload: reattaching attachments to objects/players";
3920	_global_reattach; # objects, sockets	4027	_global_reattach; # objects, sockets
3921	warn "reattaching attachments to maps";	4028	trace "perl_reload: reattaching attachments to maps";
3922	reattach $_ for values %MAP;	4029	reattach $_ for values %MAP;
3923	warn "reattaching attachments to players";	4030	trace "perl_reload: reattaching attachments to players";
3924	reattach $_ for values %PLAYER;	4031	reattach $_ for values %PLAYER;
3925	}	4032	}
3926		4033
3927	warn "running post_init jobs";	4034	cf::_post_init 1;
3928	(pop @POST_INIT)->(1) while @POST_INIT;
3929		4035
3930	warn "leaving sync_job";	4036	trace "perl_reload: leaving sync_job";
3931		4037
3932	1	4038	1
3933	} or do {	4039	} or do {
3934	warn $@;	4040	error $@;
3935	cf::cleanup "error while reloading, exiting.";	4041	cf::cleanup "perl_reload: error, exiting.";
3936	};	4042	};
3937		4043
3938	warn "reloaded";
3939	--$RELOAD;	4044	--$RELOAD;
3940	}	4045	}
3941		4046
3942	$t1 = AE::time - $t1;	4047	$t1 = AE::time - $t1;
3943	warn "reload completed in ${t1}s\n";	4048	info "perl_reload: completed in ${t1}s\n";
3944	};	4049	};
3945		4050
3946	our $RELOAD_WATCHER; # used only during reload	4051	our $RELOAD_WATCHER; # used only during reload
3947		4052
3948	sub reload_perl() {	4053	sub reload_perl() {
…		…
3969	reload_perl;	4074	reload_perl;
3970	};	4075	};
3971	}	4076	}
3972	};	4077	};
3973		4078
3974	unshift @INC, $LIBDIR;	4079	#############################################################################
3975		4080
3976	my $bug_warning = 0;	4081	my $bug_warning = 0;
3977		4082
3978	our @WAIT_FOR_TICK;
3979	our @WAIT_FOR_TICK_BEGIN;
3980
3981	sub wait_for_tick {	4083	sub wait_for_tick() {
3982	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4084	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3983		4085
3984	my $signal = new Coro::Signal;	4086	$WAIT_FOR_TICK->wait;
3985	push @WAIT_FOR_TICK, $signal;
3986	$signal->wait;
3987	}	4087	}
3988		4088
3989	sub wait_for_tick_begin {	4089	sub wait_for_tick_begin() {
3990	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4090	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3991		4091
3992	my $signal = new Coro::Signal;	4092	my $signal = new Coro::Signal;
3993	push @WAIT_FOR_TICK_BEGIN, $signal;	4093	push @WAIT_FOR_TICK_BEGIN, $signal;
3994	$signal->wait;	4094	$signal->wait;
3995	}	4095	}
…		…
3999	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4099	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4000	unless ++$bug_warning > 10;	4100	unless ++$bug_warning > 10;
4001	return;	4101	return;
4002	}	4102	}
4003		4103
4004	cf::server_tick; # one server iteration	4104	cf::one_tick; # one server iteration
4005		4105
4006	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4106	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4007		4107
4008	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4108	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4009	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4109	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
4010	Coro::async_pool {	4110	Coro::async_pool {
4011	$Coro::current->{desc} = "runtime saver";	4111	$Coro::current->{desc} = "runtime saver";
4012	write_runtime_sync	4112	write_runtime_sync
4013	or warn "ERROR: unable to write runtime file: $!";	4113	or error "ERROR: unable to write runtime file: $!";
4014	};	4114	};
4015	}	4115	}
4016		4116
4017	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4117	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4018	$sig->send;	4118	$sig->send;
4019	}	4119	}
4020	while (my $sig = shift @WAIT_FOR_TICK) {	4120	$WAIT_FOR_TICK->broadcast;
4021	$sig->send;
4022	}
4023		4121
4024	$LOAD = ($NOW - $TICK_START) / $TICK;	4122	$LOAD = ($NOW - $TICK_START) / $TICK;
4025	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4123	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4026		4124
4027	if (0) {	4125	if (0) {
4028	if ($NEXT_TICK) {	4126	if ($NEXT_TICK) {
4029	my $jitter = $TICK_START - $NEXT_TICK;	4127	my $jitter = $TICK_START - $NEXT_TICK;
4030	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4128	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
4031	warn "jitter $JITTER\n";#d#	4129	debug "jitter $JITTER\n";#d#
4032	}	4130	}
4033	}	4131	}
4034	}	4132	}
4035		4133
4036	{	4134	{
4037	# configure BDB	4135	# configure BDB
4038		4136
4039	BDB::min_parallel 16;	4137	BDB::min_parallel 16;
4040	BDB::max_poll_reqs $TICK * 0.1;	4138	BDB::max_poll_reqs $TICK * 0.1;
4041	$AnyEvent::BDB::WATCHER->priority (1);	4139	#$AnyEvent::BDB::WATCHER->priority (1);
4042		4140
4043	unless ($DB_ENV) {	4141	unless ($DB_ENV) {
4044	$DB_ENV = BDB::db_env_create;	4142	$DB_ENV = BDB::db_env_create;
4045	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4143	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4046	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4144	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4081	IO::AIO::min_parallel 8;	4179	IO::AIO::min_parallel 8;
4082	IO::AIO::max_poll_time $TICK * 0.1;	4180	IO::AIO::max_poll_time $TICK * 0.1;
4083	undef $AnyEvent::AIO::WATCHER;	4181	undef $AnyEvent::AIO::WATCHER;
4084	}	4182	}
4085		4183
4086	my $_log_backtrace;	4184	our $_log_backtrace;
		4185	our $_log_backtrace_last;
4087		4186
4088	sub _log_backtrace {	4187	sub _log_backtrace {
4089	my ($msg, @addr) = @_;	4188	my ($msg, @addr) = @_;
4090		4189
4091	$msg =~ s/\n//;	4190	$msg =~ s/\n$//;
4092		4191
		4192	if ($_log_backtrace_last eq $msg) {
		4193	LOG llevInfo, "[ABT] $msg\n";
		4194	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4093	# limit the # of concurrent backtraces	4195	# limit the # of concurrent backtraces
4094	if ($_log_backtrace < 2) {	4196	} elsif ($_log_backtrace < 2) {
		4197	$_log_backtrace_last = $msg;
4095	++$_log_backtrace;	4198	++$_log_backtrace;
4096	my $perl_bt = Carp::longmess $msg;	4199	my $perl_bt = Carp::longmess $msg;
4097	async {	4200	async {
4098	$Coro::current->{desc} = "abt $msg";	4201	$Coro::current->{desc} = "abt $msg";
4099		4202
…		…
4119	LOG llevInfo, "[ABT] $_\n" for @bt;	4222	LOG llevInfo, "[ABT] $_\n" for @bt;
4120	--$_log_backtrace;	4223	--$_log_backtrace;
4121	};	4224	};
4122	} else {	4225	} else {
4123	LOG llevInfo, "[ABT] $msg\n";	4226	LOG llevInfo, "[ABT] $msg\n";
4124	LOG llevInfo, "[ABT] [suppressed]\n";	4227	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4125	}	4228	}
4126	}	4229	}
4127		4230
4128	# load additional modules	4231	# load additional modules
4129	require "cf/$_.pm" for @EXTRA_MODULES;	4232	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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