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.518 by root, Fri Apr 16 02:21:26 2010 UTC vs.
Revision 1.580 by root, Wed Jan 4 03:22:48 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 = 4000;	115	our $OUTPUT_RATE_MIN = 3000;
114	our $OUTPUT_RATE_MAX = 100000;	116	our $OUTPUT_RATE_MAX = 1000000;
		117
		118	our $MAX_LINKS = 32; # how many chained exits to follow
		119	our $VERBOSE_IO = 1;
115		120
116	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	121	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	122	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118	our $NEXT_TICK;	123	our $NEXT_TICK;
119	our $USE_FSYNC = 1; # use fsync to write maps - default on	124	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
121	our $BDB_DEADLOCK_WATCHER;	126	our $BDB_DEADLOCK_WATCHER;
122	our $BDB_CHECKPOINT_WATCHER;	127	our $BDB_CHECKPOINT_WATCHER;
123	our $BDB_TRICKLE_WATCHER;	128	our $BDB_TRICKLE_WATCHER;
124	our $DB_ENV;	129	our $DB_ENV;
125		130
126	our @EXTRA_MODULES = qw(pod match mapscript);	131	our @EXTRA_MODULES = qw(pod match mapscript incloader);
127		132
128	our %CFG;	133	our %CFG;
129		134
130	our $UPTIME; $UPTIME ||= time;	135	our $UPTIME; $UPTIME ||= time;
131	our $RUNTIME;	136	our $RUNTIME = 0;
		137	our $SERVER_TICK = 0;
132	our $NOW;	138	our $NOW;
133		139
134	our (%PLAYER, %PLAYER_LOADING); # all users	140	our (%PLAYER, %PLAYER_LOADING); # all users
135	our (%MAP, %MAP_LOADING ); # all maps	141	our (%MAP, %MAP_LOADING ); # all maps
136	our $LINK_MAP; # the special {link} map, which is always available	142	our $LINK_MAP; # the special {link} map, which is always available
…		…
145		151
146	our @POST_INIT;	152	our @POST_INIT;
147		153
148	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)
149	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;
150		159
151	binmode STDOUT;	160	binmode STDOUT;
152	binmode STDERR;	161	binmode STDERR;
153		162
154	# read virtual server time, if available	163	# read virtual server time, if available
…		…
165		174
166	our $EMERGENCY_POSITION;	175	our $EMERGENCY_POSITION;
167		176
168	sub cf::map::normalise;	177	sub cf::map::normalise;
169		178
		179	sub in_main() {
		180	$Coro::current == $Coro::main
		181	}
		182
