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.525 by root, Wed Apr 21 03:34:26 2010 UTC vs.
Revision 1.573 by root, Sun May 8 12:40:42 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
…		…
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)
…		…
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;
2126	cf::cede_to_tick;	2244	cf::cede_to_tick;
2127	$self->activate;	2245	#$self->activate; # no longer activate maps automatically
2128	}	2246	}
2129		2247
2130	$self->{last_save} = $cf::RUNTIME;	2248	$self->{last_save} = $cf::RUNTIME;
2131	$self->last_access ($cf::RUNTIME);	2249	$self->last_access ($cf::RUNTIME);
2132
2133	$self->in_memory (cf::MAP_ACTIVE);
2134	}	2250	}
2135		2251
2136	$self->post_load;	2252	$self->post_load;
		2253
		2254	1
2137	}	2255	}
2138		2256
2139	# customize the map for a given player, i.e.	2257	# customize the map for a given player, i.e.
2140	# return the _real_ map. used by e.g. per-player	2258	# return the _real_ map. used by e.g. per-player
2141	# maps to change the path to ~playername/mappath	2259	# maps to change the path to ~playername/mappath
…		…
2162	or next;	2280	or next;
2163	$neigh = find $neigh, $map	2281	$neigh = find $neigh, $map
2164	or next;	2282	or next;
2165	$neigh->load;	2283	$neigh->load;
2166		2284
		2285	# now find the diagonal neighbours
