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.523 by root, Sat Apr 17 02:39:46 2010 UTC vs.
Revision 1.572 by root, Sun May 8 11:44:43 2011 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 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
…		…
188		197
189	=over 4	198	=over 4
190		199
191	=item $cf::UPTIME	200	=item $cf::UPTIME
192		201
193	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.
194		218
195	=item $cf::RUNTIME	219	=item $cf::RUNTIME
196		220
197	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
198	every server tick.	222	every server tick.
…		…
204	Various directories - "/etc", read-only install directory, perl-library	228	Various directories - "/etc", read-only install directory, perl-library
205	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	229	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
206	unique-items directory, player file directory, random maps directory and	230	unique-items directory, player file directory, random maps directory and
207	database environment.	231	database environment.
208		232
209	=item $cf::NOW
210
211	The time of the last (current) server tick.
212
213	=item $cf::TICK
214
215	The interval between server ticks, in seconds.
216
217	=item $cf::LOADAVG	233	=item $cf::LOADAVG
218		234
219	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
220	(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
221	objects per tick. Healthy values are < 0.5.	237	objects per tick. Healthy values are < 0.5.
…		…
230	from wherever your confdir points to.	246	from wherever your confdir points to.
231		247
232	=item cf::wait_for_tick, cf::wait_for_tick_begin	248	=item cf::wait_for_tick, cf::wait_for_tick_begin
233		249
234	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
235	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
236	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();
237		270
238	=item @cf::INVOKE_RESULTS	271	=item @cf::INVOKE_RESULTS
239		272
240	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
241	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
…		…
249		282
250	=back	283	=back
251		284
252	=cut	285	=cut
253		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
254	$Coro::State::WARNHOOK = sub {	293	$Coro::State::WARNHOOK = sub {
255	my $msg = join "", @_;	294	my $msg = join "", @_;
256		295
257	$msg .= "\n"	296	$msg .= "\n"
258	unless $msg =~ /\n$/;	297	unless $msg =~ /\n$/;
259		298
260	$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;
261		300
262	LOG llevError, $msg;	301	LOG llevWarn, $msg;
263	};	302	};
264		303
265	$Coro::State::DIEHOOK = sub {	304	$Coro::State::DIEHOOK = sub {
266	return unless $^S eq 0; # "eq", not "=="	305	return unless $^S eq 0; # "eq", not "=="
267		306
268	warn Carp::longmess $_[0];	307	error Carp::longmess $_[0];
269		308
270	if (in_main) {#d#	309	if (in_main) {#d#
271	warn "DIEHOOK called in main context, Coro bug?\n";#d#	310	error "DIEHOOK called in main context, Coro bug?\n";#d#
272	return;#d#	311	return;#d#
273	}#d#	312	}#d#
274		313
275	# kill coroutine otherwise	314	# kill coroutine otherwise
276	Coro::terminate	315	Coro::terminate
…		…
298	}	337	}
299		338
300	$EV::DIED = sub {	339	$EV::DIED = sub {
301	Carp::cluck "error in event callback: @_";	340	Carp::cluck "error in event callback: @_";
302	};	341	};
		342
		343	#############################################################################
		344
		345	sub fork_call(&@);
		346	sub get_slot($;$$);
303		347
304	#############################################################################	348	#############################################################################
305		349
306	=head2 UTILITY FUNCTIONS	350	=head2 UTILITY FUNCTIONS
307		351
…		…
328	$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;
329	$d	373	$d
330	} || "[unable to dump $_[0]: '$@']";	374	} || "[unable to dump $_[0]: '$@']";
331	}	375	}
332		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
333	=item $ref = cf::decode_json $json	391	=item $ref = cf::decode_json $json
334		392
335	Converts a JSON string into the corresponding perl data structure.	393	Converts a JSON string into the corresponding perl data structure.
336		394
337	=item $json = cf::encode_json $ref	395	=item $json = cf::encode_json $ref
…		…
343	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
344		402
345	sub encode_json($) { $json_coder->encode ($_[0]) }	403	sub encode_json($) { $json_coder->encode ($_[0]) }
346	sub decode_json($) { $json_coder->decode ($_[0]) }	404	sub decode_json($) { $json_coder->decode ($_[0]) }
347		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
348	=item cf::post_init { BLOCK }	437	=item cf::post_init { BLOCK }
349		438
350	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,
351	but I<before> the server starts ticking again.	440	but I<before> the server starts ticking again.
352		441
353	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
354	is a reload or not.	443	is a reload or not.
355		444
356	=cut	445	=cut
357		446
358	sub post_init(&) {	447	sub post_init(&) {
359	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	}
360	}	466	}
361		467
362	=item cf::lock_wait $string	468	=item cf::lock_wait $string
363		469
364	Wait until the given lock is available. See cf::lock_acquire.	470	Wait until the given lock is available. See cf::lock_acquire.
…		…
417	EV::periodic $start, $interval, 0, $cb	523	EV::periodic $start, $interval, 0, $cb
418	}	524	}
419		525
420	=item cf::get_slot $time[, $priority[, $name]]	526	=item cf::get_slot $time[, $priority[, $name]]
421		527
422	Allocate $time seconds of blocking CPU time at priority C<$priority>:	528	Allocate $time seconds of blocking CPU time at priority C<$priority>
423	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
424	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.
425		535
426	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
427	used for statistical purposes and should identify the same time-class.	537	used for statistical purposes and should identify the same time-class.
428		538
429	Useful for short background jobs.	539	Useful for short background jobs.
…		…
458	}	568	}
459	}	569	}
460		570
461	if (@SLOT_QUEUE) {	571	if (@SLOT_QUEUE) {
462	# 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
463	push @cf::WAIT_FOR_TICK, $signal;	573	$WAIT_FOR_TICK->wait;
464	$signal->wait;
465	} else {	574	} else {
466	$busy = 0;	575	$busy = 0;
467	Coro::schedule;	576	Coro::schedule;
468	}	577	}
469	}	578	}
…		…
509	=cut	618	=cut
510		619
511	sub sync_job(&) {	620	sub sync_job(&) {
512	my ($job) = @_;	621	my ($job) = @_;
513		622
514	if ($Coro::current == $Coro::main) {	623	if (in_main) {
515	my $time = AE::time;	624	my $time = AE::time;
516		625
517	# this is the main coro, too bad, we have to block	626	# this is the main coro, too bad, we have to block
518	# till the operation succeeds, freezing the server :/	627	# till the operation succeeds, freezing the server :/
519		628
520	LOG llevError, Carp::longmess "sync job";#d#	629	#LOG llevError, Carp::longmess "sync job";#d#
521		630
522	my $freeze_guard = freeze_mainloop;	631	my $freeze_guard = freeze_mainloop;
523		632
524	my $busy = 1;	633	my $busy = 1;
525	my @res;	634	my @res;
526		635
527	(async {	636	(async {
528	$Coro::current->desc ("sync job coro");	637	$Coro::current->desc ("sync job coro");
529	@res = eval { $job->() };	638	@res = eval { $job->() };
530	warn $@ if $@;	639	error $@ if $@;
531	undef $busy;	640	undef $busy;
532	})->prio (Coro::PRIO_MAX);	641	})->prio (Coro::PRIO_MAX);
533		642
534	while ($busy) {	643	while ($busy) {
535	if (Coro::nready) {	644	if (Coro::nready) {
…		…
569	$EXT_CORO{$coro+0} = $coro;	678	$EXT_CORO{$coro+0} = $coro;
570		679
571	$coro	680	$coro
572	}	681	}
573		682
574	=item fork_call { }, $args	683	=item fork_call { }, @args
575		684
576	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
577	process, returning the results. Everything must be serialisable with	686	process, returning the results. Everything must be serialisable with
578	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
579	never block itself or use any form of event handling.	688	never block itself or use any form of event handling.
580		689
581	=cut	690	=cut
582		691
		692	sub post_fork {
		693	reset_signals;
		694	}
		695
583	sub fork_call(&@) {	696	sub fork_call(&@) {
584	my ($cb, @args) = @_;	697	my ($cb, @args) = @_;
585		698
586	# 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,
587	# otherwise perl prematurely frees the stuff :/	700	# otherwise perl prematurely frees the stuff :/
588	# TODO: investigate and fix (likely this will be rather laborious)	701	# TODO: investigate and fix (likely this will be rather laborious)
589		702
590	my @res = Coro::Util::fork_eval {	703	my @res = Coro::Util::fork_eval {
591	reset_signals;	704	cf::post_fork;
592	&$cb	705	&$cb
593	}, @args;	706	} @args;
594		707
595	wantarray ? @res : $res[-1]	708	wantarray ? @res : $res[-1]
596	}	709	}
597		710
598	sub objinfo {	711	sub objinfo {
…		…
648	within each server.	761	within each server.
649		762
650	=cut	763	=cut
651		764
652	sub db_table($) {	765	sub db_table($) {
		766	cf::error "db_get called from main context"
		767	if $Coro::current == $Coro::main;
		768
653	my ($name) = @_;	769	my ($name) = @_;
654	my $db = BDB::db_create $DB_ENV;	770	my $db = BDB::db_create $DB_ENV;
655		771
656	eval {	772	eval {
657	$db->set_flags (BDB::CHKSUM);	773	$db->set_flags (BDB::CHKSUM);
…		…
667	}	783	}
668		784
669	our $DB;	785	our $DB;
670		786
671	sub db_init {	787	sub db_init {
672	cf::sync_job {
673	$DB ||= db_table "db";	788	$DB ||= db_table "db";
674	};
675	}	789	}
676		790
677	sub db_get($$) {	791	sub db_get($$) {
678	my $key = "$_[0]/$_[1]";	792	my $key = "$_[0]/$_[1]";
679		793
680	cf::sync_job {	794	cf::error "db_get called from main context"
		795	if $Coro::current == $Coro::main;
		796
681	BDB::db_get $DB, undef, $key, my $data;	797	BDB::db_get $DB, undef, $key, my $data;
682		798
683	$! ? ()	799	$! ? ()
684	: $data	800	: $data
685	}
686	}	801	}
687		802
688	sub db_put($$$) {	803	sub db_put($$$) {
689	BDB::dbreq_pri 4;	804	BDB::dbreq_pri 4;
690	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	805	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
718		833
719	my @data;	834	my @data;
720	my $md5;	835	my $md5;
721		836
722	for (0 .. $#$src) {	837	for (0 .. $#$src) {
723	0 <= aio_load $src->[$_], $data[$_]	838	$data[$_] = load_file $src->[$_];
724	or Carp::croak "$src->[$_]: $!";
725	}	839	}
726		840
727	# if processing is expensive, check	841	# if processing is expensive, check
728	# checksum first	842	# checksum first
729	if (1) {	843	if (1) {
…		…
746		860
747	my $t1 = Time::HiRes::time;	861	my $t1 = Time::HiRes::time;
748	my $data = $process->(\@data);	862	my $data = $process->(\@data);
749	my $t2 = Time::HiRes::time;	863	my $t2 = Time::HiRes::time;
750		864
751	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	865	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
752		866
753	db_put cache => "$id/data", $data;	867	db_put cache => "$id/data", $data;
754	db_put cache => "$id/md5" , $md5;	868	db_put cache => "$id/md5" , $md5;
755	db_put cache => "$id/meta", $meta;	869	db_put cache => "$id/meta", $meta;
756		870
…		…
766		880
767	=cut	881	=cut
768		882
769	sub datalog($@) {	883	sub datalog($@) {
770	my ($type, %kv) = @_;	884	my ($type, %kv) = @_;
771	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	885	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
772	}	886	}
773		887
774	=back	888	=back
775		889
776	=cut	890	=cut
…		…
971		1085
972	} elsif (exists $cb_id{$type}) {	1086	} elsif (exists $cb_id{$type}) {
973	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1087	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
974		1088
975	} elsif (ref $type) {	1089	} elsif (ref $type) {
976	warn "attaching objects not supported, ignoring.\n";	1090	error "attaching objects not supported, ignoring.\n";
977		1091
978	} else {	1092	} else {
979	shift @arg;	1093	shift @arg;
980	warn "attach argument '$type' not supported, ignoring.\n";	1094	error "attach argument '$type' not supported, ignoring.\n";
981	}	1095	}
982	}	1096	}
983	}	1097	}
984		1098
985	sub _object_attach {	1099	sub _object_attach {
…		…
995	_attach $registry, $klass, @attach;	1109	_attach $registry, $klass, @attach;
996	}	1110	}
997		1111
998	$obj->{$name} = \%arg;	1112	$obj->{$name} = \%arg;
999	} else {	1113	} else {
1000	warn "object uses attachment '$name' which is not available, postponing.\n";	1114	info "object uses attachment '$name' which is not available, postponing.\n";
1001	}	1115	}
1002		1116
1003	$obj->{_attachment}{$name} = undef;	1117	$obj->{_attachment}{$name} = undef;
1004	}	1118	}
1005		1119
…		…
1064		1178
1065	for (@$callbacks) {	1179	for (@$callbacks) {
1066	eval { &{$_->[1]} };	1180	eval { &{$_->[1]} };
1067		1181
1068	if ($@) {	1182	if ($@) {
1069	warn "$@";
1070	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1183	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1071	override;	1184	override;
1072	}	1185	}
1073		1186
1074	return 1 if $override;	1187	return 1 if $override;
1075	}	1188	}
…		…
1154	for (@$attach) {	1267	for (@$attach) {
1155	my ($klass, @attach) = @$_;	1268	my ($klass, @attach) = @$_;
1156	_attach $registry, $klass, @attach;	1269	_attach $registry, $klass, @attach;
1157	}	1270	}
1158	} else {	1271	} else {
1159	warn "object uses attachment '$name' that is not available, postponing.\n";	1272	info "object uses attachment '$name' that is not available, postponing.\n";
1160	}	1273	}
1161	}	1274	}
1162	}	1275	}
1163		1276
1164	cf::attachable->attach (	1277	cf::attachable->attach (
…		…
1191	my ($filename, $rdata, $objs) = @_;	1304	my ($filename, $rdata, $objs) = @_;
1192		1305
1193	sync_job {	1306	sync_job {
1194	if (length $$rdata) {	1307	if (length $$rdata) {
1195	utf8::decode (my $decname = $filename);	1308	utf8::decode (my $decname = $filename);
1196	warn sprintf "saving %s (%d,%d)\n",	1309	trace sprintf "saving %s (%d,%d)\n",
1197	$decname, length $$rdata, scalar @$objs;	1310	$decname, length $$rdata, scalar @$objs
		1311	if $VERBOSE_IO;
1198		1312
1199	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1313	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1200	aio_chmod $fh, SAVE_MODE;	1314	aio_chmod $fh, SAVE_MODE;
1201	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1315	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1202	if ($cf::USE_FSYNC) {	1316	if ($cf::USE_FSYNC) {
…		…
1224	aio_rename "$filename~", $filename;	1338	aio_rename "$filename~", $filename;
1225		1339
1226	$filename =~ s%/[^/]+$%%;	1340	$filename =~ s%/[^/]+$%%;
1227	aio_pathsync $filename if $cf::USE_FSYNC;	1341	aio_pathsync $filename if $cf::USE_FSYNC;
1228	} else {	1342	} else {
1229	warn "unable to save objects: $filename~: $!\n";	1343	error "unable to save objects: $filename~: $!\n";
1230	}	1344	}
1231	} else {	1345	} else {
1232	aio_unlink $filename;	1346	aio_unlink $filename;
1233	aio_unlink "$filename.pst";	1347	aio_unlink "$filename.pst";
1234	}	1348	}
…		…
1258	my $st = eval { Coro::Storable::thaw $av };	1372	my $st = eval { Coro::Storable::thaw $av };
1259	$av = $st->{objs};	1373	$av = $st->{objs};
1260	}	1374	}
1261		1375
1262	utf8::decode (my $decname = $filename);	1376	utf8::decode (my $decname = $filename);
1263	warn sprintf "loading %s (%d,%d)\n",	1377	trace sprintf "loading %s (%d,%d)\n",
1264	$decname, length $data, scalar @{$av || []};	1378	$decname, length $data, scalar @{$av || []}
		1379	if $VERBOSE_IO;
1265		1380
1266	($data, $av)	1381	($data, $av)
1267	}	1382	}
1268		1383
1269	=head2 COMMAND CALLBACKS	1384	=head2 COMMAND CALLBACKS
…		…
1361		1476
1362	$pl->ext_reply ($reply, @reply)	1477	$pl->ext_reply ($reply, @reply)
1363	if $reply;	1478	if $reply;
1364		1479
1365	} else {	1480	} else {
1366	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1481	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1367	}	1482	}
1368		1483
1369	cf::override;	1484	cf::override;
1370	},	1485	},
1371	);	1486	);
…		…
1382		1497
1383	$grp	1498	$grp
1384	}	1499	}
1385		1500
1386	sub load_extensions {	1501	sub load_extensions {
		1502	info "loading extensions...";
		1503
1387	cf::sync_job {	1504	cf::sync_job {
1388	my %todo;	1505	my %todo;
1389		1506
1390	for my $path (<$LIBDIR/*.ext>) {	1507	for my $path (<$LIBDIR/*.ext>) {
1391	next unless -r $path;	1508	next unless -r $path;
…		…
1409		1526
1410	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1527	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1411	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1528	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1412		1529
1413	$ext{source} =	1530	$ext{source} =
1414	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1531	"package $pkg; use common::sense;\n"
1415	. "#line 1 \"$path\"\n{\n"	1532	. "#line 1 \"$path\"\n{\n"
1416	. $source	1533	. $source
1417	. "\n};\n1";	1534	. "\n};\n1";
1418		1535
1419	$todo{$base} = \%ext;	1536	$todo{$base} = \%ext;
…		…
1431	for (split /,\s*/, $v->{meta}{depends}) {	1548	for (split /,\s*/, $v->{meta}{depends}) {
1432	next ext	1549	next ext
1433	unless exists $done{$_};	1550	unless exists $done{$_};
1434	}	1551	}
1435		1552
1436	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1553	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1437		1554
1438	my $active = eval $v->{source};	1555	my $active = eval $v->{source};
1439		1556
1440	if (length $@) {	1557	if (length $@) {
1441	warn "$v->{path}: $@\n";	1558	error "$v->{path}: $@\n";
1442		1559
1443	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1560	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1444	if exists $v->{meta}{mandatory};	1561	if exists $v->{meta}{mandatory};
1445		1562
1446	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";	1563	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
…		…
1448	} else {	1565	} else {
1449	$done{$k} = delete $todo{$k};	1566	$done{$k} = delete $todo{$k};
1450	push @EXTS, $v->{pkg};	1567	push @EXTS, $v->{pkg};
1451	$progress = 1;	1568	$progress = 1;
1452		1569
1453	warn "$v->{base}: extension inactive.\n"	1570	info "$v->{base}: extension inactive.\n"
1454	unless $active;	1571	unless $active;
1455	}	1572	}
1456	}	1573	}
1457		1574
1458	unless ($progress) {	1575	unless ($progress) {
…		…
1460		1577
1461	while (my ($k, $v) = each %todo) {	1578	while (my ($k, $v) = each %todo) {
1462	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1579	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463	if exists $v->{meta}{mandatory};	1580	if exists $v->{meta}{mandatory};
1464	}	1581	}
		1582
		1583	last;
1465	}	1584	}
1466	}	1585	}
1467	};	1586	};
1468	}	1587	}
1469		1588
…		…
1627	my $name = $pl->ob->name;	1746	my $name = $pl->ob->name;
1628		1747
1629	$pl->{deny_save} = 1;	1748	$pl->{deny_save} = 1;
1630	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1749	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1631		1750
1632	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1751	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1633	$pl->deactivate;	1752	$pl->deactivate;
		1753
