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

Diff Legend

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