2167	push @neigh,	2286	push @neigh,
2168	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2287	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2169	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2288	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2170	}	2289	}
2171		2290
…		…
2178	}	2297	}
2179		2298
2180	sub find_sync {	2299	sub find_sync {
2181	my ($path, $origin) = @_;	2300	my ($path, $origin) = @_;
2182		2301
2183	cf::sync_job { find $path, $origin }	2302	# it's a bug to call this from the main context
		2303	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2304	if $Coro::current == $Coro::main;
		2305
		2306	find $path, $origin
2184	}	2307	}
2185		2308
2186	sub do_load_sync {	2309	sub do_load_sync {
2187	my ($map) = @_;	2310	my ($map) = @_;
2188		2311
		2312	# it's a bug to call this from the main context
2189	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2313	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2190	if $Coro::current == $Coro::main;	2314	if $Coro::current == $Coro::main;
2191		2315
2192	cf::sync_job { $map->load };	2316	$map->load;
2193	}	2317	}
2194		2318
2195	our %MAP_PREFETCH;	2319	our %MAP_PREFETCH;
2196	our $MAP_PREFETCHER = undef;	2320	our $MAP_PREFETCHER = undef;
2197		2321
2198	sub find_async {	2322	sub find_async {
2199	my ($path, $origin, $load) = @_;	2323	my ($path, $origin, $load) = @_;
2200		2324
2201	$path = normalise $path, $origin && $origin->{path};	2325	$path = normalise $path, $origin;
2202		2326
2203	if (my $map = $cf::MAP{$path}) {	2327	if (my $map = $cf::MAP{$path}) {
2204	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2328	return $map if !$load || $map->linkable;
2205	}	2329	}
2206		2330
2207	$MAP_PREFETCH{$path} |= $load;	2331	$MAP_PREFETCH{$path} |= $load;
2208		2332
2209	$MAP_PREFETCHER ||= cf::async {	2333	$MAP_PREFETCHER ||= cf::async {
…		…
2268	sub swap_out {	2392	sub swap_out {
2269	my ($self) = @_;	2393	my ($self) = @_;
2270		2394
2271	my $lock = cf::lock_acquire "map_data:$self->{path}";	2395	my $lock = cf::lock_acquire "map_data:$self->{path}";
2272		2396
2273	return if $self->in_memory != cf::MAP_ACTIVE;	2397	return if !$self->linkable;
2274	return if $self->{deny_save};	2398	return if $self->{deny_save};
2275	return if $self->players;	2399	return if $self->players;
2276		2400
2277	# first deactivate the map and "unlink" it from the core	2401	# first deactivate the map and "unlink" it from the core
2278	$self->deactivate;	2402	$self->deactivate;
2279	$_->clear_links_to ($self) for values %cf::MAP;	2403	$_->clear_links_to ($self) for values %cf::MAP;
2280	$self->in_memory (cf::MAP_SWAPPED);	2404	$self->state (cf::MAP_SWAPPED);
2281		2405
2282	# then atomically save	2406	# then atomically save
2283	$self->_save;	2407	$self->_save;
2284		2408
2285	# then free the map	2409	# then free the map
…		…
2309		2433
2310	my $lock = cf::lock_acquire "map_data:$self->{path}";	2434	my $lock = cf::lock_acquire "map_data:$self->{path}";
2311		2435
2312	return if $self->players;	2436	return if $self->players;
2313		2437
2314	warn "resetting map ", $self->path, "\n";	2438	cf::trace "resetting map ", $self->path, "\n";
2315		2439
2316	$self->in_memory (cf::MAP_SWAPPED);	2440	$self->state (cf::MAP_SWAPPED);
2317		2441
2318	# need to save uniques path	2442	# need to save uniques path
2319	unless ($self->{deny_save}) {	2443	unless ($self->{deny_save}) {
2320	my $uniq = $self->uniq_path; utf8::encode $uniq;	2444	my $uniq = $self->uniq_path; utf8::encode $uniq;
2321		2445
…		…
2583		2707
2584	Freezes the player and moves him/her to a special map (C<{link}>).	2708	Freezes the player and moves him/her to a special map (C<{link}>).
2585		2709
2586	The player should be reasonably safe there for short amounts of time (e.g.	2710	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,	2711	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	2712	though, as the player cannot control the character while it is on the link
2589	map.	2713	map.
2590		2714
2591	Will never block.	2715	Will never block.
2592		2716
2593	=item $player_object->leave_link ($map, $x, $y)	2717	=item $player_object->leave_link ($map, $x, $y)
…		…
2614	sub cf::object::player::enter_link {	2738	sub cf::object::player::enter_link {
2615	my ($self) = @_;	2739	my ($self) = @_;
2616		2740
2617	$self->deactivate_recursive;	2741	$self->deactivate_recursive;
2618		2742
		2743	++$self->{_link_recursion};
		2744
2619	return if UNIVERSAL::isa $self->map, "ext::map_link";	2745	return if UNIVERSAL::isa $self->map, "ext::map_link";
2620		2746
2621	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2747	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2622	if $self->map && $self->map->{path} ne "{link}";	2748	if $self->map && $self->map->{path} ne "{link}";
2623		2749
…		…
2654	$map->load_neighbours;	2780	$map->load_neighbours;
2655		2781
2656	return unless $self->contr->active;	2782	return unless $self->contr->active;
2657		2783
2658	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2784	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2659	$self->enter_map ($map, $x, $y);	2785	if ($self->enter_map ($map, $x, $y)) {
2660		2786	# entering was successful
		2787	delete $self->{_link_recursion};
2661	# only activate afterwards, to support waiting in hooks	2788	# only activate afterwards, to support waiting in hooks
2662	$self->activate_recursive	2789	$self->activate_recursive;
2663	unless exists $self->{_link_pos}; # maybe we re in-flight again	2790	}
2664	}
2665		2791
		2792	}
		2793
2666	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2794	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2667		2795
2668	Moves the player to the given map-path and coordinates by first freezing	2796	Moves the player to the given map-path and coordinates by first freezing
2669	her, loading and preparing them map, calling the provided $check callback	2797	her, loading and preparing them map, calling the provided $check callback
2670	that has to return the map if sucecssful, and then unfreezes the player on	2798	that has to return the map if sucecssful, and then unfreezes the player on
2671	the new (success) or old (failed) map position. In either case, $done will	2799	the new (success) or old (failed) map position. In either case, $done will
…		…
2678		2806
2679	our $GOTOGEN;	2807	our $GOTOGEN;
2680		2808
2681	sub cf::object::player::goto {	2809	sub cf::object::player::goto {
2682	my ($self, $path, $x, $y, $check, $done) = @_;	2810	my ($self, $path, $x, $y, $check, $done) = @_;
		2811
		2812	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2813	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2814	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2815	($path, $x, $y) = @$EMERGENCY_POSITION;
		2816	}
2683		2817
2684	# do generation counting so two concurrent goto's will be executed in-order	2818	# do generation counting so two concurrent goto's will be executed in-order
2685	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2819	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2686		2820
2687	$self->enter_link;	2821	$self->enter_link;
…		…
2707	($path, $x, $y) = (undef, undef, undef);	2841	($path, $x, $y) = (undef, undef, undef);
2708	}	2842	}
2709	}	2843	}
2710		2844
2711	my $map = eval {	2845	my $map = eval {
2712	my $map = defined $path ? cf::map::find $path : undef;	2846	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2713		2847
2714	if ($map) {	2848	if ($map) {
2715	$map = $map->customise_for ($self);	2849	$map = $map->customise_for ($self);
2716	$map = $check->($map) if $check && $map;	2850	$map = $check->($map, $x, $y, $self) if $check && $map;
2717	} else {	2851	} else {
2718	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2852	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2719	}	2853	}
2720		2854
2721	$map	2855	$map
…		…
2729	if ($gen == $self->{_goto_generation}) {	2863	if ($gen == $self->{_goto_generation}) {
2730	delete $self->{_goto_generation};	2864	delete $self->{_goto_generation};
2731	$self->leave_link ($map, $x, $y);	2865	$self->leave_link ($map, $x, $y);
2732	}	2866	}
2733		2867
2734	$done->() if $done;	2868	$done->($self) if $done;
2735	})->prio (1);	2869	})->prio (1);
2736	}	2870	}
2737		2871
2738	=item $player_object->enter_exit ($exit_object)	2872	=item $player_object->enter_exit ($exit_object)
2739		2873
…		…
2807	$Coro::current->{desc} = "enter_exit";	2941	$Coro::current->{desc} = "enter_exit";
2808		2942
2809	unless (eval {	2943	unless (eval {
2810	$self->deactivate_recursive; # just to be sure	2944	$self->deactivate_recursive; # just to be sure
2811		2945
2812	# random map handling
2813	{
2814	my $guard = cf::lock_acquire "exit_prepare:$exit";
2815
2816	prepare_random_map $exit
2817	if $exit->slaying eq "/!";
2818	}
2819
2820	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2946	my $map = cf::map::normalise $exit->slaying, $exit->map;
2821	my $x = $exit->stats->hp;	2947	my $x = $exit->stats->hp;
2822	my $y = $exit->stats->sp;	2948	my $y = $exit->stats->sp;
		2949
		2950	# special map handling
		2951	my $slaying = $exit->slaying;
		2952
		2953	# special map handling
		2954	if ($slaying eq "/!") {
		2955	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2956
		2957	prepare_random_map $exit
		2958	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		2959
		2960	$map = $exit->slaying;
		2961
		2962	} elsif ($slaying eq '!up') {
		2963	$map = $exit->map->tile_path (cf::TILE_UP);
		2964	$x = $exit->x;
		2965	$y = $exit->y;
		2966
		2967	} elsif ($slaying eq '!down') {
		2968	$map = $exit->map->tile_path (cf::TILE_DOWN);
		2969	$x = $exit->x;
		2970	$y = $exit->y;
		2971	}
2823		2972
2824	$self->goto ($map, $x, $y);	2973	$self->goto ($map, $x, $y);
2825		2974
2826	# if exit is damned, update players death & WoR home-position	2975	# if exit is damned, update players death & WoR home-position
2827	$self->contr->savebed ($map, $x, $y)	2976	$self->contr->savebed ($map, $x, $y)
…		…
2832	$self->message ("Something went wrong deep within the deliantra server. "	2981	$self->message ("Something went wrong deep within the deliantra server. "
2833	. "I'll try to bring you back to the map you were before. "	2982	. "I'll try to bring you back to the map you were before. "
2834	. "Please report this to the dungeon master!",	2983	. "Please report this to the dungeon master!",
2835	cf::NDI_UNIQUE | cf::NDI_RED);	2984	cf::NDI_UNIQUE | cf::NDI_RED);
2836		2985
2837	warn "ERROR in enter_exit: $@";	2986	error "ERROR in enter_exit: $@";
2838	$self->leave_link;	2987	$self->leave_link;
2839	}	2988	}
2840	})->prio (1);	2989	})->prio (1);
2841	}	2990	}
2842		2991
…		…
3155		3304
3156	$ns->ext_reply ($reply, @reply)	3305	$ns->ext_reply ($reply, @reply)
3157	if $reply;	3306	if $reply;
3158		3307
3159	} else {	3308	} else {
3160	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3309	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3161	}	3310	}
3162		3311
3163	cf::override;	3312	cf::override;
3164	},	3313	},
3165	);	3314	);
…		…
3246	decrease split destroy change_exp value msg lore send_msg)],	3395	decrease split destroy change_exp value msg lore send_msg)],
3247	["cf::object::player" => qw(player)],	3396	["cf::object::player" => qw(player)],
3248	["cf::player" => qw(peaceful send_msg)],	3397	["cf::player" => qw(peaceful send_msg)],
3249	["cf::map" => qw(trigger)],	3398	["cf::map" => qw(trigger)],
3250	) {	3399	) {
3251	no strict 'refs';
3252	my ($pkg, @funs) = @$_;	3400	my ($pkg, @funs) = @$_;
3253	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3401	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3254	for @funs;	3402	for @funs;
3255	}	3403	}
3256		3404
…		…
3295	local @cf::_safe_eval_args = values %vars;	3443	local @cf::_safe_eval_args = values %vars;
3296	@res = wantarray ? eval eval : scalar eval $eval;	3444	@res = wantarray ? eval eval : scalar eval $eval;
3297	}	3445	}
3298		3446
3299	if ($@) {	3447	if ($@) {
3300	warn "$@";	3448	warn "$@",
3301	warn "while executing safe code '$code'\n";	3449	"while executing safe code '$code'\n",
3302	warn "with arguments " . (join " ", %vars) . "\n";	3450	"with arguments " . (join " ", %vars) . "\n";
3303	}	3451	}
3304		3452
3305	wantarray ? @res : $res[0]	3453	wantarray ? @res : $res[0]
3306	}	3454	}
3307		3455
…		…
3341	# for this (global event?)	3489	# for this (global event?)
3342	%ext::player_env::MUSIC_FACE_CACHE = ();	3490	%ext::player_env::MUSIC_FACE_CACHE = ();
3343		3491
3344	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3492	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3345		3493
3346	warn "loading facedata from $path\n";	3494	trace "loading facedata from $path\n";
3347		3495
3348	my $facedata;	3496	my $facedata = decode_storable load_file $path;
3349	0 < aio_load $path, $facedata
3350	or die "$path: $!";
3351
3352	$facedata = Coro::Storable::thaw $facedata;
3353		3497
3354	$facedata->{version} == 2	3498	$facedata->{version} == 2
3355	or cf::cleanup "$path: version mismatch, cannot proceed.";	3499	or cf::cleanup "$path: version mismatch, cannot proceed.";
3356		3500
3357	# patch in the exptable	3501	# patch in the exptable
…		…
3371		3515
3372	cf::face::set_visibility $idx, $info->{visibility};	3516	cf::face::set_visibility $idx, $info->{visibility};
3373	cf::face::set_magicmap $idx, $info->{magicmap};	3517	cf::face::set_magicmap $idx, $info->{magicmap};
3374	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3518	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3375	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3519	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3520	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3376		3521
3377	cf::cede_to_tick;	3522	cf::cede_to_tick;
3378	}	3523	}
3379		3524
3380	while (my ($face, $info) = each %$faces) {	3525	while (my ($face, $info) = each %$faces) {
…		…
3385		3530
3386	if (my $smooth = cf::face::find $info->{smooth}) {	3531	if (my $smooth = cf::face::find $info->{smooth}) {
3387	cf::face::set_smooth $idx, $smooth;	3532	cf::face::set_smooth $idx, $smooth;
3388	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3533	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3389	} else {	3534	} else {
3390	warn "smooth face '$info->{smooth}' not found for face '$face'";	3535	error "smooth face '$info->{smooth}' not found for face '$face'";
3391	}	3536	}
3392		3537
3393	cf::cede_to_tick;	3538	cf::cede_to_tick;
3394	}	3539	}
3395	}	3540	}
…		…
3413	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3558	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3414		3559
3415	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3560	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3416	cf::face::set_type $idx, $info->{type};	3561	cf::face::set_type $idx, $info->{type};
3417	} else {	3562	} else {
3418	$RESOURCE{$name} = $info;	3563	$RESOURCE{$name} = $info; # unused
3419	}	3564	}
3420		3565
3421	cf::cede_to_tick;	3566	cf::cede_to_tick;
3422	}	3567	}
3423	}	3568	}
3424		3569
3425	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3570	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3426		3571
3427	1	3572	1
3428	}	3573	}
3429
3430	cf::global->attach (on_resource_update => sub {
3431	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3432	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3433
3434	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3435	my $sound = $soundconf->{compat}[$_]
3436	or next;
3437
3438	my $face = cf::face::find "sound/$sound->[1]";
3439	cf::sound::set $sound->[0] => $face;
3440	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3441	}
3442
3443	while (my ($k, $v) = each %{$soundconf->{event}}) {
3444	my $face = cf::face::find "sound/$v";
3445	cf::sound::set $k => $face;
3446	}
3447	}
3448	});
3449		3574
3450	register_exticmd fx_want => sub {	3575	register_exticmd fx_want => sub {
3451	my ($ns, $want) = @_;	3576	my ($ns, $want) = @_;
3452		3577
3453	while (my ($k, $v) = each %$want) {	3578	while (my ($k, $v) = each %$want) {
…		…
3492	sub reload_treasures {	3617	sub reload_treasures {
3493	load_resource_file "$DATADIR/treasures"	3618	load_resource_file "$DATADIR/treasures"
3494	or die "unable to load treasurelists\n";	3619	or die "unable to load treasurelists\n";
3495	}	3620	}
3496		3621
		3622	sub reload_sound {
		3623	trace "loading sound config from $DATADIR/sound\n";
		3624
		3625	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3626
		3627	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3628	my $sound = $soundconf->{compat}[$_]
		3629	or next;
		3630
		3631	my $face = cf::face::find "sound/$sound->[1]";
		3632	cf::sound::set $sound->[0] => $face;
		3633	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3634	}
		3635
		3636	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3637	my $face = cf::face::find "sound/$v";
		3638	cf::sound::set $k => $face;
		3639	}
		3640	}
		3641
3497	sub reload_resources {	3642	sub reload_resources {
3498	warn "reloading resource files...\n";	3643	trace "reloading resource files...\n";
3499		3644
		3645	reload_exp_table;
		3646	reload_materials;
3500	reload_facedata;	3647	reload_facedata;
		3648	reload_sound;
3501	reload_archetypes;	3649	reload_archetypes;
3502	reload_regions;	3650	reload_regions;
3503	reload_treasures;	3651	reload_treasures;
3504		3652
3505	warn "finished reloading resource files\n";	3653	trace "finished reloading resource files\n";
3506	}	3654	}
3507		3655
3508	sub reload_config {	3656	sub reload_config {
3509	warn "reloading config file...\n";	3657	trace "reloading config file...\n";
3510		3658
3511	open my $fh, "<:utf8", "$CONFDIR/config"	3659	my $config = load_file "$CONFDIR/config";
3512	or return;	3660	utf8::decode $config;
		3661	*CFG = decode_yaml $config;
3513		3662
3514	local $/;
3515	*CFG = YAML::XS::Load scalar <$fh>;
3516
3517	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3663	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3518		3664
3519	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3665	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3520	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3666	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3521		3667
3522	if (exists $CFG{mlockall}) {	3668	if (exists $CFG{mlockall}) {
…		…
3524	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3670	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3525	and die "WARNING: m(un)lockall failed: $!\n";	3671	and die "WARNING: m(un)lockall failed: $!\n";
3526	};	3672	};
3527	warn $@ if $@;	3673	warn $@ if $@;
3528	}	3674	}
3529
3530	warn "finished reloading resource files\n";
3531	}	3675	}
3532		3676
3533	sub pidfile() {	3677	sub pidfile() {
3534	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3678	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3535	or die "$PIDFILE: $!";	3679	or die "$PIDFILE: $!";
…		…
3548	seek $fh, 0, 0;	3692	seek $fh, 0, 0;
3549	print $fh $$;	3693	print $fh $$;
3550	}	3694	}
3551		3695
3552	sub main_loop {	3696	sub main_loop {
3553	warn "EV::loop starting\n";	3697	trace "EV::loop starting\n";
3554	if (1) {	3698	if (1) {
3555	EV::loop;	3699	EV::loop;
3556	}	3700	}
3557	warn "EV::loop returned\n";	3701	trace "EV::loop returned\n";
3558	goto &main_loop unless $REALLY_UNLOOP;	3702	goto &main_loop unless $REALLY_UNLOOP;
3559	}	3703	}
3560		3704
3561	sub main {	3705	sub main {
3562	cf::init_globals; # initialise logging	3706	cf::init_globals; # initialise logging
3563		3707
3564	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3708	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3565	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3709	LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3566	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3710	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3567	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3711	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3568		3712
3569	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3713	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3570		3714
…		…
3578	};	3722	};
3579		3723
3580	evthread_start IO::AIO::poll_fileno;	3724	evthread_start IO::AIO::poll_fileno;
3581		3725
3582	cf::sync_job {	3726	cf::sync_job {
3583	cf::init_experience;	3727	cf::incloader::init ();
		3728
3584	cf::init_anim;	3729	cf::init_anim;
3585	cf::init_attackmess;	3730	cf::init_attackmess;
3586	cf::init_dynamic;	3731	cf::init_dynamic;
3587		3732
3588	cf::load_settings;	3733	cf::load_settings;
3589	cf::load_materials;
3590		3734
3591	reload_resources;	3735	reload_resources;
3592	reload_config;	3736	reload_config;
3593	db_init;	3737	db_init;
3594		3738
…		…
3606		3750
3607	# no (long-running) fork's whatsoever before this point(!)	3751	# no (long-running) fork's whatsoever before this point(!)
3608	use POSIX ();	3752	use POSIX ();
3609	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3753	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3610		3754
3611	(pop @POST_INIT)->(0) while @POST_INIT;	3755	cf::_post_init 0;
3612	};	3756	};
3613		3757
3614	cf::object::thawer::errors_are_fatal 0;	3758	cf::object::thawer::errors_are_fatal 0;
3615	warn "parse errors in files are no longer fatal from this point on.\n";	3759	info "parse errors in files are no longer fatal from this point on.\n";
3616		3760
		3761	my $free_main; $free_main = EV::idle sub {
		3762	undef $free_main;
		3763	undef &main; # free gobs of memory :)
		3764	};
		3765