170	#############################################################################	183	#############################################################################
171		184
172	%REFLECT = ();	185	%REFLECT = ();
173	for (@REFLECT) {	186	for (@REFLECT) {
174	my $reflect = JSON::XS::decode_json $_;	187	my $reflect = JSON::XS::decode_json $_;
…		…
184		197
185	=over 4	198	=over 4
186		199
187	=item $cf::UPTIME	200	=item $cf::UPTIME
188		201
189	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.
190		218
191	=item $cf::RUNTIME	219	=item $cf::RUNTIME
192		220
193	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
194	every server tick.	222	every server tick.
…		…
200	Various directories - "/etc", read-only install directory, perl-library	228	Various directories - "/etc", read-only install directory, perl-library
201	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	229	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
202	unique-items directory, player file directory, random maps directory and	230	unique-items directory, player file directory, random maps directory and
203	database environment.	231	database environment.
204		232
205	=item $cf::NOW
206
207	The time of the last (current) server tick.
208
209	=item $cf::TICK
210
211	The interval between server ticks, in seconds.
212
213	=item $cf::LOADAVG	233	=item $cf::LOADAVG
214		234
215	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
216	(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
217	objects per tick. Healthy values are < 0.5.	237	objects per tick. Healthy values are < 0.5.
…		…
226	from wherever your confdir points to.	246	from wherever your confdir points to.
227		247
228	=item cf::wait_for_tick, cf::wait_for_tick_begin	248	=item cf::wait_for_tick, cf::wait_for_tick_begin
229		249
230	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
231	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
232	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();
233		270
234	=item @cf::INVOKE_RESULTS	271	=item @cf::INVOKE_RESULTS
235		272
236	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
237	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
…		…
245		282
246	=back	283	=back
247		284
248	=cut	285	=cut
249		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
250	$Coro::State::WARNHOOK = sub {	293	$Coro::State::WARNHOOK = sub {
251	my $msg = join "", @_;	294	my $msg = join "", @_;
252		295
253	$msg .= "\n"	296	$msg .= "\n"
254	unless $msg =~ /\n$/;	297	unless $msg =~ /\n$/;
255		298
256	$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;
257		300
258	LOG llevError, $msg;	301	LOG llevWarn, $msg;
259	};	302	};
260		303
261	$Coro::State::DIEHOOK = sub {	304	$Coro::State::DIEHOOK = sub {
262	return unless $^S eq 0; # "eq", not "=="	305	return unless $^S eq 0; # "eq", not "=="
263		306
264	warn Carp::longmess $_[0];	307	error Carp::longmess $_[0];
265		308
266	if ($Coro::current == $Coro::main) {#d#	309	if (in_main) {#d#
267	warn "DIEHOOK called in main context, Coro bug?\n";#d#	310	error "DIEHOOK called in main context, Coro bug?\n";#d#
268	return;#d#	311	return;#d#
269	}#d#	312	}#d#
270		313
271	# kill coroutine otherwise	314	# kill coroutine otherwise
272	Coro::terminate	315	Coro::terminate
…		…
294	}	337	}
295		338
296	$EV::DIED = sub {	339	$EV::DIED = sub {
297	Carp::cluck "error in event callback: @_";	340	Carp::cluck "error in event callback: @_";
298	};	341	};
		342
		343	#############################################################################
		344
		345	sub fork_call(&@);
		346	sub get_slot($;$$);
299		347
300	#############################################################################	348	#############################################################################
301		349
302	=head2 UTILITY FUNCTIONS	350	=head2 UTILITY FUNCTIONS
303		351
…		…
324	$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;
325	$d	373	$d
326	} || "[unable to dump $_[0]: '$@']";	374	} || "[unable to dump $_[0]: '$@']";
327	}	375	}
328		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
329	=item $ref = cf::decode_json $json	391	=item $ref = cf::decode_json $json
330		392
331	Converts a JSON string into the corresponding perl data structure.	393	Converts a JSON string into the corresponding perl data structure.
332		394
333	=item $json = cf::encode_json $ref	395	=item $json = cf::encode_json $ref
…		…
339	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
340		402
341	sub encode_json($) { $json_coder->encode ($_[0]) }	403	sub encode_json($) { $json_coder->encode ($_[0]) }
342	sub decode_json($) { $json_coder->decode ($_[0]) }	404	sub decode_json($) { $json_coder->decode ($_[0]) }
343		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
344	=item cf::post_init { BLOCK }	437	=item cf::post_init { BLOCK }
345		438
346	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,
347	but I<before> the server starts ticking again.	440	but I<before> the server starts ticking again.
348		441
349	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
350	is a reload or not.	443	is a reload or not.
351		444
352	=cut	445	=cut
353		446
354	sub post_init(&) {	447	sub post_init(&) {
355	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	}
356	}	466	}
357		467
358	=item cf::lock_wait $string	468	=item cf::lock_wait $string
359		469
360	Wait until the given lock is available. See cf::lock_acquire.	470	Wait until the given lock is available. See cf::lock_acquire.
…		…
413	EV::periodic $start, $interval, 0, $cb	523	EV::periodic $start, $interval, 0, $cb
414	}	524	}
415		525
416	=item cf::get_slot $time[, $priority[, $name]]	526	=item cf::get_slot $time[, $priority[, $name]]
417		527
418	Allocate $time seconds of blocking CPU time at priority C<$priority>:	528	Allocate $time seconds of blocking CPU time at priority C<$priority>
419	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
420	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.
421		535
422	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
423	used for statistical purposes and should identify the same time-class.	537	used for statistical purposes and should identify the same time-class.
424		538
425	Useful for short background jobs.	539	Useful for short background jobs.
…		…
454	}	568	}
455	}	569	}
456		570
457	if (@SLOT_QUEUE) {	571	if (@SLOT_QUEUE) {
458	# 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
459	push @cf::WAIT_FOR_TICK, $signal;	573	$WAIT_FOR_TICK->wait;
460	$signal->wait;
461	} else {	574	} else {
462	$busy = 0;	575	$busy = 0;
463	Coro::schedule;	576	Coro::schedule;
464	}	577	}
465	}	578	}
…		…
505	=cut	618	=cut
506		619
507	sub sync_job(&) {	620	sub sync_job(&) {
508	my ($job) = @_;	621	my ($job) = @_;
509		622
510	if ($Coro::current == $Coro::main) {	623	if (in_main) {
511	my $time = AE::time;	624	my $time = AE::time;
512		625
513	# this is the main coro, too bad, we have to block	626	# this is the main coro, too bad, we have to block
514	# till the operation succeeds, freezing the server :/	627	# till the operation succeeds, freezing the server :/
515		628
516	LOG llevError, Carp::longmess "sync job";#d#	629	#LOG llevError, Carp::longmess "sync job";#d#
517		630
518	my $freeze_guard = freeze_mainloop;	631	my $freeze_guard = freeze_mainloop;
519		632
520	my $busy = 1;	633	my $busy = 1;
521	my @res;	634	my @res;
522		635
523	(async {	636	(async {
524	$Coro::current->desc ("sync job coro");	637	$Coro::current->desc ("sync job coro");
525	@res = eval { $job->() };	638	@res = eval { $job->() };
526	warn $@ if $@;	639	error $@ if $@;
527	undef $busy;	640	undef $busy;
528	})->prio (Coro::PRIO_MAX);	641	})->prio (Coro::PRIO_MAX);
529		642
530	while ($busy) {	643	while ($busy) {
531	if (Coro::nready) {	644	if (Coro::nready) {
…		…
565	$EXT_CORO{$coro+0} = $coro;	678	$EXT_CORO{$coro+0} = $coro;
566		679
567	$coro	680	$coro
568	}	681	}
569		682
570	=item fork_call { }, $args	683	=item fork_call { }, @args
571		684
572	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
573	process, returning the results. Everything must be serialisable with	686	process, returning the results. Everything must be serialisable with
574	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
575	never block itself or use any form of event handling.	688	never block itself or use any form of event handling.
576		689
577	=cut	690	=cut
578		691
		692	sub post_fork {
		693	reset_signals;
		694	}
		695
579	sub fork_call(&@) {	696	sub fork_call(&@) {
580	my ($cb, @args) = @_;	697	my ($cb, @args) = @_;
581		698
582	# 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,
583	# otherwise perl prematurely frees the stuff :/	700	# otherwise perl prematurely frees the stuff :/
584	# TODO: investigate and fix (likely this will be rather laborious)	701	# TODO: investigate and fix (likely this will be rather laborious)
585		702
586	my @res = Coro::Util::fork_eval {	703	my @res = Coro::Util::fork_eval {
587	reset_signals;	704	cf::post_fork;
588	&$cb	705	&$cb
589	}, @args;	706	} @args;
590		707
591	wantarray ? @res : $res[-1]	708	wantarray ? @res : $res[-1]
592	}	709	}
593		710
594	sub objinfo {	711	sub objinfo {
…		…
644	within each server.	761	within each server.
645		762
646	=cut	763	=cut
647		764
648	sub db_table($) {	765	sub db_table($) {
		766	cf::error "db_get called from main context"
		767	if $Coro::current == $Coro::main;
		768
649	my ($name) = @_;	769	my ($name) = @_;
650	my $db = BDB::db_create $DB_ENV;	770	my $db = BDB::db_create $DB_ENV;
651		771
652	eval {	772	eval {
653	$db->set_flags (BDB::CHKSUM);	773	$db->set_flags (BDB::CHKSUM);
…		…
663	}	783	}
664		784
665	our $DB;	785	our $DB;
666		786
667	sub db_init {	787	sub db_init {
668	cf::sync_job {
669	$DB ||= db_table "db";	788	$DB ||= db_table "db";
670	};
671	}	789	}
672		790
673	sub db_get($$) {	791	sub db_get($$) {
674	my $key = "$_[0]/$_[1]";	792	my $key = "$_[0]/$_[1]";
675		793
676	cf::sync_job {	794	cf::error "db_get called from main context"
		795	if $Coro::current == $Coro::main;
		796
677	BDB::db_get $DB, undef, $key, my $data;	797	BDB::db_get $DB, undef, $key, my $data;
678		798
679	$! ? ()	799	$! ? ()
680	: $data	800	: $data
681	}
682	}	801	}
683		802
684	sub db_put($$$) {	803	sub db_put($$$) {
685	BDB::dbreq_pri 4;	804	BDB::dbreq_pri 4;
686	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	805	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
714		833
715	my @data;	834	my @data;
716	my $md5;	835	my $md5;
717		836
718	for (0 .. $#$src) {	837	for (0 .. $#$src) {
719	0 <= aio_load $src->[$_], $data[$_]	838	$data[$_] = load_file $src->[$_];
720	or Carp::croak "$src->[$_]: $!";
721	}	839	}
722		840
723	# if processing is expensive, check	841	# if processing is expensive, check
724	# checksum first	842	# checksum first
725	if (1) {	843	if (1) {
…		…
742		860
743	my $t1 = Time::HiRes::time;	861	my $t1 = Time::HiRes::time;
744	my $data = $process->(\@data);	862	my $data = $process->(\@data);
745	my $t2 = Time::HiRes::time;	863	my $t2 = Time::HiRes::time;
746		864
747	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	865	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
748		866
749	db_put cache => "$id/data", $data;	867	db_put cache => "$id/data", $data;
750	db_put cache => "$id/md5" , $md5;	868	db_put cache => "$id/md5" , $md5;
751	db_put cache => "$id/meta", $meta;	869	db_put cache => "$id/meta", $meta;
752		870
…		…
762		880
763	=cut	881	=cut
764		882
765	sub datalog($@) {	883	sub datalog($@) {
766	my ($type, %kv) = @_;	884	my ($type, %kv) = @_;
767	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	885	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
768	}	886	}
769		887
770	=back	888	=back
771		889
772	=cut	890	=cut
…		…
967		1085
968	} elsif (exists $cb_id{$type}) {	1086	} elsif (exists $cb_id{$type}) {
969	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1087	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
970		1088
971	} elsif (ref $type) {	1089	} elsif (ref $type) {
972	warn "attaching objects not supported, ignoring.\n";	1090	error "attaching objects not supported, ignoring.\n";
973		1091
974	} else {	1092	} else {
975	shift @arg;	1093	shift @arg;
976	warn "attach argument '$type' not supported, ignoring.\n";	1094	error "attach argument '$type' not supported, ignoring.\n";
977	}	1095	}
978	}	1096	}
979	}	1097	}
980		1098
981	sub _object_attach {	1099	sub _object_attach {
…		…
991	_attach $registry, $klass, @attach;	1109	_attach $registry, $klass, @attach;
992	}	1110	}
993		1111
994	$obj->{$name} = \%arg;	1112	$obj->{$name} = \%arg;
995	} else {	1113	} else {
996	warn "object uses attachment '$name' which is not available, postponing.\n";	1114	info "object uses attachment '$name' which is not available, postponing.\n";
997	}	1115	}
998		1116
999	$obj->{_attachment}{$name} = undef;	1117	$obj->{_attachment}{$name} = undef;
1000	}	1118	}
1001		1119
…		…
1060		1178
1061	for (@$callbacks) {	1179	for (@$callbacks) {
1062	eval { &{$_->[1]} };	1180	eval { &{$_->[1]} };
1063		1181
1064	if ($@) {	1182	if ($@) {
1065	warn "$@";
1066	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1183	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1067	override;	1184	override;
1068	}	1185	}
1069		1186
1070	return 1 if $override;	1187	return 1 if $override;
1071	}	1188	}
…		…
1150	for (@$attach) {	1267	for (@$attach) {
1151	my ($klass, @attach) = @$_;	1268	my ($klass, @attach) = @$_;
1152	_attach $registry, $klass, @attach;	1269	_attach $registry, $klass, @attach;
1153	}	1270	}
1154	} else {	1271	} else {
1155	warn "object uses attachment '$name' that is not available, postponing.\n";	1272	info "object uses attachment '$name' that is not available, postponing.\n";
1156	}	1273	}
1157	}	1274	}
1158	}	1275	}
1159		1276
1160	cf::attachable->attach (	1277	cf::attachable->attach (
…		…
1187	my ($filename, $rdata, $objs) = @_;	1304	my ($filename, $rdata, $objs) = @_;
1188		1305
1189	sync_job {	1306	sync_job {
1190	if (length $$rdata) {	1307	if (length $$rdata) {
1191	utf8::decode (my $decname = $filename);	1308	utf8::decode (my $decname = $filename);
1192	warn sprintf "saving %s (%d,%d)\n",	1309	trace sprintf "saving %s (%d,%d)\n",
1193	$decname, length $$rdata, scalar @$objs;	1310	$decname, length $$rdata, scalar @$objs
		1311	if $VERBOSE_IO;
1194		1312
1195	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1313	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1196	aio_chmod $fh, SAVE_MODE;	1314	aio_chmod $fh, SAVE_MODE;
1197	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1315	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1198	if ($cf::USE_FSYNC) {	1316	if ($cf::USE_FSYNC) {
…		…
1220	aio_rename "$filename~", $filename;	1338	aio_rename "$filename~", $filename;
1221		1339
1222	$filename =~ s%/[^/]+$%%;	1340	$filename =~ s%/[^/]+$%%;
1223	aio_pathsync $filename if $cf::USE_FSYNC;	1341	aio_pathsync $filename if $cf::USE_FSYNC;
1224	} else {	1342	} else {
1225	warn "unable to save objects: $filename~: $!\n";	1343	error "unable to save objects: $filename~: $!\n";
1226	}	1344	}
1227	} else {	1345	} else {
1228	aio_unlink $filename;	1346	aio_unlink $filename;
1229	aio_unlink "$filename.pst";	1347	aio_unlink "$filename.pst";
1230	}	1348	}
…		…
1254	my $st = eval { Coro::Storable::thaw $av };	1372	my $st = eval { Coro::Storable::thaw $av };
1255	$av = $st->{objs};	1373	$av = $st->{objs};
1256	}	1374	}
1257		1375
1258	utf8::decode (my $decname = $filename);	1376	utf8::decode (my $decname = $filename);
1259	warn sprintf "loading %s (%d,%d)\n",	1377	trace sprintf "loading %s (%d,%d)\n",
1260	$decname, length $data, scalar @{$av || []};	1378	$decname, length $data, scalar @{$av || []}
		1379	if $VERBOSE_IO;
1261		1380
1262	($data, $av)	1381	($data, $av)
1263	}	1382	}
1264		1383
1265	=head2 COMMAND CALLBACKS	1384	=head2 COMMAND CALLBACKS
…		…
1342	my ($pl, $buf) = @_;	1461	my ($pl, $buf) = @_;
1343		1462
1344	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1463	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1345		1464
1346	if (ref $msg) {	1465	if (ref $msg) {
1347	my ($type, $reply, @payload) =	1466	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1348	"ARRAY" eq ref $msg
1349	? @$msg
1350	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1351		1467
1352	my @reply;	1468	my @reply;
1353		1469
1354	if (my $cb = $EXTCMD{$type}) {	1470	if (my $cb = $EXTCMD{$type}) {
1355	@reply = $cb->($pl, @payload);	1471	@reply = $cb->($pl, @payload);
…		…
1357		1473
1358	$pl->ext_reply ($reply, @reply)	1474	$pl->ext_reply ($reply, @reply)
1359	if $reply;	1475	if $reply;
1360		1476
1361	} else {	1477	} else {
1362	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1478	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1363	}	1479	}
1364		1480
1365	cf::override;	1481	cf::override;
1366	},	1482	},
1367	);	1483	);
…		…
1378		1494
1379	$grp	1495	$grp
1380	}	1496	}
1381		1497
1382	sub load_extensions {	1498	sub load_extensions {
		1499	info "loading extensions...";
		1500
1383	cf::sync_job {	1501	cf::sync_job {
1384	my %todo;	1502	my %todo;
1385		1503
1386	for my $path (<$LIBDIR/*.ext>) {	1504	for my $path (<$LIBDIR/*.ext>) {
1387	next unless -r $path;	1505	next unless -r $path;
…		…
1405		1523
1406	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1524	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1407	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1525	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1408		1526
1409	$ext{source} =	1527	$ext{source} =
1410	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1528	"package $pkg; use common::sense;\n"
1411	. "#line 1 \"$path\"\n{\n"	1529	. "#line 1 \"$path\"\n{\n"
1412	. $source	1530	. $source
1413	. "\n};\n1";	1531	. "\n};\n1";
1414		1532
1415	$todo{$base} = \%ext;	1533	$todo{$base} = \%ext;
…		…
1427	for (split /,\s*/, $v->{meta}{depends}) {	1545	for (split /,\s*/, $v->{meta}{depends}) {
1428	next ext	1546	next ext
1429	unless exists $done{$_};	1547	unless exists $done{$_};
1430	}	1548	}
1431		1549
1432	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1550	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1433		1551
1434	my $active = eval $v->{source};	1552	my $active = eval $v->{source};
1435		1553
1436	if (length $@) {	1554	if (length $@) {
1437	warn "$v->{path}: $@\n";	1555	error "$v->{path}: $@\n";
1438		1556
1439	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1557	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1440	if exists $v->{meta}{mandatory};	1558	if exists $v->{meta}{mandatory};
		1559
		1560	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1561	delete $todo{$k};
1441	} else {	1562	} else {
1442	$done{$k} = delete $todo{$k};	1563	$done{$k} = delete $todo{$k};
1443	push @EXTS, $v->{pkg};	1564	push @EXTS, $v->{pkg};
1444	$progress = 1;	1565	$progress = 1;
1445		1566
1446	warn "$v->{base}: extension inactive.\n"	1567	info "$v->{base}: extension inactive.\n"
1447	unless $active;	1568	unless $active;
1448	}	1569	}
1449	}	1570	}
1450		1571
1451	unless ($progress) {	1572	unless ($progress) {
…		…
1453		1574
1454	while (my ($k, $v) = each %todo) {	1575	while (my ($k, $v) = each %todo) {
1455	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1576	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456	if exists $v->{meta}{mandatory};	1577	if exists $v->{meta}{mandatory};
1457	}	1578	}
		1579
		1580	last;
1458	}	1581	}
1459	}	1582	}
1460	};	1583	};
1461	}	1584	}
1462		1585
…		…
1620	my $name = $pl->ob->name;	1743	my $name = $pl->ob->name;
1621		1744
1622	$pl->{deny_save} = 1;	1745	$pl->{deny_save} = 1;
1623	$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
1624		1747
1625	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1748	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1626	$pl->deactivate;	1749	$pl->deactivate;
		1750