1634	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1754	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635	$pl->ob->check_score;
1636	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1755	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1756	ext::highscore::check ($pl->ob);
		1757
1637	$pl->ns->destroy if $pl->ns;	1758	$pl->ns->destroy if $pl->ns;
1638		1759
1639	my $path = playerdir $pl;	1760	my $path = playerdir $pl;
1640	my $temp = "$path~$cf::RUNTIME~deleting~";	1761	my $temp = "$path~$cf::RUNTIME~deleting~";
1641	aio_rename $path, $temp;	1762	aio_rename $path, $temp;
…		…
1807	sub generate_random_map {	1928	sub generate_random_map {
1808	my ($self, $rmp) = @_;	1929	my ($self, $rmp) = @_;
1809		1930
1810	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1931	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1811		1932
1812	# mit "rum" bekleckern, nicht
1813	$self->_create_random_map (	1933	$self->_create_random_map ($rmp);
1814	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1815	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1816	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1817	$rmp->{exit_on_final_map},
1818	$rmp->{xsize}, $rmp->{ysize},
1819	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1820	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1821	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1822	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1823	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1824	(cf::region::find $rmp->{region}), $rmp->{custom}
1825	)
1826	}	1934	}
1827		1935
1828	=item cf::map->register ($regex, $prio)	1936	=item cf::map->register ($regex, $prio)
1829		1937
1830	Register a handler for the map path matching the given regex at the	1938	Register a handler for the map path matching the given regex at the
…		…
1835		1943
1836	sub register {	1944	sub register {
1837	my (undef, $regex, $prio) = @_;	1945	my (undef, $regex, $prio) = @_;
1838	my $pkg = caller;	1946	my $pkg = caller;
1839		1947
1840	no strict;
1841	push @{"$pkg\::ISA"}, __PACKAGE__;	1948	push @{"$pkg\::ISA"}, __PACKAGE__;
1842		1949
1843	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1950	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1844	}	1951	}
1845		1952
1846	# also paths starting with '/'	1953	# also paths starting with '/'
1847	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1954	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1848		1955
1849	sub thawer_merge {	1956	sub thawer_merge {
1850	my ($self, $merge) = @_;	1957	my ($self, $merge) = @_;
1851		1958
1852	# we have to keep some variables in memory intact	1959	# we have to keep some variables in memory intact
…		…
1857	}	1964	}
1858		1965
1859	sub normalise {	1966	sub normalise {
1860	my ($path, $base) = @_;	1967	my ($path, $base) = @_;
1861		1968
1862	$path = "$path"; # make sure its a string	1969	$path = "$path"; # make sure it's a string
1863		1970
1864	$path =~ s/\.map$//;	1971	$path =~ s/\.map$//;
1865		1972
1866	# map plan:	1973	# map plan:
1867	#	1974	#
…		…
1882	$base =~ s{[^/]+/?$}{};	1989	$base =~ s{[^/]+/?$}{};
1883	$path = "$base/$path";	1990	$path = "$base/$path";
1884	}	1991	}
1885		1992
1886	for ($path) {	1993	for ($path) {
1887	redo if s{//}{/};
1888	redo if s{/\.?/}{/};	1994	redo if s{/\.?/}{/};
1889	redo if s{/[^/]+/\.\./}{/};	1995	redo if s{/[^/]+/\.\./}{/};
1890	}	1996	}
1891		1997
1892	$path	1998	$path
…		…
1906	$self->init; # pass $1 etc.	2012	$self->init; # pass $1 etc.
1907	return $self;	2013	return $self;
1908	}	2014	}
1909	}	2015	}
1910		2016
1911	Carp::cluck "unable to resolve path '$path' (base '$base').";	2017	Carp::cluck "unable to resolve path '$path' (base '$base')";
1912	()	2018	()
1913	}	2019	}
1914		2020
		2021	# may re-bless or do other evil things
