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.576 by root, Tue Jan 3 02:08:49 2012 UTC

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

Diff Legend

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