1627	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;
1628	$pl->ob->check_score;
1629	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1752	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1753	ext::highscore::check ($pl->ob);
		1754
1630	$pl->ns->destroy if $pl->ns;	1755	$pl->ns->destroy if $pl->ns;
1631		1756
1632	my $path = playerdir $pl;	1757	my $path = playerdir $pl;
1633	my $temp = "$path~$cf::RUNTIME~deleting~";	1758	my $temp = "$path~$cf::RUNTIME~deleting~";
1634	aio_rename $path, $temp;	1759	aio_rename $path, $temp;
…		…
1688	\@logins	1813	\@logins
1689	}	1814	}
1690		1815
1691	=item $player->maps	1816	=item $player->maps
1692		1817
		1818	=item cf::player::maps $login
		1819
1693	Returns an arrayref of map paths that are private for this	1820	Returns an arrayref of map paths that are private for this
1694	player. May block.	1821	player. May block.
1695		1822
1696	=cut	1823	=cut
1697		1824
…		…
1759	=cut	1886	=cut
1760		1887
1761	sub find_by_path($) {	1888	sub find_by_path($) {
1762	my ($path) = @_;	1889	my ($path) = @_;
1763		1890
		1891	$path =~ s/^~[^\/]*//; # skip ~login
		1892
1764	my ($match, $specificity);	1893	my ($match, $specificity);
1765		1894
1766	for my $region (list) {	1895	for my $region (list) {
1767	if ($region->{match} && $path =~ $region->{match}) {	1896	if ($region->{match} && $path =~ $region->{match}) {
1768	($match, $specificity) = ($region, $region->specificity)	1897	($match, $specificity) = ($region, $region->specificity)
…		…
1796	sub generate_random_map {	1925	sub generate_random_map {
1797	my ($self, $rmp) = @_;	1926	my ($self, $rmp) = @_;
1798		1927
1799	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
1800		1929
1801	# mit "rum" bekleckern, nicht
1802	$self->_create_random_map (	1930	$self->_create_random_map ($rmp);
1803	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1804	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1805	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1806	$rmp->{exit_on_final_map},
1807	$rmp->{xsize}, $rmp->{ysize},
1808	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1809	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1810	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1811	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1812	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1813	(cf::region::find $rmp->{region}), $rmp->{custom}
1814	)
1815	}	1931	}
1816		1932
1817	=item cf::map->register ($regex, $prio)	1933	=item cf::map->register ($regex, $prio)
1818		1934
1819	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
…		…
1824		1940
1825	sub register {	1941	sub register {
1826	my (undef, $regex, $prio) = @_;	1942	my (undef, $regex, $prio) = @_;
1827	my $pkg = caller;	1943	my $pkg = caller;
1828		1944
1829	no strict;
1830	push @{"$pkg\::ISA"}, __PACKAGE__;	1945	push @{"$pkg\::ISA"}, __PACKAGE__;
1831		1946
1832	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1947	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1833	}	1948	}
1834		1949
1835	# also paths starting with '/'	1950	# also paths starting with '/'
1836	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1951	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1837		1952
1838	sub thawer_merge {	1953	sub thawer_merge {
1839	my ($self, $merge) = @_;	1954	my ($self, $merge) = @_;
1840		1955
1841	# we have to keep some variables in memory intact	1956	# we have to keep some variables in memory intact
…		…
1846	}	1961	}
1847		1962
1848	sub normalise {	1963	sub normalise {
1849	my ($path, $base) = @_;	1964	my ($path, $base) = @_;
1850		1965
1851	$path = "$path"; # make sure its a string	1966	$path = "$path"; # make sure it's a string
1852		1967
1853	$path =~ s/\.map$//;	1968	$path =~ s/\.map$//;
1854		1969
1855	# map plan:	1970	# map plan:
1856	#	1971	#
…		…
1871	$base =~ s{[^/]+/?$}{};	1986	$base =~ s{[^/]+/?$}{};
1872	$path = "$base/$path";	1987	$path = "$base/$path";
1873	}	1988	}
1874		1989
1875	for ($path) {	1990	for ($path) {
1876	redo if s{//}{/};
1877	redo if s{/\.?/}{/};	1991	redo if s{/\.?/}{/};
1878	redo if s{/[^/]+/\.\./}{/};	1992	redo if s{/[^/]+/\.\./}{/};
1879	}	1993	}
1880		1994
1881	$path	1995	$path
…		…
1895	$self->init; # pass $1 etc.	2009	$self->init; # pass $1 etc.
1896	return $self;	2010	return $self;
1897	}	2011	}
1898	}	2012	}
1899		2013
1900	Carp::cluck "unable to resolve path '$path' (base '$base').";	2014	Carp::cluck "unable to resolve path '$path' (base '$base')";
1901	()	2015	()
1902	}	2016	}
1903		2017
		2018	# may re-bless or do other evil things
1904	sub init {	2019	sub init {
1905	my ($self) = @_;	2020	my ($self) = @_;
1906		2021
1907	$self	2022	$self
1908	}	2023	}
…		…
1973	$self->{load_path} = $path;	2088	$self->{load_path} = $path;
1974		2089
1975	1	2090	1
1976	}	2091	}
1977		2092
		2093	# used to laod the header of an original map
1978	sub load_header_orig {	2094	sub load_header_orig {
1979	my ($self) = @_;	2095	my ($self) = @_;
1980		2096
1981	$self->load_header_from ($self->load_path)	2097	$self->load_header_from ($self->load_path)
1982	}	2098	}
1983		2099
		2100	# used to laod the header of an instantiated map