1915	sub init {	2022	sub init {
1916	my ($self) = @_;	2023	my ($self) = @_;
1917		2024
1918	$self	2025	$self
1919	}	2026	}
…		…
1984	$self->{load_path} = $path;	2091	$self->{load_path} = $path;
1985		2092
1986	1	2093	1
1987	}	2094	}
1988		2095
		2096	# used to laod the header of an original map
1989	sub load_header_orig {	2097	sub load_header_orig {
1990	my ($self) = @_;	2098	my ($self) = @_;
1991		2099
1992	$self->load_header_from ($self->load_path)	2100	$self->load_header_from ($self->load_path)
1993	}	2101	}
1994		2102
		2103	# used to laod the header of an instantiated map
1995	sub load_header_temp {	2104	sub load_header_temp {
1996	my ($self) = @_;	2105	my ($self) = @_;
1997		2106
1998	$self->load_header_from ($self->save_path)	2107	$self->load_header_from ($self->save_path)
1999	}	2108	}
2000		2109
		2110	# called after loading the header from an instantiated map
2001	sub prepare_temp {	2111	sub prepare_temp {
2002	my ($self) = @_;	2112	my ($self) = @_;
2003		2113
2004	$self->last_access ((delete $self->{last_access})	2114	$self->last_access ((delete $self->{last_access})
2005	|| $cf::RUNTIME); #d#	2115	|| $cf::RUNTIME); #d#
2006	# safety	2116	# safety
2007	$self->{instantiate_time} = $cf::RUNTIME	2117	$self->{instantiate_time} = $cf::RUNTIME
2008	if $self->{instantiate_time} > $cf::RUNTIME;	2118	if $self->{instantiate_time} > $cf::RUNTIME;
2009	}	2119	}
2010		2120
		2121	# called after loading the header from an original map
2011	sub prepare_orig {	2122	sub prepare_orig {
2012	my ($self) = @_;	2123	my ($self) = @_;
2013		2124
2014	$self->{load_original} = 1;	2125	$self->{load_original} = 1;
2015	$self->{instantiate_time} = $cf::RUNTIME;	2126	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2039		2150
2040	sub find;	2151	sub find;
2041	sub find {	2152	sub find {
2042	my ($path, $origin) = @_;	2153	my ($path, $origin) = @_;
2043		2154
		2155	cf::cede_to_tick;
		2156
2044	$path = normalise $path, $origin && $origin->path;	2157	$path = normalise $path, $origin;
2045		2158
2046	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2159	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2047	my $guard2 = cf::lock_acquire "map_find:$path";	2160	my $guard2 = cf::lock_acquire "map_find:$path";
2048		2161
2049	$cf::MAP{$path} || do {	2162	$cf::MAP{$path} || do {
…		…
2080		2193
2081	{	2194	{
2082	my $guard = cf::lock_acquire "map_data:$path";	2195	my $guard = cf::lock_acquire "map_data:$path";
2083		2196
2084	return unless $self->valid;	2197	return unless $self->valid;
2085	return unless $self->in_memory == cf::MAP_SWAPPED;	2198	return unless $self->state == cf::MAP_SWAPPED;
2086
2087	$self->in_memory (cf::MAP_LOADING);
2088		2199
2089	$self->alloc;	2200	$self->alloc;
2090		2201
2091	$self->pre_load;	2202	$self->pre_load;
2092	cf::cede_to_tick;	2203	cf::cede_to_tick;
2093		2204
		2205	if (exists $self->{load_path}) {
2094	my $f = new_from_file cf::object::thawer $self->{load_path};	2206	my $f = new_from_file cf::object::thawer $self->{load_path};
2095	$f->skip_block;	2207	$f->skip_block;
2096	$self->_load_objects ($f)	2208	$self->_load_objects ($f)
2097	or return;	2209	or return;
2098		2210
2099	$self->post_load_original	2211	$self->post_load_original
2100	if delete $self->{load_original};	2212	if delete $self->{load_original};
2101		2213
2102	if (my $uniq = $self->uniq_path) {	2214	if (my $uniq = $self->uniq_path) {
2103	utf8::encode $uniq;	2215	utf8::encode $uniq;
2104	unless (aio_stat $uniq) {	2216	unless (aio_stat $uniq) {
2105	if (my $f = new_from_file cf::object::thawer $uniq) {	2217	if (my $f = new_from_file cf::object::thawer $uniq) {
2106	$self->clear_unique_items;	2218	$self->clear_unique_items;
2107	$self->_load_objects ($f);	2219	$self->_load_objects ($f);
2108	$f->resolve_delayed_derefs;	2220	$f->resolve_delayed_derefs;
		2221	}
2109	}	2222	}
2110	}	2223	}
2111	}
2112		2224
2113	$f->resolve_delayed_derefs;	2225	$f->resolve_delayed_derefs;
		2226	} else {
		2227	$self->post_load_original
		2228	if delete $self->{load_original};
		2229	}
		2230
		2231	$self->state (cf::MAP_INACTIVE);
2114		2232
2115	cf::cede_to_tick;	2233	cf::cede_to_tick;
2116	# now do the right thing for maps	2234	# now do the right thing for maps
2117	$self->link_multipart_objects;	2235	$self->link_multipart_objects;
2118	$self->difficulty ($self->estimate_difficulty)	2236	$self->difficulty ($self->estimate_difficulty)
…		…
2121		2239
2122	unless ($self->{deny_activate}) {	2240	unless ($self->{deny_activate}) {
2123	$self->decay_objects;	2241	$self->decay_objects;
2124	$self->fix_auto_apply;	2242	$self->fix_auto_apply;
2125	$self->update_buttons;	2243	$self->update_buttons;
		2244	$self->post_load_physics;
2126	cf::cede_to_tick;	2245	cf::cede_to_tick;
2127	$self->activate;	2246	#$self->activate; # no longer activate maps automatically
2128	}	2247	}
2129		2248
2130	$self->{last_save} = $cf::RUNTIME;	2249	$self->{last_save} = $cf::RUNTIME;
2131	$self->last_access ($cf::RUNTIME);	2250	$self->last_access ($cf::RUNTIME);
2132
2133	$self->in_memory (cf::MAP_ACTIVE);
2134	}	2251	}
2135		2252
2136	$self->post_load;	2253	$self->post_load;
		2254
		2255	1
2137	}	2256	}
2138		2257
2139	# customize the map for a given player, i.e.	2258	# customize the map for a given player, i.e.
2140	# return the _real_ map. used by e.g. per-player	2259	# return the _real_ map. used by e.g. per-player
2141	# maps to change the path to ~playername/mappath	2260	# maps to change the path to ~playername/mappath
…		…
2162	or next;	2281	or next;
2163	$neigh = find $neigh, $map	2282	$neigh = find $neigh, $map
2164	or next;	2283	or next;
2165	$neigh->load;	2284	$neigh->load;
2166		2285
		2286	# now find the diagonal neighbours
2167	push @neigh,	2287	push @neigh,
2168	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2288	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2169	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2289	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2170	}	2290	}
2171		2291
…		…
2178	}	2298	}
2179		2299
2180	sub find_sync {	2300	sub find_sync {
2181	my ($path, $origin) = @_;	2301	my ($path, $origin) = @_;
2182		2302
2183	cf::sync_job { find $path, $origin }	2303	# it's a bug to call this from the main context
		2304	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2305	if $Coro::current == $Coro::main;
		2306
		2307	find $path, $origin
2184	}	2308	}
2185		2309
2186	sub do_load_sync {	2310	sub do_load_sync {
2187	my ($map) = @_;	2311	my ($map) = @_;
2188		2312
		2313	# it's a bug to call this from the main context
2189	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2314	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2190	if $Coro::current == $Coro::main;	2315	if $Coro::current == $Coro::main;
2191		2316
2192	cf::sync_job { $map->load };	2317	$map->load;
2193	}	2318	}
2194		2319
2195	our %MAP_PREFETCH;	2320	our %MAP_PREFETCH;
2196	our $MAP_PREFETCHER = undef;	2321	our $MAP_PREFETCHER = undef;
2197		2322
2198	sub find_async {	2323	sub find_async {
2199	my ($path, $origin, $load) = @_;	2324	my ($path, $origin, $load) = @_;
2200		2325
2201	$path = normalise $path, $origin && $origin->{path};	2326	$path = normalise $path, $origin;
2202		2327
		2328	print "find async $path (from $origin)\n";#d#
		2329
2203	if (my $map = $cf::MAP{$path}) {	2330	if (my $map = $cf::MAP{$path}) {
2204	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2331	return $map if !$load || $map->linkable;
2205	}	2332	}
2206		2333
2207	$MAP_PREFETCH{$path} |= $load;	2334	$MAP_PREFETCH{$path} |= $load;
2208		2335
2209	$MAP_PREFETCHER ||= cf::async {	2336	$MAP_PREFETCHER ||= cf::async {
…		…
2268	sub swap_out {	2395	sub swap_out {
2269	my ($self) = @_;	2396	my ($self) = @_;
2270		2397
2271	my $lock = cf::lock_acquire "map_data:$self->{path}";	2398	my $lock = cf::lock_acquire "map_data:$self->{path}";
2272		2399
2273	return if $self->in_memory != cf::MAP_ACTIVE;	2400	return if !$self->linkable;
2274	return if $self->{deny_save};	2401	return if $self->{deny_save};
2275	return if $self->players;	2402	return if $self->players;
2276		2403
2277	# first deactivate the map and "unlink" it from the core	2404	# first deactivate the map and "unlink" it from the core
2278	$self->deactivate;	2405	$self->deactivate;
2279	$_->clear_links_to ($self) for values %cf::MAP;	2406	$_->clear_links_to ($self) for values %cf::MAP;
2280	$self->in_memory (cf::MAP_SWAPPED);	2407	$self->state (cf::MAP_SWAPPED);
2281		2408
2282	# then atomically save	2409	# then atomically save
2283	$self->_save;	2410	$self->_save;
2284		2411
2285	# then free the map	2412	# then free the map
…		…
2309		2436
2310	my $lock = cf::lock_acquire "map_data:$self->{path}";	2437	my $lock = cf::lock_acquire "map_data:$self->{path}";
2311		2438
2312	return if $self->players;	2439	return if $self->players;
2313		2440
2314	warn "resetting map ", $self->path, "\n";	2441	cf::trace "resetting map ", $self->path, "\n";
2315		2442
2316	$self->in_memory (cf::MAP_SWAPPED);	2443	$self->state (cf::MAP_SWAPPED);
2317		2444
2318	# need to save uniques path	2445	# need to save uniques path
2319	unless ($self->{deny_save}) {	2446	unless ($self->{deny_save}) {
2320	my $uniq = $self->uniq_path; utf8::encode $uniq;	2447	my $uniq = $self->uniq_path; utf8::encode $uniq;
2321		2448
…		…
2343		2470
2344	delete $cf::MAP{$self->path};	2471	delete $cf::MAP{$self->path};
2345		2472
2346	$self->unlink_save;	2473	$self->unlink_save;
2347		2474
2348	bless $self, "cf::map";	2475	bless $self, "cf::map::wrap";
2349	delete $self->{deny_reset};	2476	delete $self->{deny_reset};
2350	$self->{deny_save} = 1;	2477	$self->{deny_save} = 1;
2351	$self->reset_timeout (1);	2478	$self->reset_timeout (1);
2352	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2479	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2353		2480
…		…
2583		2710
2584	Freezes the player and moves him/her to a special map (C<{link}>).	2711	Freezes the player and moves him/her to a special map (C<{link}>).
2585		2712
2586	The player should be reasonably safe there for short amounts of time (e.g.	2713	The player should be reasonably safe there for short amounts of time (e.g.
2587	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2714	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588	though, as the palyer cannot control the character while it is on the link	2715	though, as the player cannot control the character while it is on the link
2589	map.	2716	map.
2590		2717
2591	Will never block.	2718	Will never block.
2592		2719
2593	=item $player_object->leave_link ($map, $x, $y)	2720	=item $player_object->leave_link ($map, $x, $y)
…		…
2614	sub cf::object::player::enter_link {	2741	sub cf::object::player::enter_link {
2615	my ($self) = @_;	2742	my ($self) = @_;
2616		2743
2617	$self->deactivate_recursive;	2744	$self->deactivate_recursive;
2618		2745
		2746	++$self->{_link_recursion};
		2747
2619	return if UNIVERSAL::isa $self->map, "ext::map_link";	2748	return if UNIVERSAL::isa $self->map, "ext::map_link";
2620		2749
2621	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2750	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2622	if $self->map && $self->map->{path} ne "{link}";	2751	if $self->map && $self->map->{path} ne "{link}";
2623		2752
…		…
2654	$map->load_neighbours;	2783	$map->load_neighbours;
2655		2784
2656	return unless $self->contr->active;	2785	return unless $self->contr->active;
2657		2786
2658	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2787	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2659	$self->enter_map ($map, $x, $y);	2788	if ($self->enter_map ($map, $x, $y)) {
2660		2789	# entering was successful
		2790	delete $self->{_link_recursion};
2661	# only activate afterwards, to support waiting in hooks	2791	# only activate afterwards, to support waiting in hooks
2662	$self->activate_recursive;	2792	$self->activate_recursive;
2663	}	2793	}
2664		2794
		2795	}
		2796
2665	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2797	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2666		2798
2667	Moves the player to the given map-path and coordinates by first freezing	2799	Moves the player to the given map-path and coordinates by first freezing
2668	her, loading and preparing them map, calling the provided $check callback	2800	her, loading and preparing them map, calling the provided $check callback
2669	that has to return the map if sucecssful, and then unfreezes the player on	2801	that has to return the map if sucecssful, and then unfreezes the player on
2670	the new (success) or old (failed) map position. In either case, $done will	2802	the new (success) or old (failed) map position. In either case, $done will
…		…
2677		2809
2678	our $GOTOGEN;	2810	our $GOTOGEN;
2679		2811
2680	sub cf::object::player::goto {	2812	sub cf::object::player::goto {
2681	my ($self, $path, $x, $y, $check, $done) = @_;	2813	my ($self, $path, $x, $y, $check, $done) = @_;
		2814
		2815	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2816	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2817	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2818	($path, $x, $y) = @$EMERGENCY_POSITION;
		2819	}
2682		2820
2683	# do generation counting so two concurrent goto's will be executed in-order	2821	# do generation counting so two concurrent goto's will be executed in-order
2684	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2822	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2685		2823
2686	$self->enter_link;	2824	$self->enter_link;
…		…
2706	($path, $x, $y) = (undef, undef, undef);	2844	($path, $x, $y) = (undef, undef, undef);
2707	}	2845	}
2708	}	2846	}
2709		2847
2710	my $map = eval {	2848	my $map = eval {
2711	my $map = defined $path ? cf::map::find $path : undef;	2849	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2712		2850
2713	if ($map) {	2851	if ($map) {
2714	$map = $map->customise_for ($self);	2852	$map = $map->customise_for ($self);
2715	$map = $check->($map) if $check && $map;	2853	$map = $check->($map, $x, $y, $self) if $check && $map;
2716	} else {	2854	} else {
2717	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2855	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2718	}	2856	}
2719		2857
2720	$map	2858	$map
…		…
2728	if ($gen == $self->{_goto_generation}) {	2866	if ($gen == $self->{_goto_generation}) {
2729	delete $self->{_goto_generation};	2867	delete $self->{_goto_generation};
2730	$self->leave_link ($map, $x, $y);	2868	$self->leave_link ($map, $x, $y);
2731	}	2869	}
2732		2870
2733	$done->() if $done;	2871	$done->($self) if $done;
2734	})->prio (1);	2872	})->prio (1);
2735	}	2873	}
2736		2874
2737	=item $player_object->enter_exit ($exit_object)	2875	=item $player_object->enter_exit ($exit_object)
2738		2876
…		…
2806	$Coro::current->{desc} = "enter_exit";	2944	$Coro::current->{desc} = "enter_exit";
2807		2945
2808	unless (eval {	2946	unless (eval {
2809	$self->deactivate_recursive; # just to be sure	2947	$self->deactivate_recursive; # just to be sure
2810		2948
2811	# random map handling
2812	{
2813	my $guard = cf::lock_acquire "exit_prepare:$exit";
2814
2815	prepare_random_map $exit
2816	if $exit->slaying eq "/!";
2817	}
2818
2819	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2949	my $map = cf::map::normalise $exit->slaying, $exit->map;
2820	my $x = $exit->stats->hp;	2950	my $x = $exit->stats->hp;
2821	my $y = $exit->stats->sp;	2951	my $y = $exit->stats->sp;
		2952
		2953	# special map handling
		2954	my $slaying = $exit->slaying;
		2955
		2956	# special map handling
		2957	if ($slaying eq "/!") {
		2958	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2959
		2960	prepare_random_map $exit
		2961	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		2962
		2963	$map = $exit->slaying;
		2964
		2965	} elsif ($slaying eq '!up') {
		2966	$map = $exit->map->tile_path (cf::TILE_UP);
		2967	$x = $exit->x;
		2968	$y = $exit->y;
		2969
		2970	} elsif ($slaying eq '!down') {
		2971	$map = $exit->map->tile_path (cf::TILE_DOWN);
		2972	$x = $exit->x;
		2973	$y = $exit->y;
		2974	}
2822		2975
2823	$self->goto ($map, $x, $y);	2976	$self->goto ($map, $x, $y);
2824		2977
2825	# if exit is damned, update players death & WoR home-position	2978	# if exit is damned, update players death & WoR home-position
2826	$self->contr->savebed ($map, $x, $y)	2979	$self->contr->savebed ($map, $x, $y)
…		…
2831	$self->message ("Something went wrong deep within the deliantra server. "	2984	$self->message ("Something went wrong deep within the deliantra server. "
2832	. "I'll try to bring you back to the map you were before. "	2985	. "I'll try to bring you back to the map you were before. "
2833	. "Please report this to the dungeon master!",	2986	. "Please report this to the dungeon master!",
2834	cf::NDI_UNIQUE | cf::NDI_RED);	2987	cf::NDI_UNIQUE | cf::NDI_RED);
2835		2988
2836	warn "ERROR in enter_exit: $@";	2989	error "ERROR in enter_exit: $@";
2837	$self->leave_link;	2990	$self->leave_link;
2838	}	2991	}
2839	})->prio (1);	2992	})->prio (1);
2840	}	2993	}
2841		2994
…		…
3154		3307
3155	$ns->ext_reply ($reply, @reply)	3308	$ns->ext_reply ($reply, @reply)
3156	if $reply;	3309	if $reply;
3157		3310
3158	} else {	3311	} else {
3159	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3312	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3160	}	3313	}
3161		3314
3162	cf::override;	3315	cf::override;
3163	},	3316	},
3164	);	3317	);
…		…
3245	decrease split destroy change_exp value msg lore send_msg)],	3398	decrease split destroy change_exp value msg lore send_msg)],
3246	["cf::object::player" => qw(player)],	3399	["cf::object::player" => qw(player)],
3247	["cf::player" => qw(peaceful send_msg)],	3400	["cf::player" => qw(peaceful send_msg)],
3248	["cf::map" => qw(trigger)],	3401	["cf::map" => qw(trigger)],
3249	) {	3402	) {
3250	no strict 'refs';
3251	my ($pkg, @funs) = @$_;	3403	my ($pkg, @funs) = @$_;
3252	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3404	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3253	for @funs;	3405	for @funs;
3254	}	3406	}
3255		3407
…		…
3294	local @cf::_safe_eval_args = values %vars;	3446	local @cf::_safe_eval_args = values %vars;
3295	@res = wantarray ? eval eval : scalar eval $eval;	3447	@res = wantarray ? eval eval : scalar eval $eval;
3296	}	3448	}
3297		3449
3298	if ($@) {	3450	if ($@) {
3299	warn "$@";	3451	warn "$@",
3300	warn "while executing safe code '$code'\n";	3452	"while executing safe code '$code'\n",
3301	warn "with arguments " . (join " ", %vars) . "\n";	3453	"with arguments " . (join " ", %vars) . "\n";
3302	}	3454	}
3303		3455
3304	wantarray ? @res : $res[0]	3456	wantarray ? @res : $res[0]
3305	}	3457	}
3306		3458
…		…
3340	# for this (global event?)	3492	# for this (global event?)
3341	%ext::player_env::MUSIC_FACE_CACHE = ();	3493	%ext::player_env::MUSIC_FACE_CACHE = ();
3342		3494
3343	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3495	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3344		3496
3345	warn "loading facedata from $path\n";	3497	trace "loading facedata from $path\n";
3346		3498
3347	my $facedata;	3499	my $facedata = decode_storable load_file $path;
3348	0 < aio_load $path, $facedata
3349	or die "$path: $!";
3350
3351	$facedata = Coro::Storable::thaw $facedata;
3352		3500
3353	$facedata->{version} == 2	3501	$facedata->{version} == 2
3354	or cf::cleanup "$path: version mismatch, cannot proceed.";	3502	or cf::cleanup "$path: version mismatch, cannot proceed.";
3355		3503
3356	# patch in the exptable	3504	# patch in the exptable
…		…
3370		3518
3371	cf::face::set_visibility $idx, $info->{visibility};	3519	cf::face::set_visibility $idx, $info->{visibility};
3372	cf::face::set_magicmap $idx, $info->{magicmap};	3520	cf::face::set_magicmap $idx, $info->{magicmap};
3373	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3521	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3374	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3522	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3523	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3375		3524
3376	cf::cede_to_tick;	3525	cf::cede_to_tick;
3377	}	3526	}
3378		3527
3379	while (my ($face, $info) = each %$faces) {	3528	while (my ($face, $info) = each %$faces) {
…		…
3384		3533
3385	if (my $smooth = cf::face::find $info->{smooth}) {	3534	if (my $smooth = cf::face::find $info->{smooth}) {
3386	cf::face::set_smooth $idx, $smooth;	3535	cf::face::set_smooth $idx, $smooth;
3387	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3536	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3388	} else {	3537	} else {
3389	warn "smooth face '$info->{smooth}' not found for face '$face'";	3538	error "smooth face '$info->{smooth}' not found for face '$face'";
3390	}	3539	}
3391		3540
3392	cf::cede_to_tick;	3541	cf::cede_to_tick;
3393	}	3542	}
3394	}	3543	}
…		…
3412	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3561	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3413		3562
3414	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3563	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3415	cf::face::set_type $idx, $info->{type};	3564	cf::face::set_type $idx, $info->{type};
3416	} else {	3565	} else {
3417	$RESOURCE{$name} = $info;	3566	$RESOURCE{$name} = $info; # unused
3418	}	3567	}
3419		3568
3420	cf::cede_to_tick;	3569	cf::cede_to_tick;
3421	}	3570	}
3422	}	3571	}
3423		3572
3424	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3573	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3425		3574
3426	1	3575	1
3427	}	3576	}
3428
3429	cf::global->attach (on_resource_update => sub {
3430	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3431	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3432
3433	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3434	my $sound = $soundconf->{compat}[$_]
3435	or next;
3436
3437	my $face = cf::face::find "sound/$sound->[1]";
3438	cf::sound::set $sound->[0] => $face;
3439	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3440	}
3441
3442	while (my ($k, $v) = each %{$soundconf->{event}}) {
3443	my $face = cf::face::find "sound/$v";
3444	cf::sound::set $k => $face;
3445	}
3446	}
3447	});
3448		3577
3449	register_exticmd fx_want => sub {	3578	register_exticmd fx_want => sub {
3450	my ($ns, $want) = @_;	3579	my ($ns, $want) = @_;
3451		3580
3452	while (my ($k, $v) = each %$want) {	3581	while (my ($k, $v) = each %$want) {
…		…
3491	sub reload_treasures {	3620	sub reload_treasures {
3492	load_resource_file "$DATADIR/treasures"	3621	load_resource_file "$DATADIR/treasures"
3493	or die "unable to load treasurelists\n";	3622	or die "unable to load treasurelists\n";
3494	}	3623	}
3495		3624
		3625	sub reload_sound {
		3626	trace "loading sound config from $DATADIR/sound\n";
		3627
		3628	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3629
		3630	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3631	my $sound = $soundconf->{compat}[$_]
		3632	or next;
		3633
		3634	my $face = cf::face::find "sound/$sound->[1]";
		3635	cf::sound::set $sound->[0] => $face;
		3636	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3637	}
		3638
		3639	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3640	my $face = cf::face::find "sound/$v";
		3641	cf::sound::set $k => $face;
		3642	}
		3643	}
		3644
3496	sub reload_resources {	3645	sub reload_resources {
3497	warn "reloading resource files...\n";	3646	trace "reloading resource files...\n";
3498		3647
		3648	reload_exp_table;
		3649	reload_materials;
3499	reload_facedata;	3650	reload_facedata;
		3651	reload_sound;
3500	reload_archetypes;	3652	reload_archetypes;
3501	reload_regions;	3653	reload_regions;
3502	reload_treasures;	3654	reload_treasures;
3503		3655
3504	warn "finished reloading resource files\n";	3656	trace "finished reloading resource files\n";
3505	}	3657	}
3506		3658
3507	sub reload_config {	3659	sub reload_config {
3508	warn "reloading config file...\n";	3660	trace "reloading config file...\n";
3509		3661
3510	open my $fh, "<:utf8", "$CONFDIR/config"	3662	my $config = load_file "$CONFDIR/config";
3511	or return;	3663	utf8::decode $config;
		3664	*CFG = decode_yaml $config;
3512		3665
3513	local $/;
3514	*CFG = YAML::XS::Load scalar <$fh>;
3515
3516	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3666	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3517		3667
3518	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3668	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3519	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3669	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3520		3670
3521	if (exists $CFG{mlockall}) {	3671	if (exists $CFG{mlockall}) {
…		…
3523	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3673	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3524	and die "WARNING: m(un)lockall failed: $!\n";	3674	and die "WARNING: m(un)lockall failed: $!\n";
3525	};	3675	};
3526	warn $@ if $@;	3676	warn $@ if $@;
3527	}	3677	}
3528
3529	warn "finished reloading resource files\n";
3530	}	3678	}
3531		3679
3532	sub pidfile() {	3680	sub pidfile() {
3533	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3681	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3534	or die "$PIDFILE: $!";	3682	or die "$PIDFILE: $!";
…		…
3547	seek $fh, 0, 0;	3695	seek $fh, 0, 0;
3548	print $fh $$;	3696	print $fh $$;
3549	}	3697	}
3550		3698
3551	sub main_loop {	3699	sub main_loop {
3552	warn "EV::loop starting\n";	3700	trace "EV::loop starting\n";
3553	if (1) {	3701	if (1) {
3554	EV::loop;	3702	EV::loop;
3555	}	3703	}
3556	warn "EV::loop returned\n";	3704	trace "EV::loop returned\n";
3557	goto &main_loop unless $REALLY_UNLOOP;	3705	goto &main_loop unless $REALLY_UNLOOP;
3558	}	3706	}
3559		3707
3560	sub main {	3708	sub main {
3561	cf::init_globals; # initialise logging	3709	cf::init_globals; # initialise logging
3562		3710
3563	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3711	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3564	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3712	LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3565	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3713	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3566	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3714	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3567		3715
3568	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3716	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3569		3717
…		…
3577	};	3725	};
3578		3726
3579	evthread_start IO::AIO::poll_fileno;	3727	evthread_start IO::AIO::poll_fileno;
3580		3728
3581	cf::sync_job {	3729	cf::sync_job {
3582	cf::init_experience;	3730	cf::incloader::init ();
		3731
3583	cf::init_anim;	3732	cf::init_anim;
3584	cf::init_attackmess;	3733	cf::init_attackmess;
3585	cf::init_dynamic;	3734	cf::init_dynamic;
3586		3735
3587	cf::load_settings;	3736	cf::load_settings;
3588	cf::load_materials;
3589		3737
3590	reload_resources;	3738	reload_resources;
3591	reload_config;	3739	reload_config;
3592	db_init;	3740	db_init;
3593		3741
…		…
3605		3753
3606	# no (long-running) fork's whatsoever before this point(!)	3754	# no (long-running) fork's whatsoever before this point(!)
3607	use POSIX ();	3755	use POSIX ();
3608	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3756	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3609		3757
3610	(pop @POST_INIT)->(0) while @POST_INIT;	3758	cf::_post_init 0;
3611	};	3759	};
3612		3760
3613	cf::object::thawer::errors_are_fatal 0;	3761	cf::object::thawer::errors_are_fatal 0;
3614	warn "parse errors in files are no longer fatal from this point on.\n";	3762	info "parse errors in files are no longer fatal from this point on.\n";
3615		3763
		3764	my $free_main; $free_main = EV::idle sub {
		3765	undef $free_main;
		3766	undef &main; # free gobs of memory :)
		3767	};
		3768