3617	main_loop;	3766	goto &main_loop;
3618	}	3767	}
3619		3768
3620	#############################################################################	3769	#############################################################################
3621	# initialisation and cleanup	3770	# initialisation and cleanup
3622		3771
…		…
3661	or return;	3810	or return;
3662		3811
3663	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3812	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3664	and return;	3813	and return;
3665		3814
3666	warn sprintf "runtime file written (%gs).\n", AE::time - $t0;	3815	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3667		3816
3668	1	3817	1
3669	}	3818	}
3670		3819
3671	our $uuid_lock;	3820	our $uuid_lock;
…		…
3683	or return;	3832	or return;
3684		3833
3685	my $value = uuid_seq uuid_cur;	3834	my $value = uuid_seq uuid_cur;
3686		3835
3687	unless ($value) {	3836	unless ($value) {
3688	warn "cowardly refusing to write zero uuid value!\n";	3837	info "cowardly refusing to write zero uuid value!\n";
3689	return;	3838	return;
3690	}	3839	}
3691		3840
3692	my $value = uuid_str $value + $uuid_skip;	3841	my $value = uuid_str $value + $uuid_skip;
3693	$uuid_skip = 0;	3842	$uuid_skip = 0;
…		…
3703	or return;	3852	or return;
3704		3853
3705	aio_rename "$uuid~", $uuid	3854	aio_rename "$uuid~", $uuid
3706	and return;	3855	and return;
3707		3856
3708	warn "uuid file written ($value).\n";	3857	trace "uuid file written ($value).\n";
3709		3858
3710	1	3859	1
3711		3860
3712	}	3861	}
3713		3862
…		…
3719	}	3868	}
3720		3869
3721	sub emergency_save() {	3870	sub emergency_save() {
3722	my $freeze_guard = cf::freeze_mainloop;	3871	my $freeze_guard = cf::freeze_mainloop;
3723		3872
3724	warn "emergency_perl_save: enter\n";	3873	info "emergency_perl_save: enter\n";
		3874
		3875	# this is a trade-off: we want to be very quick here, so
		3876	# save all maps without fsync, and later call a global sync
		3877	# (which in turn might be very very slow)
		3878	local $USE_FSYNC = 0;
3725		3879
3726	cf::sync_job {	3880	cf::sync_job {
3727	# this is a trade-off: we want to be very quick here, so	3881	cf::write_runtime_sync; # external watchdog should not bark
3728	# save all maps without fsync, and later call a global sync
3729	# (which in turn might be very very slow)
3730	local $USE_FSYNC = 0;
3731		3882
3732	# use a peculiar iteration method to avoid tripping on perl	3883	# use a peculiar iteration method to avoid tripping on perl
3733	# refcount bugs in for. also avoids problems with players	3884	# refcount bugs in for. also avoids problems with players
3734	# and maps saved/destroyed asynchronously.	3885	# and maps saved/destroyed asynchronously.
3735	warn "emergency_perl_save: begin player save\n";	3886	info "emergency_perl_save: begin player save\n";
3736	for my $login (keys %cf::PLAYER) {	3887	for my $login (keys %cf::PLAYER) {
3737	my $pl = $cf::PLAYER{$login} or next;	3888	my $pl = $cf::PLAYER{$login} or next;
3738	$pl->valid or next;	3889	$pl->valid or next;
3739	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3890	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3740	$pl->save;	3891	$pl->save;
3741	}	3892	}
3742	warn "emergency_perl_save: end player save\n";	3893	info "emergency_perl_save: end player save\n";
3743		3894
		3895	cf::write_runtime_sync; # external watchdog should not bark
		3896
3744	warn "emergency_perl_save: begin map save\n";	3897	info "emergency_perl_save: begin map save\n";
3745	for my $path (keys %cf::MAP) {	3898	for my $path (keys %cf::MAP) {
3746	my $map = $cf::MAP{$path} or next;	3899	my $map = $cf::MAP{$path} or next;
3747	$map->valid or next;	3900	$map->valid or next;
3748	$map->save;	3901	$map->save;
3749	}	3902	}
3750	warn "emergency_perl_save: end map save\n";	3903	info "emergency_perl_save: end map save\n";
3751		3904
		3905	cf::write_runtime_sync; # external watchdog should not bark
		3906
3752	warn "emergency_perl_save: begin database checkpoint\n";	3907	info "emergency_perl_save: begin database checkpoint\n";
3753	BDB::db_env_txn_checkpoint $DB_ENV;	3908	BDB::db_env_txn_checkpoint $DB_ENV;
3754	warn "emergency_perl_save: end database checkpoint\n";	3909	info "emergency_perl_save: end database checkpoint\n";
3755		3910
3756	warn "emergency_perl_save: begin write uuid\n";	3911	info "emergency_perl_save: begin write uuid\n";
3757	write_uuid_sync 1;	3912	write_uuid_sync 1;
3758	warn "emergency_perl_save: end write uuid\n";	3913	info "emergency_perl_save: end write uuid\n";
		3914
		3915	cf::write_runtime_sync; # external watchdog should not bark
		3916
		3917	trace "emergency_perl_save: syncing database to disk";
		3918	BDB::db_env_txn_checkpoint $DB_ENV;
		3919
		3920	info "emergency_perl_save: starting sync\n";
		3921	IO::AIO::aio_sync sub {
		3922	info "emergency_perl_save: finished sync\n";
		3923	};
		3924
		3925	cf::write_runtime_sync; # external watchdog should not bark
		3926
		3927	trace "emergency_perl_save: flushing outstanding aio requests";
		3928	while (IO::AIO::nreqs || BDB::nreqs) {
		3929	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
		3930	}
		3931
		3932	cf::write_runtime_sync; # external watchdog should not bark
3759	};	3933	};
3760		3934
3761	warn "emergency_perl_save: starting sync()\n";
3762	IO::AIO::aio_sync sub {
3763	warn "emergency_perl_save: finished sync()\n";
3764	};
3765
3766	warn "emergency_perl_save: leave\n";	3935	info "emergency_perl_save: leave\n";
3767	}	3936	}
3768		3937
3769	sub post_cleanup {	3938	sub post_cleanup {
3770	my ($make_core) = @_;	3939	my ($make_core) = @_;
3771		3940
		3941	IO::AIO::flush;
		3942
3772	warn Carp::longmess "post_cleanup backtrace"	3943	error Carp::longmess "post_cleanup backtrace"
3773	if $make_core;	3944	if $make_core;
3774		3945
3775	my $fh = pidfile;	3946	my $fh = pidfile;
3776	unlink $PIDFILE if <$fh> == $$;	3947	unlink $PIDFILE if <$fh> == $$;
3777	}	3948	}
…		…
3801	}	3972	}
3802	}	3973	}
3803		3974
3804	sub do_reload_perl() {	3975	sub do_reload_perl() {
3805	# can/must only be called in main	3976	# can/must only be called in main
3806	if (in_main) {	3977	unless (in_main) {
3807	warn "can only reload from main coroutine";	3978	error "can only reload from main coroutine";
3808	return;	3979	return;
3809	}	3980	}
3810		3981
3811	return if $RELOAD++;	3982	return if $RELOAD++;
3812		3983
3813	my $t1 = AE::time;	3984	my $t1 = AE::time;
3814		3985
3815	while ($RELOAD) {	3986	while ($RELOAD) {
3816	warn "reloading...";	3987	cf::get_slot 0.1, -1, "reload_perl";
		3988	info "perl_reload: reloading...";
3817		3989
3818	warn "entering sync_job";	3990	trace "perl_reload: entering sync_job";
3819		3991
3820	cf::sync_job {	3992	cf::sync_job {
3821	cf::write_runtime_sync; # external watchdog should not bark
3822	cf::emergency_save;	3993	#cf::emergency_save;
3823	cf::write_runtime_sync; # external watchdog should not bark
3824		3994
3825	warn "syncing database to disk";
3826	BDB::db_env_txn_checkpoint $DB_ENV;
3827
3828	# if anything goes wrong in here, we should simply crash as we already saved
3829
3830	warn "flushing outstanding aio requests";
3831	while (IO::AIO::nreqs || BDB::nreqs) {
3832	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3833	}
3834
3835	warn "cancelling all extension coros";	3995	trace "perl_reload: cancelling all extension coros";
3836	$_->cancel for values %EXT_CORO;	3996	$_->cancel for values %EXT_CORO;
3837	%EXT_CORO = ();	3997	%EXT_CORO = ();
3838		3998
3839	warn "removing commands";	3999	trace "perl_reload: removing commands";
3840	%COMMAND = ();	4000	%COMMAND = ();
3841		4001
3842	warn "removing ext/exti commands";	4002	trace "perl_reload: removing ext/exti commands";
3843	%EXTCMD = ();	4003	%EXTCMD = ();
3844	%EXTICMD = ();	4004	%EXTICMD = ();
3845		4005
3846	warn "unloading/nuking all extensions";	4006	trace "perl_reload: unloading/nuking all extensions";
3847	for my $pkg (@EXTS) {	4007	for my $pkg (@EXTS) {
3848	warn "... unloading $pkg";	4008	trace "... unloading $pkg";
3849		4009
3850	if (my $cb = $pkg->can ("unload")) {	4010	if (my $cb = $pkg->can ("unload")) {
3851	eval {	4011	eval {
3852	$cb->($pkg);	4012	$cb->($pkg);
3853	1	4013	1
3854	} or warn "$pkg unloaded, but with errors: $@";	4014	} or error "$pkg unloaded, but with errors: $@";
3855	}	4015	}
3856		4016
3857	warn "... clearing $pkg";	4017	trace "... clearing $pkg";
3858	clear_package $pkg;	4018	clear_package $pkg;
3859	}	4019	}
3860		4020
3861	warn "unloading all perl modules loaded from $LIBDIR";	4021	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3862	while (my ($k, $v) = each %INC) {	4022	while (my ($k, $v) = each %INC) {
3863	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4023	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3864		4024
3865	warn "... unloading $k";	4025	trace "... unloading $k";
3866	delete $INC{$k};	4026	delete $INC{$k};
3867		4027
3868	$k =~ s/\.pm$//;	4028	$k =~ s/\.pm$//;
3869	$k =~ s/\//::/g;	4029	$k =~ s/\//::/g;
3870		4030
…		…
3873	}	4033	}
3874		4034
3875	clear_package $k;	4035	clear_package $k;
3876	}	4036	}
3877		4037
3878	warn "getting rid of safe::, as good as possible";	4038	trace "perl_reload: getting rid of safe::, as good as possible";
3879	clear_package "safe::$_"	4039	clear_package "safe::$_"
3880	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4040	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3881		4041
3882	warn "unloading cf.pm \"a bit\"";	4042	trace "perl_reload: unloading cf.pm \"a bit\"";
3883	delete $INC{"cf.pm"};	4043	delete $INC{"cf.pm"};
3884	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4044	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3885		4045
3886	# don't, removes xs symbols, too,	4046	# don't, removes xs symbols, too,
3887	# and global variables created in xs	4047	# and global variables created in xs
3888	#clear_package __PACKAGE__;	4048	#clear_package __PACKAGE__;
3889		4049
3890	warn "unload completed, starting to reload now";	4050	info "perl_reload: unload completed, starting to reload now";
3891		4051
3892	warn "reloading cf.pm";	4052	trace "perl_reload: reloading cf.pm";
3893	require cf;	4053	require cf;
3894	cf::_connect_to_perl_1;	4054	cf::_connect_to_perl_1;
3895		4055
3896	warn "loading config and database again";	4056	trace "perl_reload: loading config and database again";
3897	cf::reload_config;	4057	cf::reload_config;
3898		4058
3899	warn "loading extensions";	4059	trace "perl_reload: loading extensions";
3900	cf::load_extensions;	4060	cf::load_extensions;
3901		4061
3902	if ($REATTACH_ON_RELOAD) {	4062	if ($REATTACH_ON_RELOAD) {
3903	warn "reattaching attachments to objects/players";	4063	trace "perl_reload: reattaching attachments to objects/players";
3904	_global_reattach; # objects, sockets	4064	_global_reattach; # objects, sockets
3905	warn "reattaching attachments to maps";	4065	trace "perl_reload: reattaching attachments to maps";
3906	reattach $_ for values %MAP;	4066	reattach $_ for values %MAP;
3907	warn "reattaching attachments to players";	4067	trace "perl_reload: reattaching attachments to players";
3908	reattach $_ for values %PLAYER;	4068	reattach $_ for values %PLAYER;
3909	}	4069	}
3910		4070
3911	warn "running post_init jobs";	4071	cf::_post_init 1;
3912	(pop @POST_INIT)->(1) while @POST_INIT;
3913		4072
3914	warn "leaving sync_job";	4073	trace "perl_reload: leaving sync_job";
3915		4074
3916	1	4075	1
3917	} or do {	4076	} or do {
3918	warn $@;	4077	error $@;
3919	cf::cleanup "error while reloading, exiting.";	4078	cf::cleanup "perl_reload: error, exiting.";
3920	};	4079	};
3921		4080
3922	warn "reloaded";
3923	--$RELOAD;	4081	--$RELOAD;
3924	}	4082	}
3925		4083
3926	$t1 = AE::time - $t1;	4084	$t1 = AE::time - $t1;
3927	warn "reload completed in ${t1}s\n";	4085	info "perl_reload: completed in ${t1}s\n";
3928	};	4086	};
3929		4087
3930	our $RELOAD_WATCHER; # used only during reload	4088	our $RELOAD_WATCHER; # used only during reload
3931		4089
3932	sub reload_perl() {	4090	sub reload_perl() {
…		…
3953	reload_perl;	4111	reload_perl;
3954	};	4112	};
3955	}	4113	}
3956	};	4114	};
3957		4115
3958	unshift @INC, $LIBDIR;	4116	#############################################################################
3959		4117
3960	my $bug_warning = 0;	4118	my $bug_warning = 0;
3961		4119
3962	our @WAIT_FOR_TICK;
3963	our @WAIT_FOR_TICK_BEGIN;
3964
3965	sub wait_for_tick {	4120	sub wait_for_tick() {
3966	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4121	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3967		4122
3968	my $signal = new Coro::Signal;	4123	$WAIT_FOR_TICK->wait;
3969	push @WAIT_FOR_TICK, $signal;
3970	$signal->wait;
3971	}	4124	}
3972		4125
3973	sub wait_for_tick_begin {	4126	sub wait_for_tick_begin() {
3974	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4127	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3975		4128
3976	my $signal = new Coro::Signal;	4129	my $signal = new Coro::Signal;
3977	push @WAIT_FOR_TICK_BEGIN, $signal;	4130	push @WAIT_FOR_TICK_BEGIN, $signal;
3978	$signal->wait;	4131	$signal->wait;
3979	}	4132	}
…		…
3983	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4136	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3984	unless ++$bug_warning > 10;	4137	unless ++$bug_warning > 10;
3985	return;	4138	return;
3986	}	4139	}
3987		4140
3988	cf::server_tick; # one server iteration	4141	cf::one_tick; # one server iteration
3989		4142
3990	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4143	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3991		4144
3992	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4145	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3993	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4146	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3994	Coro::async_pool {	4147	Coro::async_pool {
3995	$Coro::current->{desc} = "runtime saver";	4148	$Coro::current->{desc} = "runtime saver";
3996	write_runtime_sync	4149	write_runtime_sync
3997	or warn "ERROR: unable to write runtime file: $!";	4150	or error "ERROR: unable to write runtime file: $!";
3998	};	4151	};
3999	}	4152	}
4000		4153
4001	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4154	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4002	$sig->send;	4155	$sig->send;
4003	}	4156	}
4004	while (my $sig = shift @WAIT_FOR_TICK) {	4157	$WAIT_FOR_TICK->broadcast;
4005	$sig->send;
4006	}
4007		4158
4008	$LOAD = ($NOW - $TICK_START) / $TICK;	4159	$LOAD = ($NOW - $TICK_START) / $TICK;
4009	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4160	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4010		4161
4011	if (0) {	4162	if (0) {
4012	if ($NEXT_TICK) {	4163	if ($NEXT_TICK) {
4013	my $jitter = $TICK_START - $NEXT_TICK;	4164	my $jitter = $TICK_START - $NEXT_TICK;
4014	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4165	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
4015	warn "jitter $JITTER\n";#d#	4166	debug "jitter $JITTER\n";#d#
4016	}	4167	}
4017	}	4168	}
4018	}	4169	}
4019		4170
4020	{	4171	{
…		…
4065	IO::AIO::min_parallel 8;	4216	IO::AIO::min_parallel 8;
4066	IO::AIO::max_poll_time $TICK * 0.1;	4217	IO::AIO::max_poll_time $TICK * 0.1;
4067	undef $AnyEvent::AIO::WATCHER;	4218	undef $AnyEvent::AIO::WATCHER;
4068	}	4219	}
4069		4220
4070	my $_log_backtrace;	4221	our $_log_backtrace;
		4222	our $_log_backtrace_last;