1984	sub load_header_temp {	2101	sub load_header_temp {
1985	my ($self) = @_;	2102	my ($self) = @_;
1986		2103
1987	$self->load_header_from ($self->save_path)	2104	$self->load_header_from ($self->save_path)
1988	}	2105	}
1989		2106
		2107	# called after loading the header from an instantiated map
1990	sub prepare_temp {	2108	sub prepare_temp {
1991	my ($self) = @_;	2109	my ($self) = @_;
1992		2110
1993	$self->last_access ((delete $self->{last_access})	2111	$self->last_access ((delete $self->{last_access})
1994	|| $cf::RUNTIME); #d#	2112	|| $cf::RUNTIME); #d#
1995	# safety	2113	# safety
1996	$self->{instantiate_time} = $cf::RUNTIME	2114	$self->{instantiate_time} = $cf::RUNTIME
1997	if $self->{instantiate_time} > $cf::RUNTIME;	2115	if $self->{instantiate_time} > $cf::RUNTIME;
1998	}	2116	}
1999		2117
		2118	# called after loading the header from an original map
2000	sub prepare_orig {	2119	sub prepare_orig {
2001	my ($self) = @_;	2120	my ($self) = @_;
2002		2121
2003	$self->{load_original} = 1;	2122	$self->{load_original} = 1;
2004	$self->{instantiate_time} = $cf::RUNTIME;	2123	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2028		2147
2029	sub find;	2148	sub find;
2030	sub find {	2149	sub find {
2031	my ($path, $origin) = @_;	2150	my ($path, $origin) = @_;
2032		2151
		2152	cf::cede_to_tick;
		2153
2033	$path = normalise $path, $origin && $origin->path;	2154	$path = normalise $path, $origin;
2034		2155
2035	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2156	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036	my $guard2 = cf::lock_acquire "map_find:$path";	2157	my $guard2 = cf::lock_acquire "map_find:$path";
2037		2158
2038	$cf::MAP{$path} || do {	2159	$cf::MAP{$path} || do {
…		…
2069		2190
2070	{	2191	{
2071	my $guard = cf::lock_acquire "map_data:$path";	2192	my $guard = cf::lock_acquire "map_data:$path";
2072		2193
2073	return unless $self->valid;	2194	return unless $self->valid;
2074	return unless $self->in_memory == cf::MAP_SWAPPED;	2195	return unless $self->state == cf::MAP_SWAPPED;
2075
2076	$self->in_memory (cf::MAP_LOADING);
2077		2196
2078	$self->alloc;	2197	$self->alloc;
2079		2198
2080	$self->pre_load;	2199	$self->pre_load;
2081	cf::cede_to_tick;	2200	cf::cede_to_tick;
2082		2201
		2202	if (exists $self->{load_path}) {
2083	my $f = new_from_file cf::object::thawer $self->{load_path};	2203	my $f = new_from_file cf::object::thawer $self->{load_path};
2084	$f->skip_block;	2204	$f->skip_block;
2085	$self->_load_objects ($f)	2205	$self->_load_objects ($f)
2086	or return;	2206	or return;
2087		2207
2088	$self->post_load_original	2208	$self->post_load_original
2089	if delete $self->{load_original};	2209	if delete $self->{load_original};
2090		2210
2091	if (my $uniq = $self->uniq_path) {	2211	if (my $uniq = $self->uniq_path) {
2092	utf8::encode $uniq;	2212	utf8::encode $uniq;
2093	unless (aio_stat $uniq) {	2213	unless (aio_stat $uniq) {
2094	if (my $f = new_from_file cf::object::thawer $uniq) {	2214	if (my $f = new_from_file cf::object::thawer $uniq) {
2095	$self->clear_unique_items;	2215	$self->clear_unique_items;
2096	$self->_load_objects ($f);	2216	$self->_load_objects ($f);
2097	$f->resolve_delayed_derefs;	2217	$f->resolve_delayed_derefs;
		2218	}
2098	}	2219	}
2099	}	2220	}
2100	}
2101		2221
2102	$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);
2103		2229
2104	cf::cede_to_tick;	2230	cf::cede_to_tick;
2105	# now do the right thing for maps	2231	# now do the right thing for maps
2106	$self->link_multipart_objects;	2232	$self->link_multipart_objects;
2107	$self->difficulty ($self->estimate_difficulty)	2233	$self->difficulty ($self->estimate_difficulty)
…		…
2111	unless ($self->{deny_activate}) {	2237	unless ($self->{deny_activate}) {
2112	$self->decay_objects;	2238	$self->decay_objects;
2113	$self->fix_auto_apply;	2239	$self->fix_auto_apply;
2114	$self->update_buttons;	2240	$self->update_buttons;
2115	cf::cede_to_tick;	2241	cf::cede_to_tick;
2116	$self->activate;	2242	#$self->activate; # no longer activate maps automatically
2117	}	2243	}
2118		2244
2119	$self->{last_save} = $cf::RUNTIME;	2245	$self->{last_save} = $cf::RUNTIME;
2120	$self->last_access ($cf::RUNTIME);	2246	$self->last_access ($cf::RUNTIME);
2121
2122	$self->in_memory (cf::MAP_ACTIVE);
2123	}	2247	}
2124		2248
2125	$self->post_load;	2249	$self->post_load;
		2250
		2251	1
2126	}	2252	}
2127		2253
2128	# customize the map for a given player, i.e.	2254	# customize the map for a given player, i.e.
2129	# return the _real_ map. used by e.g. per-player	2255	# return the _real_ map. used by e.g. per-player
2130	# maps to change the path to ~playername/mappath	2256	# maps to change the path to ~playername/mappath
…		…
2138	# if $self->per_party;	2264	# if $self->per_party;
2139		2265
2140	$self	2266	$self
2141	}	2267	}
2142		2268
2143	# find and load all maps in the 3x3 area around a map
2144	sub load_neighbours {
2145	my ($map) = @_;
2146
2147	my @neigh; # diagonal neighbours
2148
2149	for (0 .. 3) {
2150	my $neigh = $map->tile_path ($_)
2151	or next;
2152	$neigh = find $neigh, $map
2153	or next;
2154	$neigh->load;
2155
2156	push @neigh,
2157	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2158	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2159	}
2160
2161	for (grep defined $_->[0], @neigh) {
2162	my ($path, $origin) = @$_;
2163	my $neigh = find $path, $origin
2164	or next;
2165	$neigh->load;
2166	}
2167	}
2168
2169	sub find_sync {	2269	sub find_sync {
2170	my ($path, $origin) = @_;	2270	my ($path, $origin) = @_;
2171		2271
2172	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
2173	}	2277	}
2174		2278
2175	sub do_load_sync {	2279	sub do_load_sync {
2176	my ($map) = @_;	2280	my ($map) = @_;
2177		2281
		2282	# it's a bug to call this from the main context
2178	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2283	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2179	if $Coro::current == $Coro::main;	2284	if $Coro::current == $Coro::main;
2180		2285
2181	cf::sync_job { $map->load };	2286	$map->load;
2182	}	2287	}
2183		2288
2184	our %MAP_PREFETCH;	2289	our %MAP_PREFETCH;
2185	our $MAP_PREFETCHER = undef;	2290	our $MAP_PREFETCHER = undef;
2186		2291
2187	sub find_async {	2292	sub find_async {
2188	my ($path, $origin, $load) = @_;	2293	my ($path, $origin, $load) = @_;
2189		2294
2190	$path = normalise $path, $origin && $origin->{path};	2295	$path = normalise $path, $origin;
2191		2296
2192	if (my $map = $cf::MAP{$path}) {	2297	if (my $map = $cf::MAP{$path}) {
2193	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2298	return $map if !$load || $map->linkable;
2194	}	2299	}
2195		2300
2196	$MAP_PREFETCH{$path} |= $load;	2301	$MAP_PREFETCH{$path} |= $load;
2197		2302
2198	$MAP_PREFETCHER ||= cf::async {	2303	$MAP_PREFETCHER ||= cf::async {
…		…
2257	sub swap_out {	2362	sub swap_out {
2258	my ($self) = @_;	2363	my ($self) = @_;
2259		2364
2260	my $lock = cf::lock_acquire "map_data:$self->{path}";	2365	my $lock = cf::lock_acquire "map_data:$self->{path}";
2261		2366
2262	return if $self->in_memory != cf::MAP_ACTIVE;	2367	return if !$self->linkable;
2263	return if $self->{deny_save};	2368	return if $self->{deny_save};
2264	return if $self->players;	2369	return if $self->players;
2265		2370
2266	# first deactivate the map and "unlink" it from the core	2371	# first deactivate the map and "unlink" it from the core
2267	$self->deactivate;	2372	$self->deactivate;
2268	$_->clear_links_to ($self) for values %cf::MAP;	2373	$_->clear_links_to ($self) for values %cf::MAP;
2269	$self->in_memory (cf::MAP_SWAPPED);	2374	$self->state (cf::MAP_SWAPPED);
2270		2375
2271	# then atomically save	2376	# then atomically save
2272	$self->_save;	2377	$self->_save;
2273		2378
2274	# then free the map	2379	# then free the map
…		…
2298		2403
2299	my $lock = cf::lock_acquire "map_data:$self->{path}";	2404	my $lock = cf::lock_acquire "map_data:$self->{path}";
2300		2405
2301	return if $self->players;	2406	return if $self->players;
2302		2407
2303	warn "resetting map ", $self->path, "\n";	2408	cf::trace "resetting map ", $self->path, "\n";
2304		2409
2305	$self->in_memory (cf::MAP_SWAPPED);	2410	$self->state (cf::MAP_SWAPPED);
2306		2411
2307	# need to save uniques path	2412	# need to save uniques path
2308	unless ($self->{deny_save}) {	2413	unless ($self->{deny_save}) {
2309	my $uniq = $self->uniq_path; utf8::encode $uniq;	2414	my $uniq = $self->uniq_path; utf8::encode $uniq;
2310		2415
…		…
2332		2437
2333	delete $cf::MAP{$self->path};	2438	delete $cf::MAP{$self->path};
2334		2439
2335	$self->unlink_save;	2440	$self->unlink_save;
2336		2441
2337	bless $self, "cf::map";	2442	bless $self, "cf::map::wrap";
2338	delete $self->{deny_reset};	2443	delete $self->{deny_reset};
2339	$self->{deny_save} = 1;	2444	$self->{deny_save} = 1;
2340	$self->reset_timeout (1);	2445	$self->reset_timeout (1);
2341	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2446	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2342		2447
…		…
2572		2677
2573	Freezes the player and moves him/her to a special map (C<{link}>).	2678	Freezes the player and moves him/her to a special map (C<{link}>).
2574		2679
2575	The player should be reasonably safe there for short amounts of time (e.g.	2680	The player should be reasonably safe there for short amounts of time (e.g.
2576	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2681	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2577	though, as the palyer cannot control the character while it is on the link	2682	though, as the player cannot control the character while it is on the link
2578	map.	2683	map.
2579		2684
2580	Will never block.	2685	Will never block.
2581		2686
2582	=item $player_object->leave_link ($map, $x, $y)	2687	=item $player_object->leave_link ($map, $x, $y)
…		…
2603	sub cf::object::player::enter_link {	2708	sub cf::object::player::enter_link {
2604	my ($self) = @_;	2709	my ($self) = @_;
2605		2710
2606	$self->deactivate_recursive;	2711	$self->deactivate_recursive;
2607		2712
		2713	++$self->{_link_recursion};
		2714
2608	return if UNIVERSAL::isa $self->map, "ext::map_link";	2715	return if UNIVERSAL::isa $self->map, "ext::map_link";
2609		2716
2610	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2717	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2611	if $self->map && $self->map->{path} ne "{link}";	2718	if $self->map && $self->map->{path} ne "{link}";
2612		2719
2613	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2720	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2614	}	2721	}
2615		2722
2616	sub cf::object::player::leave_link {	2723	sub cf::object::player::leave_link {
2617	my ($self, $map, $x, $y) = @_;	2724	my ($self, $map, $x, $y) = @_;
2618		2725
…		…
2638	# use -1 or undef as default coordinates, not 0, 0	2745	# use -1 or undef as default coordinates, not 0, 0
2639	($x, $y) = ($map->enter_x, $map->enter_y)	2746	($x, $y) = ($map->enter_x, $map->enter_y)
2640	if $x <= 0 && $y <= 0;	2747	if $x <= 0 && $y <= 0;
2641		2748
2642	$map->load;	2749	$map->load;
2643	$map->load_neighbours;
2644		2750
2645	return unless $self->contr->active;	2751	return unless $self->contr->active;
2646		2752
2647	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2753	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2648	$self->enter_map ($map, $x, $y);	2754	if ($self->enter_map ($map, $x, $y)) {
2649		2755	# entering was successful
		2756	delete $self->{_link_recursion};
2650	# only activate afterwards, to support waiting in hooks	2757	# only activate afterwards, to support waiting in hooks
2651	$self->activate_recursive;	2758	$self->activate_recursive;
2652	}	2759	}
2653		2760
		2761	}
		2762
2654	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2763	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2655		2764
2656	Moves the player to the given map-path and coordinates by first freezing	2765	Moves the player to the given map-path and coordinates by first freezing
2657	her, loading and preparing them map, calling the provided $check callback	2766	her, loading and preparing them map, calling the provided $check callback
2658	that has to return the map if sucecssful, and then unfreezes the player on	2767	that has to return the map if sucecssful, and then unfreezes the player on
2659	the new (success) or old (failed) map position. In either case, $done will	2768	the new (success) or old (failed) map position. In either case, $done will
…		…
2666		2775
2667	our $GOTOGEN;	2776	our $GOTOGEN;
2668		2777
2669	sub cf::object::player::goto {	2778	sub cf::object::player::goto {
2670	my ($self, $path, $x, $y, $check, $done) = @_;	2779	my ($self, $path, $x, $y, $check, $done) = @_;
		2780
		2781	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2782	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2783	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2784	($path, $x, $y) = @$EMERGENCY_POSITION;
		2785	}
2671		2786
2672	# 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
2673	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2788	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2674		2789
2675	$self->enter_link;	2790	$self->enter_link;
…		…
2695	($path, $x, $y) = (undef, undef, undef);	2810	($path, $x, $y) = (undef, undef, undef);
2696	}	2811	}
2697	}	2812	}
2698		2813
2699	my $map = eval {	2814	my $map = eval {
2700	my $map = defined $path ? cf::map::find $path : undef;	2815	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2701		2816
2702	if ($map) {	2817	if ($map) {
2703	$map = $map->customise_for ($self);	2818	$map = $map->customise_for ($self);
2704	$map = $check->($map) if $check && $map;	2819	$map = $check->($map, $x, $y, $self) if $check && $map;
2705	} else {	2820	} else {
2706	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2821	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2707	}	2822	}
2708		2823
2709	$map	2824	$map
…		…
2717	if ($gen == $self->{_goto_generation}) {	2832	if ($gen == $self->{_goto_generation}) {
2718	delete $self->{_goto_generation};	2833	delete $self->{_goto_generation};
2719	$self->leave_link ($map, $x, $y);	2834	$self->leave_link ($map, $x, $y);
2720	}	2835	}
2721		2836
2722	$done->() if $done;	2837	$done->($self) if $done;
2723	})->prio (1);	2838	})->prio (1);
2724	}	2839	}
2725		2840
2726	=item $player_object->enter_exit ($exit_object)	2841	=item $player_object->enter_exit ($exit_object)
2727		2842
…		…
2795	$Coro::current->{desc} = "enter_exit";	2910	$Coro::current->{desc} = "enter_exit";
2796		2911
2797	unless (eval {	2912	unless (eval {
2798	$self->deactivate_recursive; # just to be sure	2913	$self->deactivate_recursive; # just to be sure
2799		2914
2800	# random map handling
2801	{
2802	my $guard = cf::lock_acquire "exit_prepare:$exit";
2803
2804	prepare_random_map $exit
2805	if $exit->slaying eq "/!";
2806	}
2807
2808	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2915	my $map = cf::map::normalise $exit->slaying, $exit->map;
2809	my $x = $exit->stats->hp;	2916	my $x = $exit->stats->hp;
2810	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	}
2811		2941
2812	$self->goto ($map, $x, $y);	2942	$self->goto ($map, $x, $y);
2813		2943
2814	# if exit is damned, update players death & WoR home-position	2944	# if exit is damned, update players death & WoR home-position
2815	$self->contr->savebed ($map, $x, $y)	2945	$self->contr->savebed ($map, $x, $y)
…		…
2820	$self->message ("Something went wrong deep within the deliantra server. "	2950	$self->message ("Something went wrong deep within the deliantra server. "
2821	. "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. "
2822	. "Please report this to the dungeon master!",	2952	. "Please report this to the dungeon master!",
2823	cf::NDI_UNIQUE | cf::NDI_RED);	2953	cf::NDI_UNIQUE | cf::NDI_RED);
2824		2954
2825	warn "ERROR in enter_exit: $@";	2955	error "ERROR in enter_exit: $@";
2826	$self->leave_link;	2956	$self->leave_link;
2827	}	2957	}
2828	})->prio (1);	2958	})->prio (1);
2829	}	2959	}
2830		2960
…		…
3057	=cut	3187	=cut
3058		3188
3059	sub cf::client::ext_reply($$@) {	3189	sub cf::client::ext_reply($$@) {
3060	my ($self, $id, @msg) = @_;	3190	my ($self, $id, @msg) = @_;
3061		3191
3062	if ($self->extcmd == 2) {	3192	return unless $self->extcmd == 2;
		3193
3063	$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]));
3064	} elsif ($self->extcmd == 1) {
3065	#TODO: version 1, remove
3066	unshift @msg, msgtype => "reply", msgid => $id;
3067	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3068	}
3069	}	3195	}
3070		3196
3071	=item $success = $client->query ($flags, "text", \&cb)	3197	=item $success = $client->query ($flags, "text", \&cb)
3072		3198
3073	Queues a query to the client, calling the given callback with	3199	Queues a query to the client, calling the given callback with
…		…
3128	my ($ns, $buf) = @_;	3254	my ($ns, $buf) = @_;
3129		3255
3130	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3256	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3131		3257
3132	if (ref $msg) {	3258	if (ref $msg) {
3133	my ($type, $reply, @payload) =	3259	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3134	"ARRAY" eq ref $msg
3135	? @$msg
3136	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3137		3260
3138	my @reply;	3261	my @reply;
3139		3262
3140	if (my $cb = $EXTICMD{$type}) {	3263	if (my $cb = $EXTICMD{$type}) {
3141	@reply = $cb->($ns, @payload);	3264	@reply = $cb->($ns, @payload);
…		…
3143		3266
3144	$ns->ext_reply ($reply, @reply)	3267	$ns->ext_reply ($reply, @reply)
3145	if $reply;	3268	if $reply;
3146		3269
3147	} else {	3270	} else {
3148	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";
3149	}	3272	}
3150		3273
3151	cf::override;	3274	cf::override;
3152	},	3275	},
3153	);	3276	);
…		…
3234	decrease split destroy change_exp value msg lore send_msg)],	3357	decrease split destroy change_exp value msg lore send_msg)],
3235	["cf::object::player" => qw(player)],	3358	["cf::object::player" => qw(player)],
3236	["cf::player" => qw(peaceful send_msg)],	3359	["cf::player" => qw(peaceful send_msg)],
3237	["cf::map" => qw(trigger)],	3360	["cf::map" => qw(trigger)],
3238	) {	3361	) {
3239	no strict 'refs';
3240	my ($pkg, @funs) = @$_;	3362	my ($pkg, @funs) = @$_;
3241	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3363	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3242	for @funs;	3364	for @funs;
3243	}	3365	}
3244		3366
…		…
3283	local @cf::_safe_eval_args = values %vars;	3405	local @cf::_safe_eval_args = values %vars;
3284	@res = wantarray ? eval eval : scalar eval $eval;	3406	@res = wantarray ? eval eval : scalar eval $eval;
3285	}	3407	}
3286		3408
3287	if ($@) {	3409	if ($@) {
3288	warn "$@";	3410	warn "$@",
3289	warn "while executing safe code '$code'\n";	3411	"while executing safe code '$code'\n",
3290	warn "with arguments " . (join " ", %vars) . "\n";	3412	"with arguments " . (join " ", %vars) . "\n";
3291	}	3413	}
3292		3414
3293	wantarray ? @res : $res[0]	3415	wantarray ? @res : $res[0]
3294	}	3416	}
3295		3417
…		…
3329	# for this (global event?)	3451	# for this (global event?)
3330	%ext::player_env::MUSIC_FACE_CACHE = ();	3452	%ext::player_env::MUSIC_FACE_CACHE = ();
3331		3453
3332	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3454	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3333		3455
3334	warn "loading facedata from $path\n";	3456	trace "loading facedata from $path\n";
3335		3457
3336	my $facedata;	3458	my $facedata = decode_storable load_file $path;
3337	0 < aio_load $path, $facedata
3338	or die "$path: $!";
3339
3340	$facedata = Coro::Storable::thaw $facedata;
3341		3459
3342	$facedata->{version} == 2	3460	$facedata->{version} == 2
3343	or cf::cleanup "$path: version mismatch, cannot proceed.";	3461	or cf::cleanup "$path: version mismatch, cannot proceed.";
3344		3462
3345	# patch in the exptable	3463	# patch in the exptable
…		…
3359		3477
3360	cf::face::set_visibility $idx, $info->{visibility};	3478	cf::face::set_visibility $idx, $info->{visibility};
3361	cf::face::set_magicmap $idx, $info->{magicmap};	3479	cf::face::set_magicmap $idx, $info->{magicmap};
3362	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3480	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3363	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} ;
3364		3483
3365	cf::cede_to_tick;	3484	cf::cede_to_tick;
3366	}	3485	}
3367		3486
3368	while (my ($face, $info) = each %$faces) {	3487	while (my ($face, $info) = each %$faces) {
…		…
3373		3492
3374	if (my $smooth = cf::face::find $info->{smooth}) {	3493	if (my $smooth = cf::face::find $info->{smooth}) {
3375	cf::face::set_smooth $idx, $smooth;	3494	cf::face::set_smooth $idx, $smooth;
3376	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3495	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3377	} else {	3496	} else {
3378	warn "smooth face '$info->{smooth}' not found for face '$face'";	3497	error "smooth face '$info->{smooth}' not found for face '$face'";
3379	}	3498	}
3380		3499
3381	cf::cede_to_tick;	3500	cf::cede_to_tick;
3382	}	3501	}
3383	}	3502	}
…		…
3395		3514
3396	{	3515	{
3397	my $res = $facedata->{resource};	3516	my $res = $facedata->{resource};
3398		3517
3399	while (my ($name, $info) = each %$res) {	3518	while (my ($name, $info) = each %$res) {
3400	if (defined $info->{type}) {	3519	if (defined (my $type = $info->{type})) {
		3520	# TODO: different hash - must free and use new index, or cache ixface data queue
3401	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3521	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3402		3522
3403	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3523	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3404	cf::face::set_type $idx, $info->{type};	3524	cf::face::set_type $idx, $type;
		3525	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3405	} else {	3526	} else {
3406	$RESOURCE{$name} = $info;	3527	# $RESOURCE{$name} = $info; # unused
3407	}	3528	}
3408		3529
3409	cf::cede_to_tick;	3530	cf::cede_to_tick;
3410	}	3531	}
3411	}	3532	}
3412		3533
3413	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3534	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3414		3535
3415	1	3536	1
3416	}	3537	}
3417
3418	cf::global->attach (on_resource_update => sub {
3419	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3420	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3421
3422	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3423	my $sound = $soundconf->{compat}[$_]
3424	or next;
3425
3426	my $face = cf::face::find "sound/$sound->[1]";
3427	cf::sound::set $sound->[0] => $face;
3428	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3429	}
3430
3431	while (my ($k, $v) = each %{$soundconf->{event}}) {
3432	my $face = cf::face::find "sound/$v";
3433	cf::sound::set $k => $face;
3434	}
3435	}
3436	});
3437		3538
3438	register_exticmd fx_want => sub {	3539	register_exticmd fx_want => sub {
3439	my ($ns, $want) = @_;	3540	my ($ns, $want) = @_;
3440		3541
3441	while (my ($k, $v) = each %$want) {	3542	while (my ($k, $v) = each %$want) {
…		…
3480	sub reload_treasures {	3581	sub reload_treasures {
3481	load_resource_file "$DATADIR/treasures"	3582	load_resource_file "$DATADIR/treasures"
3482	or die "unable to load treasurelists\n";	3583	or die "unable to load treasurelists\n";
3483	}	3584	}
3484		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
3485	sub reload_resources {	3606	sub reload_resources {
3486	warn "reloading resource files...\n";	3607	trace "reloading resource files...\n";
3487		3608
		3609	reload_exp_table;
		3610	reload_materials;
3488	reload_facedata;	3611	reload_facedata;
		3612	reload_sound;
3489	reload_archetypes;	3613	reload_archetypes;
3490	reload_regions;	3614	reload_regions;
3491	reload_treasures;	3615	reload_treasures;
3492		3616
3493	warn "finished reloading resource files\n";	3617	trace "finished reloading resource files\n";
3494	}	3618	}
3495		3619
3496	sub reload_config {	3620	sub reload_config {
3497	warn "reloading config file...\n";	3621	trace "reloading config file...\n";
3498		3622
3499	open my $fh, "<:utf8", "$CONFDIR/config"	3623	my $config = load_file "$CONFDIR/config";
3500	or return;	3624	utf8::decode $config;
		3625	*CFG = decode_yaml $config;
3501		3626
3502	local $/;
3503	*CFG = YAML::XS::Load scalar <$fh>;
3504
3505	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3627	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3506		3628
3507	$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};
3508	$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};
3509		3631
3510	if (exists $CFG{mlockall}) {	3632	if (exists $CFG{mlockall}) {
…		…
3512	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3634	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3513	and die "WARNING: m(un)lockall failed: $!\n";	3635	and die "WARNING: m(un)lockall failed: $!\n";
3514	};	3636	};
3515	warn $@ if $@;	3637	warn $@ if $@;
3516	}	3638	}
3517
3518	warn "finished reloading resource files\n";
3519	}	3639	}
3520		3640
3521	sub pidfile() {	3641	sub pidfile() {
3522	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3642	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3523	or die "$PIDFILE: $!";	3643	or die "$PIDFILE: $!";
…		…
3536	seek $fh, 0, 0;	3656	seek $fh, 0, 0;
3537	print $fh $$;	3657	print $fh $$;
3538	}	3658	}
3539		3659
3540	sub main_loop {	3660	sub main_loop {
3541	warn "EV::loop starting\n";	3661	trace "EV::loop starting\n";
3542	if (1) {	3662	if (1) {
3543	EV::loop;	3663	EV::loop;
3544	}	3664	}
3545	warn "EV::loop returned\n";	3665	trace "EV::loop returned\n";
3546	goto &main_loop unless $REALLY_UNLOOP;	3666	goto &main_loop unless $REALLY_UNLOOP;
3547	}	3667	}
3548		3668
3549	sub main {	3669	sub main {
3550	cf::init_globals; # initialise logging	3670	cf::init_globals; # initialise logging
3551		3671
3552	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3672	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3553	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.";
3554	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3674	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3555	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3675	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3556		3676
3557	$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
3558		3678
…		…
3566	};	3686	};
3567		3687
3568	evthread_start IO::AIO::poll_fileno;	3688	evthread_start IO::AIO::poll_fileno;
3569		3689
3570	cf::sync_job {	3690	cf::sync_job {
3571	cf::init_experience;	3691	cf::incloader::init ();
		3692
3572	cf::init_anim;	3693	cf::init_anim;
3573	cf::init_attackmess;	3694	cf::init_attackmess;
3574	cf::init_dynamic;	3695	cf::init_dynamic;
3575		3696
3576	cf::load_settings;	3697	cf::load_settings;
3577	cf::load_materials;
3578		3698
3579	reload_resources;	3699	reload_resources;
3580	reload_config;	3700	reload_config;
3581	db_init;	3701	db_init;
3582		3702
…		…
3594		3714
3595	# no (long-running) fork's whatsoever before this point(!)	3715	# no (long-running) fork's whatsoever before this point(!)
3596	use POSIX ();	3716	use POSIX ();
3597	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};
3598		3718
3599	(pop @POST_INIT)->(0) while @POST_INIT;	3719	cf::_post_init 0;
3600	};	3720	};
3601		3721
3602	cf::object::thawer::errors_are_fatal 0;	3722	cf::object::thawer::errors_are_fatal 0;
3603	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";
3604		3724
		3725	AE::postpone {
		3726	undef &main; # free gobs of memory :)
		3727	};
		3728