3616	main_loop;	3769	goto &main_loop;
3617	}	3770	}
3618		3771
3619	#############################################################################	3772	#############################################################################
3620	# initialisation and cleanup	3773	# initialisation and cleanup
3621		3774
…		…
3660	or return;	3813	or return;
3661		3814
3662	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3815	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3663	and return;	3816	and return;
3664		3817
3665	warn sprintf "runtime file written (%gs).\n", AE::time - $t0;	3818	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3666		3819
3667	1	3820	1
3668	}	3821	}
3669		3822
3670	our $uuid_lock;	3823	our $uuid_lock;
…		…
3682	or return;	3835	or return;
3683		3836
3684	my $value = uuid_seq uuid_cur;	3837	my $value = uuid_seq uuid_cur;
3685		3838
3686	unless ($value) {	3839	unless ($value) {
3687	warn "cowardly refusing to write zero uuid value!\n";	3840	info "cowardly refusing to write zero uuid value!\n";
3688	return;	3841	return;
3689	}	3842	}
3690		3843
3691	my $value = uuid_str $value + $uuid_skip;	3844	my $value = uuid_str $value + $uuid_skip;
3692	$uuid_skip = 0;	3845	$uuid_skip = 0;
…		…
3702	or return;	3855	or return;
3703		3856
3704	aio_rename "$uuid~", $uuid	3857	aio_rename "$uuid~", $uuid
3705	and return;	3858	and return;
3706		3859
3707	warn "uuid file written ($value).\n";	3860	trace "uuid file written ($value).\n";
3708		3861
3709	1	3862	1
3710		3863
3711	}	3864	}
3712		3865
…		…
3718	}	3871	}
3719		3872
3720	sub emergency_save() {	3873	sub emergency_save() {
3721	my $freeze_guard = cf::freeze_mainloop;	3874	my $freeze_guard = cf::freeze_mainloop;
3722		3875
3723	warn "emergency_perl_save: enter\n";	3876	info "emergency_perl_save: enter\n";
		3877
		3878	# this is a trade-off: we want to be very quick here, so
		3879	# save all maps without fsync, and later call a global sync
		3880	# (which in turn might be very very slow)
		3881	local $USE_FSYNC = 0;
3724		3882
3725	cf::sync_job {	3883	cf::sync_job {
3726	# this is a trade-off: we want to be very quick here, so	3884	cf::write_runtime_sync; # external watchdog should not bark
3727	# save all maps without fsync, and later call a global sync
3728	# (which in turn might be very very slow)
3729	local $USE_FSYNC = 0;
3730		3885
3731	# use a peculiar iteration method to avoid tripping on perl	3886	# use a peculiar iteration method to avoid tripping on perl
3732	# refcount bugs in for. also avoids problems with players	3887	# refcount bugs in for. also avoids problems with players
3733	# and maps saved/destroyed asynchronously.	3888	# and maps saved/destroyed asynchronously.
3734	warn "emergency_perl_save: begin player save\n";	3889	info "emergency_perl_save: begin player save\n";
3735	for my $login (keys %cf::PLAYER) {	3890	for my $login (keys %cf::PLAYER) {
3736	my $pl = $cf::PLAYER{$login} or next;	3891	my $pl = $cf::PLAYER{$login} or next;
3737	$pl->valid or next;	3892	$pl->valid or next;
3738	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3893	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3739	$pl->save;	3894	$pl->save;
3740	}	3895	}
3741	warn "emergency_perl_save: end player save\n";	3896	info "emergency_perl_save: end player save\n";
3742		3897
		3898	cf::write_runtime_sync; # external watchdog should not bark
		3899
3743	warn "emergency_perl_save: begin map save\n";	3900	info "emergency_perl_save: begin map save\n";
3744	for my $path (keys %cf::MAP) {	3901	for my $path (keys %cf::MAP) {
3745	my $map = $cf::MAP{$path} or next;	3902	my $map = $cf::MAP{$path} or next;
3746	$map->valid or next;	3903	$map->valid or next;
3747	$map->save;	3904	$map->save;
3748	}	3905	}
3749	warn "emergency_perl_save: end map save\n";	3906	info "emergency_perl_save: end map save\n";
3750		3907
		3908	cf::write_runtime_sync; # external watchdog should not bark
		3909
3751	warn "emergency_perl_save: begin database checkpoint\n";	3910	info "emergency_perl_save: begin database checkpoint\n";
3752	BDB::db_env_txn_checkpoint $DB_ENV;	3911	BDB::db_env_txn_checkpoint $DB_ENV;
3753	warn "emergency_perl_save: end database checkpoint\n";	3912	info "emergency_perl_save: end database checkpoint\n";
3754		3913
3755	warn "emergency_perl_save: begin write uuid\n";	3914	info "emergency_perl_save: begin write uuid\n";
3756	write_uuid_sync 1;	3915	write_uuid_sync 1;
3757	warn "emergency_perl_save: end write uuid\n";	3916	info "emergency_perl_save: end write uuid\n";
		3917
		3918	cf::write_runtime_sync; # external watchdog should not bark
		3919
		3920	trace "emergency_perl_save: syncing database to disk";
		3921	BDB::db_env_txn_checkpoint $DB_ENV;
		3922
		3923	info "emergency_perl_save: starting sync\n";
		3924	IO::AIO::aio_sync sub {
		3925	info "emergency_perl_save: finished sync\n";
		3926	};
		3927
		3928	cf::write_runtime_sync; # external watchdog should not bark
		3929
		3930	trace "emergency_perl_save: flushing outstanding aio requests";
		3931	while (IO::AIO::nreqs || BDB::nreqs) {
		3932	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
		3933	}
		3934
		3935	cf::write_runtime_sync; # external watchdog should not bark
3758	};	3936	};
3759		3937
3760	warn "emergency_perl_save: starting sync()\n";
3761	IO::AIO::aio_sync sub {
3762	warn "emergency_perl_save: finished sync()\n";
3763	};
3764
3765	warn "emergency_perl_save: leave\n";	3938	info "emergency_perl_save: leave\n";
3766	}	3939	}
3767		3940
3768	sub post_cleanup {	3941	sub post_cleanup {
3769	my ($make_core) = @_;	3942	my ($make_core) = @_;
3770		3943
		3944	IO::AIO::flush;
		3945
3771	warn Carp::longmess "post_cleanup backtrace"	3946	error Carp::longmess "post_cleanup backtrace"
3772	if $make_core;	3947	if $make_core;
3773		3948
3774	my $fh = pidfile;	3949	my $fh = pidfile;
3775	unlink $PIDFILE if <$fh> == $$;	3950	unlink $PIDFILE if <$fh> == $$;
3776	}	3951	}
…		…
3800	}	3975	}
3801	}	3976	}
3802		3977
3803	sub do_reload_perl() {	3978	sub do_reload_perl() {
3804	# can/must only be called in main	3979	# can/must only be called in main
3805	if (in_main) {	3980	unless (in_main) {
3806	warn "can only reload from main coroutine";	3981	error "can only reload from main coroutine";
3807	return;	3982	return;
3808	}	3983	}
3809		3984
3810	return if $RELOAD++;	3985	return if $RELOAD++;
3811		3986
3812	my $t1 = AE::time;	3987	my $t1 = AE::time;
3813		3988
3814	while ($RELOAD) {	3989	while ($RELOAD) {
3815	warn "reloading...";	3990	cf::get_slot 0.1, -1, "reload_perl";
		3991	info "perl_reload: reloading...";
3816		3992
3817	warn "entering sync_job";	3993	trace "perl_reload: entering sync_job";
3818		3994
3819	cf::sync_job {	3995	cf::sync_job {
3820	cf::write_runtime_sync; # external watchdog should not bark
3821	cf::emergency_save;	3996	#cf::emergency_save;
3822	cf::write_runtime_sync; # external watchdog should not bark
3823		3997
3824	warn "syncing database to disk";
3825	BDB::db_env_txn_checkpoint $DB_ENV;
3826
3827	# if anything goes wrong in here, we should simply crash as we already saved
3828
3829	warn "flushing outstanding aio requests";
3830	while (IO::AIO::nreqs || BDB::nreqs) {
3831	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3832	}
3833
3834	warn "cancelling all extension coros";	3998	trace "perl_reload: cancelling all extension coros";
3835	$_->cancel for values %EXT_CORO;	3999	$_->cancel for values %EXT_CORO;
3836	%EXT_CORO = ();	4000	%EXT_CORO = ();
3837		4001
3838	warn "removing commands";	4002	trace "perl_reload: removing commands";
3839	%COMMAND = ();	4003	%COMMAND = ();
3840		4004
3841	warn "removing ext/exti commands";	4005	trace "perl_reload: removing ext/exti commands";
3842	%EXTCMD = ();	4006	%EXTCMD = ();
3843	%EXTICMD = ();	4007	%EXTICMD = ();
3844		4008
3845	warn "unloading/nuking all extensions";	4009	trace "perl_reload: unloading/nuking all extensions";
3846	for my $pkg (@EXTS) {	4010	for my $pkg (@EXTS) {
3847	warn "... unloading $pkg";	4011	trace "... unloading $pkg";
3848		4012
3849	if (my $cb = $pkg->can ("unload")) {	4013	if (my $cb = $pkg->can ("unload")) {
3850	eval {	4014	eval {
3851	$cb->($pkg);	4015	$cb->($pkg);
3852	1	4016	1
3853	} or warn "$pkg unloaded, but with errors: $@";	4017	} or error "$pkg unloaded, but with errors: $@";
3854	}	4018	}
3855		4019
3856	warn "... clearing $pkg";	4020	trace "... clearing $pkg";
3857	clear_package $pkg;	4021	clear_package $pkg;
3858	}	4022	}
3859		4023
3860	warn "unloading all perl modules loaded from $LIBDIR";	4024	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3861	while (my ($k, $v) = each %INC) {	4025	while (my ($k, $v) = each %INC) {
3862	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4026	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3863		4027
3864	warn "... unloading $k";	4028	trace "... unloading $k";
3865	delete $INC{$k};	4029	delete $INC{$k};
3866		4030
3867	$k =~ s/\.pm$//;	4031	$k =~ s/\.pm$//;
3868	$k =~ s/\//::/g;	4032	$k =~ s/\//::/g;
3869		4033
…		…
3872	}	4036	}
3873		4037
3874	clear_package $k;	4038	clear_package $k;
3875	}	4039	}
3876		4040
3877	warn "getting rid of safe::, as good as possible";	4041	trace "perl_reload: getting rid of safe::, as good as possible";
3878	clear_package "safe::$_"	4042	clear_package "safe::$_"
3879	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4043	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3880		4044
3881	warn "unloading cf.pm \"a bit\"";	4045	trace "perl_reload: unloading cf.pm \"a bit\"";
3882	delete $INC{"cf.pm"};	4046	delete $INC{"cf.pm"};
3883	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4047	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3884		4048
3885	# don't, removes xs symbols, too,	4049	# don't, removes xs symbols, too,
3886	# and global variables created in xs	4050	# and global variables created in xs
3887	#clear_package __PACKAGE__;	4051	#clear_package __PACKAGE__;
3888		4052
3889	warn "unload completed, starting to reload now";	4053	info "perl_reload: unload completed, starting to reload now";
3890		4054
3891	warn "reloading cf.pm";	4055	trace "perl_reload: reloading cf.pm";
3892	require cf;	4056	require cf;
3893	cf::_connect_to_perl_1;	4057	cf::_connect_to_perl_1;
3894		4058
3895	warn "loading config and database again";	4059	trace "perl_reload: loading config and database again";
3896	cf::reload_config;	4060	cf::reload_config;
3897		4061
3898	warn "loading extensions";	4062	trace "perl_reload: loading extensions";
3899	cf::load_extensions;	4063	cf::load_extensions;
3900		4064
3901	if ($REATTACH_ON_RELOAD) {	4065	if ($REATTACH_ON_RELOAD) {
3902	warn "reattaching attachments to objects/players";	4066	trace "perl_reload: reattaching attachments to objects/players";
3903	_global_reattach; # objects, sockets	4067	_global_reattach; # objects, sockets
3904	warn "reattaching attachments to maps";	4068	trace "perl_reload: reattaching attachments to maps";
3905	reattach $_ for values %MAP;	4069	reattach $_ for values %MAP;
3906	warn "reattaching attachments to players";	4070	trace "perl_reload: reattaching attachments to players";
3907	reattach $_ for values %PLAYER;	4071	reattach $_ for values %PLAYER;
3908	}	4072	}
3909		4073
3910	warn "running post_init jobs";	4074	cf::_post_init 1;
3911	(pop @POST_INIT)->(1) while @POST_INIT;
3912		4075
3913	warn "leaving sync_job";	4076	trace "perl_reload: leaving sync_job";
3914		4077
3915	1	4078	1
3916	} or do {	4079	} or do {
3917	warn $@;	4080	error $@;
3918	cf::cleanup "error while reloading, exiting.";	4081	cf::cleanup "perl_reload: error, exiting.";
3919	};	4082	};
3920		4083
3921	warn "reloaded";
3922	--$RELOAD;	4084	--$RELOAD;
3923	}	4085	}
3924		4086
3925	$t1 = AE::time - $t1;	4087	$t1 = AE::time - $t1;
3926	warn "reload completed in ${t1}s\n";	4088	info "perl_reload: completed in ${t1}s\n";
3927	};	4089	};
3928		4090
3929	our $RELOAD_WATCHER; # used only during reload	4091	our $RELOAD_WATCHER; # used only during reload
3930		4092
3931	sub reload_perl() {	4093	sub reload_perl() {
…		…
3952	reload_perl;	4114	reload_perl;
3953	};	4115	};
3954	}	4116	}
3955	};	4117	};
3956		4118
3957	unshift @INC, $LIBDIR;	4119	#############################################################################
3958		4120
3959	my $bug_warning = 0;	4121	my $bug_warning = 0;
3960		4122
3961	our @WAIT_FOR_TICK;
3962	our @WAIT_FOR_TICK_BEGIN;
3963
3964	sub wait_for_tick {	4123	sub wait_for_tick() {
3965	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4124	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3966		4125
3967	my $signal = new Coro::Signal;	4126	$WAIT_FOR_TICK->wait;
3968	push @WAIT_FOR_TICK, $signal;
3969	$signal->wait;
3970	}	4127	}
3971		4128
3972	sub wait_for_tick_begin {	4129	sub wait_for_tick_begin() {
3973	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4130	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3974		4131
3975	my $signal = new Coro::Signal;	4132	my $signal = new Coro::Signal;
3976	push @WAIT_FOR_TICK_BEGIN, $signal;	4133	push @WAIT_FOR_TICK_BEGIN, $signal;
3977	$signal->wait;	4134	$signal->wait;
3978	}	4135	}
…		…
3982	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4139	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3983	unless ++$bug_warning > 10;	4140	unless ++$bug_warning > 10;
3984	return;	4141	return;
3985	}	4142	}
3986		4143
3987	cf::server_tick; # one server iteration	4144	cf::one_tick; # one server iteration
3988		4145
3989	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4146	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3990		4147
3991	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4148	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3992	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4149	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3993	Coro::async_pool {	4150	Coro::async_pool {
3994	$Coro::current->{desc} = "runtime saver";	4151	$Coro::current->{desc} = "runtime saver";
3995	write_runtime_sync	4152	write_runtime_sync
3996	or warn "ERROR: unable to write runtime file: $!";	4153	or error "ERROR: unable to write runtime file: $!";
3997	};	4154	};
3998	}	4155	}
3999		4156
4000	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4157	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4001	$sig->send;	4158	$sig->send;
4002	}	4159	}
4003	while (my $sig = shift @WAIT_FOR_TICK) {	4160	$WAIT_FOR_TICK->broadcast;
4004	$sig->send;
4005	}
4006		4161
4007	$LOAD = ($NOW - $TICK_START) / $TICK;	4162	$LOAD = ($NOW - $TICK_START) / $TICK;
4008	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4163	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4009		4164
4010	if (0) {	4165	if (0) {
4011	if ($NEXT_TICK) {	4166	if ($NEXT_TICK) {
4012	my $jitter = $TICK_START - $NEXT_TICK;	4167	my $jitter = $TICK_START - $NEXT_TICK;
4013	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4168	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
4014	warn "jitter $JITTER\n";#d#	4169	debug "jitter $JITTER\n";#d#
4015	}	4170	}
4016	}	4171	}
4017	}	4172	}
4018		4173
4019	{	4174	{
…		…
4064	IO::AIO::min_parallel 8;	4219	IO::AIO::min_parallel 8;
4065	IO::AIO::max_poll_time $TICK * 0.1;	4220	IO::AIO::max_poll_time $TICK * 0.1;
4066	undef $AnyEvent::AIO::WATCHER;	4221	undef $AnyEvent::AIO::WATCHER;
4067	}	4222	}
4068		4223
4069	my $_log_backtrace;	4224	our $_log_backtrace;
		4225	our $_log_backtrace_last;