4071		4223
4072	sub _log_backtrace {	4224	sub _log_backtrace {
4073	my ($msg, @addr) = @_;	4225	my ($msg, @addr) = @_;
4074		4226
4075	$msg =~ s/\n//;	4227	$msg =~ s/\n$//;
4076		4228
		4229	if ($_log_backtrace_last eq $msg) {
		4230	LOG llevInfo, "[ABT] $msg\n";
		4231	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4077	# limit the # of concurrent backtraces	4232	# limit the # of concurrent backtraces
4078	if ($_log_backtrace < 2) {	4233	} elsif ($_log_backtrace < 2) {
		4234	$_log_backtrace_last = $msg;
4079	++$_log_backtrace;	4235	++$_log_backtrace;
4080	my $perl_bt = Carp::longmess $msg;	4236	my $perl_bt = Carp::longmess $msg;
4081	async {	4237	async {
4082	$Coro::current->{desc} = "abt $msg";	4238	$Coro::current->{desc} = "abt $msg";
4083		4239
…		…
4103	LOG llevInfo, "[ABT] $_\n" for @bt;	4259	LOG llevInfo, "[ABT] $_\n" for @bt;
4104	--$_log_backtrace;	4260	--$_log_backtrace;
4105	};	4261	};
4106	} else {	4262	} else {
4107	LOG llevInfo, "[ABT] $msg\n";	4263	LOG llevInfo, "[ABT] $msg\n";
4108	LOG llevInfo, "[ABT] [suppressed]\n";	4264	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4109	}	4265	}
4110	}	4266	}
4111		4267
4112	# load additional modules	4268	# load additional modules
4113	require "cf/$_.pm" for @EXTRA_MODULES;	4269	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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