3605	main_loop;	3729	goto &main_loop;
3606	}	3730	}
3607		3731
3608	#############################################################################	3732	#############################################################################
3609	# initialisation and cleanup	3733	# initialisation and cleanup
3610		3734
…		…
3649	or return;	3773	or return;
3650		3774
3651	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3775	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3652	and return;	3776	and return;
3653		3777
3654	warn sprintf "runtime file written (%gs).\n", AE::time - $t0;	3778	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3655		3779
3656	1	3780	1
3657	}	3781	}
3658		3782
3659	our $uuid_lock;	3783	our $uuid_lock;
…		…
3671	or return;	3795	or return;
3672		3796
3673	my $value = uuid_seq uuid_cur;	3797	my $value = uuid_seq uuid_cur;
3674		3798
3675	unless ($value) {	3799	unless ($value) {
3676	warn "cowardly refusing to write zero uuid value!\n";	3800	info "cowardly refusing to write zero uuid value!\n";
3677	return;	3801	return;
3678	}	3802	}
3679		3803
3680	my $value = uuid_str $value + $uuid_skip;	3804	my $value = uuid_str $value + $uuid_skip;
3681	$uuid_skip = 0;	3805	$uuid_skip = 0;
…		…
3691	or return;	3815	or return;
3692		3816
3693	aio_rename "$uuid~", $uuid	3817	aio_rename "$uuid~", $uuid
3694	and return;	3818	and return;
3695		3819
3696	warn "uuid file written ($value).\n";	3820	trace "uuid file written ($value).\n";
3697		3821
3698	1	3822	1
3699		3823
3700	}	3824	}
3701		3825
…		…
3707	}	3831	}
3708		3832
3709	sub emergency_save() {	3833	sub emergency_save() {
3710	my $freeze_guard = cf::freeze_mainloop;	3834	my $freeze_guard = cf::freeze_mainloop;
3711		3835
3712	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;
3713		3842
3714	cf::sync_job {	3843	cf::sync_job {
3715	# this is a trade-off: we want to be very quick here, so	3844	cf::write_runtime_sync; # external watchdog should not bark
3716	# save all maps without fsync, and later call a global sync
3717	# (which in turn might be very very slow)
3718	local $USE_FSYNC = 0;
3719		3845
3720	# use a peculiar iteration method to avoid tripping on perl	3846	# use a peculiar iteration method to avoid tripping on perl
3721	# refcount bugs in for. also avoids problems with players	3847	# refcount bugs in for. also avoids problems with players
3722	# and maps saved/destroyed asynchronously.	3848	# and maps saved/destroyed asynchronously.
3723	warn "emergency_perl_save: begin player save\n";	3849	info "emergency_perl_save: begin player save\n";
3724	for my $login (keys %cf::PLAYER) {	3850	for my $login (keys %cf::PLAYER) {
3725	my $pl = $cf::PLAYER{$login} or next;	3851	my $pl = $cf::PLAYER{$login} or next;
3726	$pl->valid or next;	3852	$pl->valid or next;
3727	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3853	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3728	$pl->save;	3854	$pl->save;
3729	}	3855	}
3730	warn "emergency_perl_save: end player save\n";	3856	info "emergency_perl_save: end player save\n";
3731		3857
		3858	cf::write_runtime_sync; # external watchdog should not bark
		3859
3732	warn "emergency_perl_save: begin map save\n";	3860	info "emergency_perl_save: begin map save\n";
3733	for my $path (keys %cf::MAP) {	3861	for my $path (keys %cf::MAP) {
3734	my $map = $cf::MAP{$path} or next;	3862	my $map = $cf::MAP{$path} or next;
3735	$map->valid or next;	3863	$map->valid or next;
3736	$map->save;	3864	$map->save;
3737	}	3865	}
3738	warn "emergency_perl_save: end map save\n";	3866	info "emergency_perl_save: end map save\n";
3739		3867
		3868	cf::write_runtime_sync; # external watchdog should not bark
		3869
3740	warn "emergency_perl_save: begin database checkpoint\n";	3870	info "emergency_perl_save: begin database checkpoint\n";
3741	BDB::db_env_txn_checkpoint $DB_ENV;	3871	BDB::db_env_txn_checkpoint $DB_ENV;
3742	warn "emergency_perl_save: end database checkpoint\n";	3872	info "emergency_perl_save: end database checkpoint\n";
3743		3873
3744	warn "emergency_perl_save: begin write uuid\n";	3874	info "emergency_perl_save: begin write uuid\n";
3745	write_uuid_sync 1;	3875	write_uuid_sync 1;
3746	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
3747	};	3896	};
3748		3897
3749	warn "emergency_perl_save: starting sync()\n";
3750	IO::AIO::aio_sync sub {
3751	warn "emergency_perl_save: finished sync()\n";
3752	};
3753
3754	warn "emergency_perl_save: leave\n";	3898	info "emergency_perl_save: leave\n";
3755	}	3899	}
3756		3900
3757	sub post_cleanup {	3901	sub post_cleanup {
3758	my ($make_core) = @_;	3902	my ($make_core) = @_;
3759		3903
		3904	IO::AIO::flush;
		3905
3760	warn Carp::longmess "post_cleanup backtrace"	3906	error Carp::longmess "post_cleanup backtrace"
3761	if $make_core;	3907	if $make_core;
3762		3908
3763	my $fh = pidfile;	3909	my $fh = pidfile;
3764	unlink $PIDFILE if <$fh> == $$;	3910	unlink $PIDFILE if <$fh> == $$;
3765	}	3911	}
…		…
3785	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3931	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3786	for my $name (keys %$leaf_symtab) {	3932	for my $name (keys %$leaf_symtab) {
3787	_gv_clear *{"$pkg$name"};	3933	_gv_clear *{"$pkg$name"};
3788	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3934	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3789	}	3935	}
3790	warn "cleared package $pkg\n";#d#
3791	}	3936	}
3792		3937
3793	sub do_reload_perl() {	3938	sub do_reload_perl() {
3794	# can/must only be called in main	3939	# can/must only be called in main
3795	if ($Coro::current != $Coro::main) {	3940	unless (in_main) {
3796	warn "can only reload from main coroutine";	3941	error "can only reload from main coroutine";
3797	return;	3942	return;
3798	}	3943	}
3799		3944
3800	return if $RELOAD++;	3945	return if $RELOAD++;
3801		3946
3802	my $t1 = AE::time;	3947	my $t1 = AE::time;
3803		3948
3804	while ($RELOAD) {	3949	while ($RELOAD) {
3805	warn "reloading...";	3950	cf::get_slot 0.1, -1, "reload_perl";
		3951	info "perl_reload: reloading...";
3806		3952
3807	warn "entering sync_job";	3953	trace "perl_reload: entering sync_job";
3808		3954
3809	cf::sync_job {	3955	cf::sync_job {
3810	cf::write_runtime_sync; # external watchdog should not bark
3811	cf::emergency_save;	3956	#cf::emergency_save;
3812	cf::write_runtime_sync; # external watchdog should not bark
3813		3957
3814	warn "syncing database to disk";
3815	BDB::db_env_txn_checkpoint $DB_ENV;
3816
3817	# if anything goes wrong in here, we should simply crash as we already saved
3818
3819	warn "flushing outstanding aio requests";
3820	while (IO::AIO::nreqs || BDB::nreqs) {
3821	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3822	}
3823
3824	warn "cancelling all extension coros";	3958	trace "perl_reload: cancelling all extension coros";
3825	$_->cancel for values %EXT_CORO;	3959	$_->cancel for values %EXT_CORO;
3826	%EXT_CORO = ();	3960	%EXT_CORO = ();
3827		3961
3828	warn "removing commands";	3962	trace "perl_reload: removing commands";
3829	%COMMAND = ();	3963	%COMMAND = ();
3830		3964
3831	warn "removing ext/exti commands";	3965	trace "perl_reload: removing ext/exti commands";
3832	%EXTCMD = ();	3966	%EXTCMD = ();
3833	%EXTICMD = ();	3967	%EXTICMD = ();
3834		3968
3835	warn "unloading/nuking all extensions";	3969	trace "perl_reload: unloading/nuking all extensions";
3836	for my $pkg (@EXTS) {	3970	for my $pkg (@EXTS) {
3837	warn "... unloading $pkg";	3971	trace "... unloading $pkg";
3838		3972
3839	if (my $cb = $pkg->can ("unload")) {	3973	if (my $cb = $pkg->can ("unload")) {
3840	eval {	3974	eval {
3841	$cb->($pkg);	3975	$cb->($pkg);
3842	1	3976	1
3843	} or warn "$pkg unloaded, but with errors: $@";	3977	} or error "$pkg unloaded, but with errors: $@";
3844	}	3978	}
3845		3979
3846	warn "... clearing $pkg";	3980	trace "... clearing $pkg";
3847	clear_package $pkg;	3981	clear_package $pkg;
3848	}	3982	}
3849		3983
3850	warn "unloading all perl modules loaded from $LIBDIR";	3984	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3851	while (my ($k, $v) = each %INC) {	3985	while (my ($k, $v) = each %INC) {
3852	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3986	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3853		3987
3854	warn "... unloading $k";	3988	trace "... unloading $k";
3855	delete $INC{$k};	3989	delete $INC{$k};
3856		3990
3857	$k =~ s/\.pm$//;	3991	$k =~ s/\.pm$//;
3858	$k =~ s/\//::/g;	3992	$k =~ s/\//::/g;
3859		3993
…		…
3862	}	3996	}
3863		3997
3864	clear_package $k;	3998	clear_package $k;
3865	}	3999	}
3866		4000
3867	warn "getting rid of safe::, as good as possible";	4001	trace "perl_reload: getting rid of safe::, as good as possible";
3868	clear_package "safe::$_"	4002	clear_package "safe::$_"
3869	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);
3870		4004
3871	warn "unloading cf.pm \"a bit\"";	4005	trace "perl_reload: unloading cf.pm \"a bit\"";
3872	delete $INC{"cf.pm"};	4006	delete $INC{"cf.pm"};
3873	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4007	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3874		4008
3875	# don't, removes xs symbols, too,	4009	# don't, removes xs symbols, too,
3876	# and global variables created in xs	4010	# and global variables created in xs
3877	#clear_package __PACKAGE__;	4011	#clear_package __PACKAGE__;
3878		4012
3879	warn "unload completed, starting to reload now";	4013	info "perl_reload: unload completed, starting to reload now";
3880		4014
3881	warn "reloading cf.pm";	4015	trace "perl_reload: reloading cf.pm";
3882	require cf;	4016	require cf;
3883	cf::_connect_to_perl_1;	4017	cf::_connect_to_perl_1;
3884		4018
3885	warn "loading config and database again";	4019	trace "perl_reload: loading config and database again";
3886	cf::reload_config;	4020	cf::reload_config;
3887		4021
3888	warn "loading extensions";	4022	trace "perl_reload: loading extensions";
3889	cf::load_extensions;	4023	cf::load_extensions;
3890		4024
3891	if ($REATTACH_ON_RELOAD) {	4025	if ($REATTACH_ON_RELOAD) {
3892	warn "reattaching attachments to objects/players";	4026	trace "perl_reload: reattaching attachments to objects/players";
3893	_global_reattach; # objects, sockets	4027	_global_reattach; # objects, sockets
3894	warn "reattaching attachments to maps";	4028	trace "perl_reload: reattaching attachments to maps";
3895	reattach $_ for values %MAP;	4029	reattach $_ for values %MAP;
3896	warn "reattaching attachments to players";	4030	trace "perl_reload: reattaching attachments to players";
3897	reattach $_ for values %PLAYER;	4031	reattach $_ for values %PLAYER;
3898	}	4032	}
3899		4033
3900	warn "running post_init jobs";	4034	cf::_post_init 1;
3901	(pop @POST_INIT)->(1) while @POST_INIT;
3902		4035
3903	warn "leaving sync_job";	4036	trace "perl_reload: leaving sync_job";
3904		4037
3905	1	4038	1
3906	} or do {	4039	} or do {
3907	warn $@;	4040	error $@;
3908	cf::cleanup "error while reloading, exiting.";	4041	cf::cleanup "perl_reload: error, exiting.";
3909	};	4042	};
3910		4043
3911	warn "reloaded";
3912	--$RELOAD;	4044	--$RELOAD;
3913	}	4045	}
3914		4046
3915	$t1 = AE::time - $t1;	4047	$t1 = AE::time - $t1;
3916	warn "reload completed in ${t1}s\n";	4048	info "perl_reload: completed in ${t1}s\n";
3917	};	4049	};
3918		4050
3919	our $RELOAD_WATCHER; # used only during reload	4051	our $RELOAD_WATCHER; # used only during reload
3920		4052
3921	sub reload_perl() {	4053	sub reload_perl() {
…		…
3942	reload_perl;	4074	reload_perl;
3943	};	4075	};
3944	}	4076	}
3945	};	4077	};
3946		4078
3947	unshift @INC, $LIBDIR;	4079	#############################################################################
3948		4080
3949	my $bug_warning = 0;	4081	my $bug_warning = 0;
3950		4082
3951	our @WAIT_FOR_TICK;
3952	our @WAIT_FOR_TICK_BEGIN;
3953
3954	sub wait_for_tick {	4083	sub wait_for_tick() {
3955	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4084	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3956		4085
3957	my $signal = new Coro::Signal;	4086	$WAIT_FOR_TICK->wait;
3958	push @WAIT_FOR_TICK, $signal;
3959	$signal->wait;
3960	}	4087	}
3961		4088
3962	sub wait_for_tick_begin {	4089	sub wait_for_tick_begin() {
3963	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4090	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3964		4091
3965	my $signal = new Coro::Signal;	4092	my $signal = new Coro::Signal;
3966	push @WAIT_FOR_TICK_BEGIN, $signal;	4093	push @WAIT_FOR_TICK_BEGIN, $signal;
3967	$signal->wait;	4094	$signal->wait;
3968	}	4095	}
…		…
3972	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"
3973	unless ++$bug_warning > 10;	4100	unless ++$bug_warning > 10;
3974	return;	4101	return;
3975	}	4102	}
3976		4103
3977	cf::server_tick; # one server iteration	4104	cf::one_tick; # one server iteration
3978		4105
3979	#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#
3980		4107
3981	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4108	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3982	$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.;
3983	Coro::async_pool {	4110	Coro::async_pool {
3984	$Coro::current->{desc} = "runtime saver";	4111	$Coro::current->{desc} = "runtime saver";
3985	write_runtime_sync	4112	write_runtime_sync
3986	or warn "ERROR: unable to write runtime file: $!";	4113	or error "ERROR: unable to write runtime file: $!";
3987	};	4114	};
3988	}	4115	}
3989		4116
3990	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4117	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3991	$sig->send;	4118	$sig->send;
3992	}	4119	}
3993	while (my $sig = shift @WAIT_FOR_TICK) {	4120	$WAIT_FOR_TICK->broadcast;
3994	$sig->send;
3995	}
3996		4121
3997	$LOAD = ($NOW - $TICK_START) / $TICK;	4122	$LOAD = ($NOW - $TICK_START) / $TICK;
3998	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4123	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3999		4124
4000	if (0) {	4125	if (0) {
4001	if ($NEXT_TICK) {	4126	if ($NEXT_TICK) {
4002	my $jitter = $TICK_START - $NEXT_TICK;	4127	my $jitter = $TICK_START - $NEXT_TICK;
4003	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4128	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
4004	warn "jitter $JITTER\n";#d#	4129	debug "jitter $JITTER\n";#d#
4005	}	4130	}
4006	}	4131	}
4007	}	4132	}
4008		4133
4009	{	4134	{
4010	# configure BDB	4135	# configure BDB
4011		4136
4012	BDB::min_parallel 16;	4137	BDB::min_parallel 16;
4013	BDB::max_poll_reqs $TICK * 0.1;	4138	BDB::max_poll_reqs $TICK * 0.1;
4014	$AnyEvent::BDB::WATCHER->priority (1);	4139	#$AnyEvent::BDB::WATCHER->priority (1);
4015		4140
4016	unless ($DB_ENV) {	4141	unless ($DB_ENV) {
4017	$DB_ENV = BDB::db_env_create;	4142	$DB_ENV = BDB::db_env_create;
4018	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4143	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4019	$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;
…		…
4054	IO::AIO::min_parallel 8;	4179	IO::AIO::min_parallel 8;
4055	IO::AIO::max_poll_time $TICK * 0.1;	4180	IO::AIO::max_poll_time $TICK * 0.1;
4056	undef $AnyEvent::AIO::WATCHER;	4181	undef $AnyEvent::AIO::WATCHER;
4057	}	4182	}
4058		4183
4059	my $_log_backtrace;	4184	our $_log_backtrace;
		4185	our $_log_backtrace_last;
4060		4186
4061	sub _log_backtrace {	4187	sub _log_backtrace {
4062	my ($msg, @addr) = @_;	4188	my ($msg, @addr) = @_;
4063		4189
4064	$msg =~ s/\n//;	4190	$msg =~ s/\n$//;
4065		4191
		4192	if ($_log_backtrace_last eq $msg) {
		4193	LOG llevInfo, "[ABT] $msg\n";
		4194	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4066	# limit the # of concurrent backtraces	4195	# limit the # of concurrent backtraces
4067	if ($_log_backtrace < 2) {	4196	} elsif ($_log_backtrace < 2) {
		4197	$_log_backtrace_last = $msg;
4068	++$_log_backtrace;	4198	++$_log_backtrace;
4069	my $perl_bt = Carp::longmess $msg;	4199	my $perl_bt = Carp::longmess $msg;
4070	async {	4200	async {
4071	$Coro::current->{desc} = "abt $msg";	4201	$Coro::current->{desc} = "abt $msg";
4072		4202
…		…
4092	LOG llevInfo, "[ABT] $_\n" for @bt;	4222	LOG llevInfo, "[ABT] $_\n" for @bt;
4093	--$_log_backtrace;	4223	--$_log_backtrace;
4094	};	4224	};
4095	} else {	4225	} else {
4096	LOG llevInfo, "[ABT] $msg\n";	4226	LOG llevInfo, "[ABT] $msg\n";
4097	LOG llevInfo, "[ABT] [suppressed]\n";	4227	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4098	}	4228	}
4099	}	4229	}
4100		4230
4101	# load additional modules	4231	# load additional modules
4102	require "cf/$_.pm" for @EXTRA_MODULES;	4232	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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