4070		4226
4071	sub _log_backtrace {	4227	sub _log_backtrace {
4072	my ($msg, @addr) = @_;	4228	my ($msg, @addr) = @_;
4073		4229
4074	$msg =~ s/\n//;	4230	$msg =~ s/\n$//;
4075		4231
		4232	if ($_log_backtrace_last eq $msg) {
		4233	LOG llevInfo, "[ABT] $msg\n";
		4234	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4076	# limit the # of concurrent backtraces	4235	# limit the # of concurrent backtraces
4077	if ($_log_backtrace < 2) {	4236	} elsif ($_log_backtrace < 2) {
		4237	$_log_backtrace_last = $msg;
4078	++$_log_backtrace;	4238	++$_log_backtrace;
4079	my $perl_bt = Carp::longmess $msg;	4239	my $perl_bt = Carp::longmess $msg;
4080	async {	4240	async {
4081	$Coro::current->{desc} = "abt $msg";	4241	$Coro::current->{desc} = "abt $msg";
4082		4242
…		…
4102	LOG llevInfo, "[ABT] $_\n" for @bt;	4262	LOG llevInfo, "[ABT] $_\n" for @bt;
4103	--$_log_backtrace;	4263	--$_log_backtrace;
4104	};	4264	};
4105	} else {	4265	} else {
4106	LOG llevInfo, "[ABT] $msg\n";	4266	LOG llevInfo, "[ABT] $msg\n";
4107	LOG llevInfo, "[ABT] [suppressed]\n";	4267	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4108	}	4268	}
4109	}	4269	}
4110		4270
4111	# load additional modules	4271	# load additional modules
4112	require "cf/$_.pm" for @EXTRA_MODULES;	4272	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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