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.512 by root, Sun Apr 11 04:52:07 2010 UTC vs.
Revision 1.580 by root, Wed Jan 4 03:22:48 2012 UTC

1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify it under	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# the terms of the Affero GNU General Public License as published by the	7	# the terms of the Affero GNU General Public License as published by the
8	# Free Software Foundation, either version 3 of the License, or (at your	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# option) any later version.	9	# option) any later version.
…		…
20	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
21	#	21	#
22		22
23	package cf;	23	package cf;
24		24
25	use 5.10.0;	25	use common::sense;
26	use utf8;
27	use strict qw(vars subs);
28		26
29	use Symbol;	27	use Symbol;
30	use List::Util;	28	use List::Util;
31	use Socket;	29	use Socket;
32	use EV;	30	use EV;
…		…
78	# strictly for debugging	76	# strictly for debugging
79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	77	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80		78
81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	79	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82		80
		81	our @ORIG_INC;
		82
83	our %COMMAND = ();	83	our %COMMAND = ();
84	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
85		85
86	our @EXTS = (); # list of extension package names	86	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	87	our %EXTCMD = ();
…		…
93	our @EVENT;	93	our @EVENT;
94	our @REFLECT; # set by XS	94	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	95	our %REFLECT; # set by us
96		96
97	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
		98
98	our $DATADIR = datadir;	99	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	100	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	101	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	102	our $MAPDIR = "$DATADIR/" . mapdir;
		103
102	our $LOCALDIR = localdir;	104	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	105	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	106	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	107	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	108	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	109	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	110	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	111	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		112
111	our %RESOURCE;	113	#our %RESOURCE; # unused
		114
		115	our $OUTPUT_RATE_MIN = 3000;
		116	our $OUTPUT_RATE_MAX = 1000000;
		117
		118	our $MAX_LINKS = 32; # how many chained exits to follow
		119	our $VERBOSE_IO = 1;
112		120
113	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	121	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	122	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115	our $NEXT_TICK;	123	our $NEXT_TICK;
116	our $USE_FSYNC = 1; # use fsync to write maps - default on	124	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
118	our $BDB_DEADLOCK_WATCHER;	126	our $BDB_DEADLOCK_WATCHER;
119	our $BDB_CHECKPOINT_WATCHER;	127	our $BDB_CHECKPOINT_WATCHER;
120	our $BDB_TRICKLE_WATCHER;	128	our $BDB_TRICKLE_WATCHER;
121	our $DB_ENV;	129	our $DB_ENV;
122		130
123	our @EXTRA_MODULES = qw(pod match mapscript);	131	our @EXTRA_MODULES = qw(pod match mapscript incloader);
124		132
125	our %CFG;	133	our %CFG;
126		134
127	our $UPTIME; $UPTIME ||= time;	135	our $UPTIME; $UPTIME ||= time;
128	our $RUNTIME;	136	our $RUNTIME = 0;
		137	our $SERVER_TICK = 0;
129	our $NOW;	138	our $NOW;
130		139
131	our (%PLAYER, %PLAYER_LOADING); # all users	140	our (%PLAYER, %PLAYER_LOADING); # all users
132	our (%MAP, %MAP_LOADING ); # all maps	141	our (%MAP, %MAP_LOADING ); # all maps
133	our $LINK_MAP; # the special {link} map, which is always available	142	our $LINK_MAP; # the special {link} map, which is always available
…		…
142		151
143	our @POST_INIT;	152	our @POST_INIT;
144		153
145	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)
146	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;
147		159
148	binmode STDOUT;	160	binmode STDOUT;
149	binmode STDERR;	161	binmode STDERR;
150		162
151	# read virtual server time, if available	163	# read virtual server time, if available
…		…
162		174
163	our $EMERGENCY_POSITION;	175	our $EMERGENCY_POSITION;
164		176
165	sub cf::map::normalise;	177	sub cf::map::normalise;
166		178
		179	sub in_main() {
		180	$Coro::current == $Coro::main
		181	}
		182
167	#############################################################################	183	#############################################################################
168		184
169	%REFLECT = ();	185	%REFLECT = ();
170	for (@REFLECT) {	186	for (@REFLECT) {
171	my $reflect = JSON::XS::decode_json $_;	187	my $reflect = JSON::XS::decode_json $_;
…		…
181		197
182	=over 4	198	=over 4
183		199
184	=item $cf::UPTIME	200	=item $cf::UPTIME
185		201
186	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.
187		218
188	=item $cf::RUNTIME	219	=item $cf::RUNTIME
189		220
190	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
191	every server tick.	222	every server tick.
…		…
197	Various directories - "/etc", read-only install directory, perl-library	228	Various directories - "/etc", read-only install directory, perl-library
198	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	229	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
199	unique-items directory, player file directory, random maps directory and	230	unique-items directory, player file directory, random maps directory and
200	database environment.	231	database environment.
201		232
202	=item $cf::NOW
203
204	The time of the last (current) server tick.
205
206	=item $cf::TICK
207
208	The interval between server ticks, in seconds.
209
210	=item $cf::LOADAVG	233	=item $cf::LOADAVG
211		234
212	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
213	(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
214	objects per tick. Healthy values are < 0.5.	237	objects per tick. Healthy values are < 0.5.
…		…
223	from wherever your confdir points to.	246	from wherever your confdir points to.
224		247
225	=item cf::wait_for_tick, cf::wait_for_tick_begin	248	=item cf::wait_for_tick, cf::wait_for_tick_begin
226		249
227	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
228	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
229	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();
230		270
231	=item @cf::INVOKE_RESULTS	271	=item @cf::INVOKE_RESULTS
232		272
233	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
234	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
…		…
242		282
243	=back	283	=back
244		284
245	=cut	285	=cut
246		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
247	$Coro::State::WARNHOOK = sub {	293	$Coro::State::WARNHOOK = sub {
248	my $msg = join "", @_;	294	my $msg = join "", @_;
249		295
250	$msg .= "\n"	296	$msg .= "\n"
251	unless $msg =~ /\n$/;	297	unless $msg =~ /\n$/;
252		298
253	$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;
254		300
255	LOG llevError, $msg;	301	LOG llevWarn, $msg;
256	};	302	};
257		303
258	$Coro::State::DIEHOOK = sub {	304	$Coro::State::DIEHOOK = sub {
259	return unless $^S eq 0; # "eq", not "=="	305	return unless $^S eq 0; # "eq", not "=="
260		306
261	warn Carp::longmess $_[0];	307	error Carp::longmess $_[0];
262		308
263	if ($Coro::current == $Coro::main) {#d#	309	if (in_main) {#d#
264	warn "DIEHOOK called in main context, Coro bug?\n";#d#	310	error "DIEHOOK called in main context, Coro bug?\n";#d#
265	return;#d#	311	return;#d#
266	}#d#	312	}#d#
267		313
268	# kill coroutine otherwise	314	# kill coroutine otherwise
269	Coro::terminate	315	Coro::terminate
…		…
291	}	337	}
292		338
293	$EV::DIED = sub {	339	$EV::DIED = sub {
294	Carp::cluck "error in event callback: @_";	340	Carp::cluck "error in event callback: @_";
295	};	341	};
		342
		343	#############################################################################
		344
		345	sub fork_call(&@);
		346	sub get_slot($;$$);
296		347
297	#############################################################################	348	#############################################################################
298		349
299	=head2 UTILITY FUNCTIONS	350	=head2 UTILITY FUNCTIONS
300		351
…		…
321	$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;
322	$d	373	$d
323	} || "[unable to dump $_[0]: '$@']";	374	} || "[unable to dump $_[0]: '$@']";
324	}	375	}
325		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
326	=item $ref = cf::decode_json $json	391	=item $ref = cf::decode_json $json
327		392
328	Converts a JSON string into the corresponding perl data structure.	393	Converts a JSON string into the corresponding perl data structure.
329		394
330	=item $json = cf::encode_json $ref	395	=item $json = cf::encode_json $ref
…		…
336	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
337		402
338	sub encode_json($) { $json_coder->encode ($_[0]) }	403	sub encode_json($) { $json_coder->encode ($_[0]) }
339	sub decode_json($) { $json_coder->decode ($_[0]) }	404	sub decode_json($) { $json_coder->decode ($_[0]) }
340		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
341	=item cf::post_init { BLOCK }	437	=item cf::post_init { BLOCK }
342		438
343	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,
344	but I<before> the server starts ticking again.	440	but I<before> the server starts ticking again.
345		441
346	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
347	is a reload or not.	443	is a reload or not.
348		444
349	=cut	445	=cut
350		446
351	sub post_init(&) {	447	sub post_init(&) {
352	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	}
353	}	466	}
354		467
355	=item cf::lock_wait $string	468	=item cf::lock_wait $string
356		469
357	Wait until the given lock is available. See cf::lock_acquire.	470	Wait until the given lock is available. See cf::lock_acquire.
…		…
396	}	509	}
397		510
398	=item cf::periodic $interval, $cb	511	=item cf::periodic $interval, $cb
399		512
400	Like EV::periodic, but randomly selects a starting point so that the actions	513	Like EV::periodic, but randomly selects a starting point so that the actions
401	get spread over timer.	514	get spread over time.
402		515
403	=cut	516	=cut
404		517
405	sub periodic($$) {	518	sub periodic($$) {
406	my ($interval, $cb) = @_;	519	my ($interval, $cb) = @_;
…		…
410	EV::periodic $start, $interval, 0, $cb	523	EV::periodic $start, $interval, 0, $cb
411	}	524	}
412		525
413	=item cf::get_slot $time[, $priority[, $name]]	526	=item cf::get_slot $time[, $priority[, $name]]
414		527
415	Allocate $time seconds of blocking CPU time at priority C<$priority>:	528	Allocate $time seconds of blocking CPU time at priority C<$priority>
416	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
417	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.
418		535
419	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
420	used for statistical purposes and should identify the same time-class.	537	used for statistical purposes and should identify the same time-class.
421		538
422	Useful for short background jobs.	539	Useful for short background jobs.
…		…
451	}	568	}
452	}	569	}
453		570
454	if (@SLOT_QUEUE) {	571	if (@SLOT_QUEUE) {
455	# 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
456	push @cf::WAIT_FOR_TICK, $signal;	573	$WAIT_FOR_TICK->wait;
457	$signal->wait;
458	} else {	574	} else {
459	$busy = 0;	575	$busy = 0;
460	Coro::schedule;	576	Coro::schedule;
461	}	577	}
462	}	578	}
…		…
502	=cut	618	=cut
503		619
504	sub sync_job(&) {	620	sub sync_job(&) {
505	my ($job) = @_;	621	my ($job) = @_;
506		622
507	if ($Coro::current == $Coro::main) {	623	if (in_main) {
508	my $time = AE::time;	624	my $time = AE::time;
509		625
510	# this is the main coro, too bad, we have to block	626	# this is the main coro, too bad, we have to block
511	# till the operation succeeds, freezing the server :/	627	# till the operation succeeds, freezing the server :/
512		628
513	LOG llevError, Carp::longmess "sync job";#d#	629	#LOG llevError, Carp::longmess "sync job";#d#
514		630
515	my $freeze_guard = freeze_mainloop;	631	my $freeze_guard = freeze_mainloop;
516		632
517	my $busy = 1;	633	my $busy = 1;
518	my @res;	634	my @res;
519		635
520	(async {	636	(async {
521	$Coro::current->desc ("sync job coro");	637	$Coro::current->desc ("sync job coro");
522	@res = eval { $job->() };	638	@res = eval { $job->() };
523	warn $@ if $@;	639	error $@ if $@;
524	undef $busy;	640	undef $busy;
525	})->prio (Coro::PRIO_MAX);	641	})->prio (Coro::PRIO_MAX);
526		642
527	while ($busy) {	643	while ($busy) {
528	if (Coro::nready) {	644	if (Coro::nready) {
…		…
562	$EXT_CORO{$coro+0} = $coro;	678	$EXT_CORO{$coro+0} = $coro;
563		679
564	$coro	680	$coro
565	}	681	}
566		682
567	=item fork_call { }, $args	683	=item fork_call { }, @args
568		684
569	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
570	process, returning the results. Everything must be serialisable with	686	process, returning the results. Everything must be serialisable with
571	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
572	never block itself or use any form of event handling.	688	never block itself or use any form of event handling.
573		689
574	=cut	690	=cut
575		691
		692	sub post_fork {
		693	reset_signals;
		694	}
		695
576	sub fork_call(&@) {	696	sub fork_call(&@) {
577	my ($cb, @args) = @_;	697	my ($cb, @args) = @_;
578		698
579	# 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,
580	# otherwise perl prematurely frees the stuff :/	700	# otherwise perl prematurely frees the stuff :/
581	# TODO: investigate and fix (likely this will be rather laborious)	701	# TODO: investigate and fix (likely this will be rather laborious)
582		702
583	my @res = Coro::Util::fork_eval {	703	my @res = Coro::Util::fork_eval {
584	reset_signals;	704	cf::post_fork;
585	&$cb	705	&$cb
586	}, @args;	706	} @args;
587		707
588	wantarray ? @res : $res[-1]	708	wantarray ? @res : $res[-1]
		709	}
		710
		711	sub objinfo {
		712	(
		713	"counter value" => cf::object::object_count,
		714	"objects created" => cf::object::create_count,
		715	"objects destroyed" => cf::object::destroy_count,
		716	"freelist size" => cf::object::free_count,
		717	"allocated objects" => cf::object::objects_size,
		718	"active objects" => cf::object::actives_size,
		719	)
589	}	720	}
590		721
591	=item $coin = coin_from_name $name	722	=item $coin = coin_from_name $name
592		723
593	=cut	724	=cut
…		…
630	within each server.	761	within each server.
631		762
632	=cut	763	=cut
633		764
634	sub db_table($) {	765	sub db_table($) {
		766	cf::error "db_get called from main context"
		767	if $Coro::current == $Coro::main;
		768
635	my ($name) = @_;	769	my ($name) = @_;
636	my $db = BDB::db_create $DB_ENV;	770	my $db = BDB::db_create $DB_ENV;
637		771
638	eval {	772	eval {
639	$db->set_flags (BDB::CHKSUM);	773	$db->set_flags (BDB::CHKSUM);
…		…
649	}	783	}
650		784
651	our $DB;	785	our $DB;
652		786
653	sub db_init {	787	sub db_init {
654	cf::sync_job {
655	$DB ||= db_table "db";	788	$DB ||= db_table "db";
656	};
657	}	789	}
658		790
659	sub db_get($$) {	791	sub db_get($$) {
660	my $key = "$_[0]/$_[1]";	792	my $key = "$_[0]/$_[1]";
661		793
662	cf::sync_job {	794	cf::error "db_get called from main context"
		795	if $Coro::current == $Coro::main;
		796
663	BDB::db_get $DB, undef, $key, my $data;	797	BDB::db_get $DB, undef, $key, my $data;
664		798
665	$! ? ()	799	$! ? ()
666	: $data	800	: $data
667	}
668	}	801	}
669		802
670	sub db_put($$$) {	803	sub db_put($$$) {
671	BDB::dbreq_pri 4;	804	BDB::dbreq_pri 4;
672	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	805	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
700		833
701	my @data;	834	my @data;
702	my $md5;	835	my $md5;
703		836
704	for (0 .. $#$src) {	837	for (0 .. $#$src) {
705	0 <= aio_load $src->[$_], $data[$_]	838	$data[$_] = load_file $src->[$_];
706	or Carp::croak "$src->[$_]: $!";
707	}	839	}
708		840
709	# if processing is expensive, check	841	# if processing is expensive, check
710	# checksum first	842	# checksum first
711	if (1) {	843	if (1) {
…		…
728		860
729	my $t1 = Time::HiRes::time;	861	my $t1 = Time::HiRes::time;
730	my $data = $process->(\@data);	862	my $data = $process->(\@data);
731	my $t2 = Time::HiRes::time;	863	my $t2 = Time::HiRes::time;
732		864
733	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	865	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734		866
735	db_put cache => "$id/data", $data;	867	db_put cache => "$id/data", $data;
736	db_put cache => "$id/md5" , $md5;	868	db_put cache => "$id/md5" , $md5;
737	db_put cache => "$id/meta", $meta;	869	db_put cache => "$id/meta", $meta;
738		870
…		…
748		880
749	=cut	881	=cut
750		882
751	sub datalog($@) {	883	sub datalog($@) {
752	my ($type, %kv) = @_;	884	my ($type, %kv) = @_;
753	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	885	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754	}	886	}
755		887
756	=back	888	=back
757		889
758	=cut	890	=cut
…		…
953		1085
954	} elsif (exists $cb_id{$type}) {	1086	} elsif (exists $cb_id{$type}) {
955	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1087	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956		1088
957	} elsif (ref $type) {	1089	} elsif (ref $type) {
958	warn "attaching objects not supported, ignoring.\n";	1090	error "attaching objects not supported, ignoring.\n";
959		1091
960	} else {	1092	} else {
961	shift @arg;	1093	shift @arg;
962	warn "attach argument '$type' not supported, ignoring.\n";	1094	error "attach argument '$type' not supported, ignoring.\n";
963	}	1095	}
964	}	1096	}
965	}	1097	}
966		1098
967	sub _object_attach {	1099	sub _object_attach {
…		…
977	_attach $registry, $klass, @attach;	1109	_attach $registry, $klass, @attach;
978	}	1110	}
979		1111
980	$obj->{$name} = \%arg;	1112	$obj->{$name} = \%arg;
981	} else {	1113	} else {
982	warn "object uses attachment '$name' which is not available, postponing.\n";	1114	info "object uses attachment '$name' which is not available, postponing.\n";
983	}	1115	}
984		1116
985	$obj->{_attachment}{$name} = undef;	1117	$obj->{_attachment}{$name} = undef;
986	}	1118	}
987		1119
…		…
1046		1178
1047	for (@$callbacks) {	1179	for (@$callbacks) {
1048	eval { &{$_->[1]} };	1180	eval { &{$_->[1]} };
1049		1181
1050	if ($@) {	1182	if ($@) {
1051	warn "$@";
1052	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1183	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053	override;	1184	override;
1054	}	1185	}
1055		1186
1056	return 1 if $override;	1187	return 1 if $override;
1057	}	1188	}
…		…
1136	for (@$attach) {	1267	for (@$attach) {
1137	my ($klass, @attach) = @$_;	1268	my ($klass, @attach) = @$_;
1138	_attach $registry, $klass, @attach;	1269	_attach $registry, $klass, @attach;
1139	}	1270	}
1140	} else {	1271	} else {
1141	warn "object uses attachment '$name' that is not available, postponing.\n";	1272	info "object uses attachment '$name' that is not available, postponing.\n";
1142	}	1273	}
1143	}	1274	}
1144	}	1275	}
1145		1276
1146	cf::attachable->attach (	1277	cf::attachable->attach (
…		…
1173	my ($filename, $rdata, $objs) = @_;	1304	my ($filename, $rdata, $objs) = @_;
1174		1305
1175	sync_job {	1306	sync_job {
1176	if (length $$rdata) {	1307	if (length $$rdata) {
1177	utf8::decode (my $decname = $filename);	1308	utf8::decode (my $decname = $filename);
1178	warn sprintf "saving %s (%d,%d)\n",	1309	trace sprintf "saving %s (%d,%d)\n",
1179	$decname, length $$rdata, scalar @$objs;	1310	$decname, length $$rdata, scalar @$objs
		1311	if $VERBOSE_IO;
1180		1312
1181	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1313	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182	aio_chmod $fh, SAVE_MODE;	1314	aio_chmod $fh, SAVE_MODE;
1183	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1315	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184	if ($cf::USE_FSYNC) {	1316	if ($cf::USE_FSYNC) {
…		…
1206	aio_rename "$filename~", $filename;	1338	aio_rename "$filename~", $filename;
1207		1339
1208	$filename =~ s%/[^/]+$%%;	1340	$filename =~ s%/[^/]+$%%;
1209	aio_pathsync $filename if $cf::USE_FSYNC;	1341	aio_pathsync $filename if $cf::USE_FSYNC;
1210	} else {	1342	} else {
1211	warn "unable to save objects: $filename~: $!\n";	1343	error "unable to save objects: $filename~: $!\n";
1212	}	1344	}
1213	} else {	1345	} else {
1214	aio_unlink $filename;	1346	aio_unlink $filename;
1215	aio_unlink "$filename.pst";	1347	aio_unlink "$filename.pst";
1216	}	1348	}
…		…
1240	my $st = eval { Coro::Storable::thaw $av };	1372	my $st = eval { Coro::Storable::thaw $av };
1241	$av = $st->{objs};	1373	$av = $st->{objs};
1242	}	1374	}
1243		1375
1244	utf8::decode (my $decname = $filename);	1376	utf8::decode (my $decname = $filename);
1245	warn sprintf "loading %s (%d,%d)\n",	1377	trace sprintf "loading %s (%d,%d)\n",
1246	$decname, length $data, scalar @{$av || []};	1378	$decname, length $data, scalar @{$av || []}
		1379	if $VERBOSE_IO;
1247		1380
1248	($data, $av)	1381	($data, $av)
1249	}	1382	}
1250		1383
1251	=head2 COMMAND CALLBACKS	1384	=head2 COMMAND CALLBACKS
…		…
1328	my ($pl, $buf) = @_;	1461	my ($pl, $buf) = @_;
1329		1462
1330	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1463	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1331		1464
1332	if (ref $msg) {	1465	if (ref $msg) {
1333	my ($type, $reply, @payload) =	1466	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1334	"ARRAY" eq ref $msg
1335	? @$msg
1336	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1337		1467
1338	my @reply;	1468	my @reply;
1339		1469
1340	if (my $cb = $EXTCMD{$type}) {	1470	if (my $cb = $EXTCMD{$type}) {
1341	@reply = $cb->($pl, @payload);	1471	@reply = $cb->($pl, @payload);
…		…
1343		1473
1344	$pl->ext_reply ($reply, @reply)	1474	$pl->ext_reply ($reply, @reply)
1345	if $reply;	1475	if $reply;
1346		1476
1347	} else {	1477	} else {
1348	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1478	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349	}	1479	}
1350		1480
1351	cf::override;	1481	cf::override;
1352	},	1482	},
1353	);	1483	);
…		…
1364		1494
1365	$grp	1495	$grp
1366	}	1496	}
1367		1497
1368	sub load_extensions {	1498	sub load_extensions {
		1499	info "loading extensions...";
		1500
1369	cf::sync_job {	1501	cf::sync_job {
1370	my %todo;	1502	my %todo;
1371		1503
1372	for my $path (<$LIBDIR/*.ext>) {	1504	for my $path (<$LIBDIR/*.ext>) {
1373	next unless -r $path;	1505	next unless -r $path;
…		…
1391		1523
1392	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1524	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1525	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394		1526
1395	$ext{source} =	1527	$ext{source} =
1396	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1528	"package $pkg; use common::sense;\n"
1397	. "#line 1 \"$path\"\n{\n"	1529	. "#line 1 \"$path\"\n{\n"
1398	. $source	1530	. $source
1399	. "\n};\n1";	1531	. "\n};\n1";
1400		1532
1401	$todo{$base} = \%ext;	1533	$todo{$base} = \%ext;
…		…
1413	for (split /,\s*/, $v->{meta}{depends}) {	1545	for (split /,\s*/, $v->{meta}{depends}) {
1414	next ext	1546	next ext
1415	unless exists $done{$_};	1547	unless exists $done{$_};
1416	}	1548	}
1417		1549
1418	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1550	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419		1551
1420	my $active = eval $v->{source};	1552	my $active = eval $v->{source};
1421		1553
1422	if (length $@) {	1554	if (length $@) {
1423	warn "$v->{path}: $@\n";	1555	error "$v->{path}: $@\n";
1424		1556
1425	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1557	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426	if exists $v->{meta}{mandatory};	1558	if exists $v->{meta}{mandatory};
		1559
		1560	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1561	delete $todo{$k};
1427	} else {	1562	} else {
1428	$done{$k} = delete $todo{$k};	1563	$done{$k} = delete $todo{$k};
1429	push @EXTS, $v->{pkg};	1564	push @EXTS, $v->{pkg};
1430	$progress = 1;	1565	$progress = 1;
1431		1566
1432	warn "$v->{base}: extension inactive.\n"	1567	info "$v->{base}: extension inactive.\n"
1433	unless $active;	1568	unless $active;
1434	}	1569	}
1435	}	1570	}
1436		1571
1437	unless ($progress) {	1572	unless ($progress) {
…		…
1439		1574
1440	while (my ($k, $v) = each %todo) {	1575	while (my ($k, $v) = each %todo) {
1441	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1576	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442	if exists $v->{meta}{mandatory};	1577	if exists $v->{meta}{mandatory};
1443	}	1578	}
		1579
		1580	last;
1444	}	1581	}
1445	}	1582	}
1446	};	1583	};
1447	}	1584	}
1448		1585
…		…
1606	my $name = $pl->ob->name;	1743	my $name = $pl->ob->name;
1607		1744
1608	$pl->{deny_save} = 1;	1745	$pl->{deny_save} = 1;
1609	$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
1610		1747
1611	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1748	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1612	$pl->deactivate;	1749	$pl->deactivate;
		1750
1613	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;
1614	$pl->ob->check_score;
1615	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1752	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1753	ext::highscore::check ($pl->ob);
		1754
1616	$pl->ns->destroy if $pl->ns;	1755	$pl->ns->destroy if $pl->ns;
1617		1756
1618	my $path = playerdir $pl;	1757	my $path = playerdir $pl;
1619	my $temp = "$path~$cf::RUNTIME~deleting~";	1758	my $temp = "$path~$cf::RUNTIME~deleting~";
1620	aio_rename $path, $temp;	1759	aio_rename $path, $temp;
…		…
1674	\@logins	1813	\@logins
1675	}	1814	}
1676		1815
1677	=item $player->maps	1816	=item $player->maps
1678		1817
		1818	=item cf::player::maps $login
		1819
1679	Returns an arrayref of map paths that are private for this	1820	Returns an arrayref of map paths that are private for this
1680	player. May block.	1821	player. May block.
1681		1822
1682	=cut	1823	=cut
1683		1824
…		…
1745	=cut	1886	=cut
1746		1887
1747	sub find_by_path($) {	1888	sub find_by_path($) {
1748	my ($path) = @_;	1889	my ($path) = @_;
1749		1890
		1891	$path =~ s/^~[^\/]*//; # skip ~login
		1892
1750	my ($match, $specificity);	1893	my ($match, $specificity);
1751		1894
1752	for my $region (list) {	1895	for my $region (list) {
1753	if ($region->{match} && $path =~ $region->{match}) {	1896	if ($region->{match} && $path =~ $region->{match}) {
1754	($match, $specificity) = ($region, $region->specificity)	1897	($match, $specificity) = ($region, $region->specificity)
…		…
1782	sub generate_random_map {	1925	sub generate_random_map {
1783	my ($self, $rmp) = @_;	1926	my ($self, $rmp) = @_;
1784		1927
1785	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
1786		1929
1787	# mit "rum" bekleckern, nicht
1788	$self->_create_random_map (	1930	$self->_create_random_map ($rmp);
1789	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1790	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1791	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1792	$rmp->{exit_on_final_map},
1793	$rmp->{xsize}, $rmp->{ysize},
1794	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1795	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1796	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1797	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1798	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1799	(cf::region::find $rmp->{region}), $rmp->{custom}
1800	)
1801	}	1931	}
1802		1932
1803	=item cf::map->register ($regex, $prio)	1933	=item cf::map->register ($regex, $prio)
1804		1934
1805	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
…		…
1810		1940
1811	sub register {	1941	sub register {
1812	my (undef, $regex, $prio) = @_;	1942	my (undef, $regex, $prio) = @_;
1813	my $pkg = caller;	1943	my $pkg = caller;
1814		1944
1815	no strict;
1816	push @{"$pkg\::ISA"}, __PACKAGE__;	1945	push @{"$pkg\::ISA"}, __PACKAGE__;
1817		1946
1818	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1947	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819	}	1948	}
1820		1949
1821	# also paths starting with '/'	1950	# also paths starting with '/'
1822	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1951	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823		1952
1824	sub thawer_merge {	1953	sub thawer_merge {
1825	my ($self, $merge) = @_;	1954	my ($self, $merge) = @_;
1826		1955
1827	# we have to keep some variables in memory intact	1956	# we have to keep some variables in memory intact
…		…
1832	}	1961	}
1833		1962
1834	sub normalise {	1963	sub normalise {
1835	my ($path, $base) = @_;	1964	my ($path, $base) = @_;
1836		1965
1837	$path = "$path"; # make sure its a string	1966	$path = "$path"; # make sure it's a string
1838		1967
1839	$path =~ s/\.map$//;	1968	$path =~ s/\.map$//;
1840		1969
1841	# map plan:	1970	# map plan:
1842	#	1971	#
…		…
1857	$base =~ s{[^/]+/?$}{};	1986	$base =~ s{[^/]+/?$}{};
1858	$path = "$base/$path";	1987	$path = "$base/$path";
1859	}	1988	}
1860		1989
1861	for ($path) {	1990	for ($path) {
1862	redo if s{//}{/};
1863	redo if s{/\.?/}{/};	1991	redo if s{/\.?/}{/};
1864	redo if s{/[^/]+/\.\./}{/};	1992	redo if s{/[^/]+/\.\./}{/};
1865	}	1993	}
1866		1994
1867	$path	1995	$path
…		…
1881	$self->init; # pass $1 etc.	2009	$self->init; # pass $1 etc.
1882	return $self;	2010	return $self;
1883	}	2011	}
1884	}	2012	}
1885		2013
1886	Carp::cluck "unable to resolve path '$path' (base '$base').";	2014	Carp::cluck "unable to resolve path '$path' (base '$base')";
1887	()	2015	()
1888	}	2016	}
1889		2017
		2018	# may re-bless or do other evil things
1890	sub init {	2019	sub init {
1891	my ($self) = @_;	2020	my ($self) = @_;
1892		2021
1893	$self	2022	$self
1894	}	2023	}
…		…
1959	$self->{load_path} = $path;	2088	$self->{load_path} = $path;
1960		2089
1961	1	2090	1
1962	}	2091	}
1963		2092
		2093	# used to laod the header of an original map
1964	sub load_header_orig {	2094	sub load_header_orig {
1965	my ($self) = @_;	2095	my ($self) = @_;
1966		2096
1967	$self->load_header_from ($self->load_path)	2097	$self->load_header_from ($self->load_path)
1968	}	2098	}
1969		2099
		2100	# used to laod the header of an instantiated map
1970	sub load_header_temp {	2101	sub load_header_temp {
1971	my ($self) = @_;	2102	my ($self) = @_;
1972		2103
1973	$self->load_header_from ($self->save_path)	2104	$self->load_header_from ($self->save_path)
1974	}	2105	}
1975		2106
		2107	# called after loading the header from an instantiated map
1976	sub prepare_temp {	2108	sub prepare_temp {
1977	my ($self) = @_;	2109	my ($self) = @_;
1978		2110
1979	$self->last_access ((delete $self->{last_access})	2111	$self->last_access ((delete $self->{last_access})
1980	|| $cf::RUNTIME); #d#	2112	|| $cf::RUNTIME); #d#
1981	# safety	2113	# safety
1982	$self->{instantiate_time} = $cf::RUNTIME	2114	$self->{instantiate_time} = $cf::RUNTIME
1983	if $self->{instantiate_time} > $cf::RUNTIME;	2115	if $self->{instantiate_time} > $cf::RUNTIME;
1984	}	2116	}
1985		2117
		2118	# called after loading the header from an original map
1986	sub prepare_orig {	2119	sub prepare_orig {
1987	my ($self) = @_;	2120	my ($self) = @_;
1988		2121
1989	$self->{load_original} = 1;	2122	$self->{load_original} = 1;
1990	$self->{instantiate_time} = $cf::RUNTIME;	2123	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2014		2147
2015	sub find;	2148	sub find;
2016	sub find {	2149	sub find {
2017	my ($path, $origin) = @_;	2150	my ($path, $origin) = @_;
2018		2151
		2152	cf::cede_to_tick;
		2153
2019	$path = normalise $path, $origin && $origin->path;	2154	$path = normalise $path, $origin;
2020		2155
2021	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2156	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2022	my $guard2 = cf::lock_acquire "map_find:$path";	2157	my $guard2 = cf::lock_acquire "map_find:$path";
2023		2158
2024	$cf::MAP{$path} || do {	2159	$cf::MAP{$path} || do {
…		…
2055		2190
2056	{	2191	{
2057	my $guard = cf::lock_acquire "map_data:$path";	2192	my $guard = cf::lock_acquire "map_data:$path";
2058		2193
2059	return unless $self->valid;	2194	return unless $self->valid;
2060	return unless $self->in_memory == cf::MAP_SWAPPED;	2195	return unless $self->state == cf::MAP_SWAPPED;
2061
2062	$self->in_memory (cf::MAP_LOADING);
2063		2196
2064	$self->alloc;	2197	$self->alloc;
2065		2198
2066	$self->pre_load;	2199	$self->pre_load;
2067	cf::cede_to_tick;	2200	cf::cede_to_tick;
2068		2201
		2202	if (exists $self->{load_path}) {
2069	my $f = new_from_file cf::object::thawer $self->{load_path};	2203	my $f = new_from_file cf::object::thawer $self->{load_path};
2070	$f->skip_block;	2204	$f->skip_block;
2071	$self->_load_objects ($f)	2205	$self->_load_objects ($f)
2072	or return;	2206	or return;
2073		2207
2074	$self->post_load_original	2208	$self->post_load_original
2075	if delete $self->{load_original};	2209	if delete $self->{load_original};
2076		2210
2077	if (my $uniq = $self->uniq_path) {	2211	if (my $uniq = $self->uniq_path) {
2078	utf8::encode $uniq;	2212	utf8::encode $uniq;
2079	unless (aio_stat $uniq) {	2213	unless (aio_stat $uniq) {
2080	if (my $f = new_from_file cf::object::thawer $uniq) {	2214	if (my $f = new_from_file cf::object::thawer $uniq) {
2081	$self->clear_unique_items;	2215	$self->clear_unique_items;
2082	$self->_load_objects ($f);	2216	$self->_load_objects ($f);
2083	$f->resolve_delayed_derefs;	2217	$f->resolve_delayed_derefs;
		2218	}
2084	}	2219	}
2085	}	2220	}
2086	}
2087		2221
2088	$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);
2089		2229
2090	cf::cede_to_tick;	2230	cf::cede_to_tick;
2091	# now do the right thing for maps	2231	# now do the right thing for maps
2092	$self->link_multipart_objects;	2232	$self->link_multipart_objects;
2093	$self->difficulty ($self->estimate_difficulty)	2233	$self->difficulty ($self->estimate_difficulty)
…		…
2097	unless ($self->{deny_activate}) {	2237	unless ($self->{deny_activate}) {
2098	$self->decay_objects;	2238	$self->decay_objects;
2099	$self->fix_auto_apply;	2239	$self->fix_auto_apply;
2100	$self->update_buttons;	2240	$self->update_buttons;
2101	cf::cede_to_tick;	2241	cf::cede_to_tick;
2102	$self->activate;	2242	#$self->activate; # no longer activate maps automatically
2103	}	2243	}
2104		2244
2105	$self->{last_save} = $cf::RUNTIME;	2245	$self->{last_save} = $cf::RUNTIME;
2106	$self->last_access ($cf::RUNTIME);	2246	$self->last_access ($cf::RUNTIME);
2107
2108	$self->in_memory (cf::MAP_ACTIVE);
2109	}	2247	}
2110		2248
2111	$self->post_load;	2249	$self->post_load;
		2250
		2251	1
2112	}	2252	}
2113		2253
2114	# customize the map for a given player, i.e.	2254	# customize the map for a given player, i.e.
2115	# return the _real_ map. used by e.g. per-player	2255	# return the _real_ map. used by e.g. per-player
2116	# maps to change the path to ~playername/mappath	2256	# maps to change the path to ~playername/mappath
…		…
2124	# if $self->per_party;	2264	# if $self->per_party;
2125		2265
2126	$self	2266	$self
2127	}	2267	}
2128		2268
2129	# find and load all maps in the 3x3 area around a map
2130	sub load_neighbours {
2131	my ($map) = @_;
2132
2133	my @neigh; # diagonal neighbours
2134
2135	for (0 .. 3) {
2136	my $neigh = $map->tile_path ($_)
2137	or next;
2138	$neigh = find $neigh, $map
2139	or next;
2140	$neigh->load;
2141
2142	push @neigh,
2143	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2144	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2145	}
2146
2147	for (grep defined $_->[0], @neigh) {
2148	my ($path, $origin) = @$_;
2149	my $neigh = find $path, $origin
2150	or next;
2151	$neigh->load;
2152	}
2153	}
2154
2155	sub find_sync {	2269	sub find_sync {
2156	my ($path, $origin) = @_;	2270	my ($path, $origin) = @_;
2157		2271
2158	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
2159	}	2277	}
2160		2278
2161	sub do_load_sync {	2279	sub do_load_sync {
2162	my ($map) = @_;	2280	my ($map) = @_;
2163		2281
		2282	# it's a bug to call this from the main context
2164	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2283	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2165	if $Coro::current == $Coro::main;	2284	if $Coro::current == $Coro::main;
2166		2285
2167	cf::sync_job { $map->load };	2286	$map->load;
2168	}	2287	}
2169		2288
2170	our %MAP_PREFETCH;	2289	our %MAP_PREFETCH;
2171	our $MAP_PREFETCHER = undef;	2290	our $MAP_PREFETCHER = undef;
2172		2291
2173	sub find_async {	2292	sub find_async {
2174	my ($path, $origin, $load) = @_;	2293	my ($path, $origin, $load) = @_;
2175		2294
2176	$path = normalise $path, $origin && $origin->{path};	2295	$path = normalise $path, $origin;
2177		2296
2178	if (my $map = $cf::MAP{$path}) {	2297	if (my $map = $cf::MAP{$path}) {
2179	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2298	return $map if !$load || $map->linkable;
2180	}	2299	}
2181		2300
2182	$MAP_PREFETCH{$path} |= $load;	2301	$MAP_PREFETCH{$path} |= $load;
2183		2302
2184	$MAP_PREFETCHER ||= cf::async {	2303	$MAP_PREFETCHER ||= cf::async {
…		…
2198	$MAP_PREFETCHER->prio (6);	2317	$MAP_PREFETCHER->prio (6);
2199		2318
2200	()	2319	()
2201	}	2320	}
2202		2321
		2322	# common code, used by both ->save and ->swapout
2203	sub save {	2323	sub _save {
2204	my ($self) = @_;	2324	my ($self) = @_;
2205
2206	my $lock = cf::lock_acquire "map_data:$self->{path}";
2207		2325
2208	$self->{last_save} = $cf::RUNTIME;	2326	$self->{last_save} = $cf::RUNTIME;
2209		2327
2210	return unless $self->dirty;	2328	return unless $self->dirty;
2211		2329
…		…
2231	} else {	2349	} else {
2232	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2350	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2233	}	2351	}
2234	}	2352	}
2235		2353
		2354	sub save {
		2355	my ($self) = @_;
		2356
		2357	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2358
		2359	$self->_save;
		2360	}
		2361
2236	sub swap_out {	2362	sub swap_out {
2237	my ($self) = @_;	2363	my ($self) = @_;
2238		2364
2239	# save first because save cedes
2240	$self->save;
2241
2242	my $lock = cf::lock_acquire "map_data:$self->{path}";	2365	my $lock = cf::lock_acquire "map_data:$self->{path}";
2243		2366
		2367	return if !$self->linkable;
		2368	return if $self->{deny_save};
2244	return if $self->players;	2369	return if $self->players;
2245	return if $self->in_memory != cf::MAP_ACTIVE;	2370
		2371	# first deactivate the map and "unlink" it from the core
		2372	$self->deactivate;
		2373	$_->clear_links_to ($self) for values %cf::MAP;
		2374	$self->state (cf::MAP_SWAPPED);
		2375
		2376	# then atomically save
		2377	$self->_save;
		2378
		2379	# then free the map
		2380	$self->clear;
		2381	}
		2382
		2383	sub reset_at {
		2384	my ($self) = @_;
		2385
		2386	# TODO: safety, remove and allow resettable per-player maps
2246	return if $self->{deny_save};	2387	return 1e99 if $self->{deny_reset};
2247		2388
		2389	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2390	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2391
		2392	$time + $to
		2393	}
		2394
		2395	sub should_reset {
		2396	my ($self) = @_;
		2397
		2398	$self->reset_at <= $cf::RUNTIME
		2399	}
		2400
		2401	sub reset {
		2402	my ($self) = @_;
		2403
		2404	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2405
		2406	return if $self->players;
		2407
		2408	cf::trace "resetting map ", $self->path, "\n";
		2409
2248	$self->in_memory (cf::MAP_SWAPPED);	2410	$self->state (cf::MAP_SWAPPED);
		2411
		2412	# need to save uniques path
		2413	unless ($self->{deny_save}) {
		2414	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2415
		2416	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2417	if $uniq;
		2418	}
		2419
		2420	delete $cf::MAP{$self->path};
2249		2421
2250	$self->deactivate;	2422	$self->deactivate;
2251	$_->clear_links_to ($self) for values %cf::MAP;	2423	$_->clear_links_to ($self) for values %cf::MAP;
2252	$self->clear;	2424	$self->clear;
2253	}
2254
2255	sub reset_at {
2256	my ($self) = @_;
2257
2258	# TODO: safety, remove and allow resettable per-player maps
2259	return 1e99 if $self->{deny_reset};
2260
2261	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2262	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2263
2264	$time + $to
2265	}
2266
2267	sub should_reset {
2268	my ($self) = @_;
2269
2270	$self->reset_at <= $cf::RUNTIME
2271	}
2272
2273	sub reset {
2274	my ($self) = @_;
2275
2276	my $lock = cf::lock_acquire "map_data:$self->{path}";
2277
2278	return if $self->players;
2279
2280	warn "resetting map ", $self->path, "\n";
2281
2282	$self->in_memory (cf::MAP_SWAPPED);
2283
2284	# need to save uniques path
2285	unless ($self->{deny_save}) {
2286	my $uniq = $self->uniq_path; utf8::encode $uniq;
2287
2288	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2289	if $uniq;
2290	}
2291
2292	delete $cf::MAP{$self->path};
2293
2294	$self->deactivate;
2295	$_->clear_links_to ($self) for values %cf::MAP;
2296	$self->clear;
2297		2425
2298	$self->unlink_save;	2426	$self->unlink_save;
2299	$self->destroy;	2427	$self->destroy;
2300	}	2428	}
2301		2429
…		…
2309		2437
2310	delete $cf::MAP{$self->path};	2438	delete $cf::MAP{$self->path};
2311		2439
2312	$self->unlink_save;	2440	$self->unlink_save;
2313		2441
2314	bless $self, "cf::map";	2442	bless $self, "cf::map::wrap";
2315	delete $self->{deny_reset};	2443	delete $self->{deny_reset};
2316	$self->{deny_save} = 1;	2444	$self->{deny_save} = 1;
2317	$self->reset_timeout (1);	2445	$self->reset_timeout (1);
2318	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2446	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2319		2447
…		…
2549		2677
2550	Freezes the player and moves him/her to a special map (C<{link}>).	2678	Freezes the player and moves him/her to a special map (C<{link}>).
2551		2679
2552	The player should be reasonably safe there for short amounts of time (e.g.	2680	The player should be reasonably safe there for short amounts of time (e.g.
2553	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2681	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2554	though, as the palyer cannot control the character while it is on the link	2682	though, as the player cannot control the character while it is on the link
2555	map.	2683	map.
2556		2684
2557	Will never block.	2685	Will never block.
2558		2686
2559	=item $player_object->leave_link ($map, $x, $y)	2687	=item $player_object->leave_link ($map, $x, $y)
…		…
2580	sub cf::object::player::enter_link {	2708	sub cf::object::player::enter_link {
2581	my ($self) = @_;	2709	my ($self) = @_;
2582		2710
2583	$self->deactivate_recursive;	2711	$self->deactivate_recursive;
2584		2712
		2713	++$self->{_link_recursion};
		2714
2585	return if UNIVERSAL::isa $self->map, "ext::map_link";	2715	return if UNIVERSAL::isa $self->map, "ext::map_link";
2586		2716
2587	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2717	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2588	if $self->map && $self->map->{path} ne "{link}";	2718	if $self->map && $self->map->{path} ne "{link}";
2589		2719
2590	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2720	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2591	}	2721	}
2592		2722
2593	sub cf::object::player::leave_link {	2723	sub cf::object::player::leave_link {
2594	my ($self, $map, $x, $y) = @_;	2724	my ($self, $map, $x, $y) = @_;
2595		2725
…		…
2615	# use -1 or undef as default coordinates, not 0, 0	2745	# use -1 or undef as default coordinates, not 0, 0
2616	($x, $y) = ($map->enter_x, $map->enter_y)	2746	($x, $y) = ($map->enter_x, $map->enter_y)
2617	if $x <= 0 && $y <= 0;	2747	if $x <= 0 && $y <= 0;
2618		2748
2619	$map->load;	2749	$map->load;
2620	$map->load_neighbours;
2621		2750
2622	return unless $self->contr->active;	2751	return unless $self->contr->active;
2623		2752
2624	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2753	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2625	$self->enter_map ($map, $x, $y);	2754	if ($self->enter_map ($map, $x, $y)) {
2626		2755	# entering was successful
		2756	delete $self->{_link_recursion};
2627	# only activate afterwards, to support waiting in hooks	2757	# only activate afterwards, to support waiting in hooks
2628	$self->activate_recursive;	2758	$self->activate_recursive;
2629	}	2759	}
2630		2760
		2761	}
		2762
2631	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2763	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2632		2764
2633	Moves the player to the given map-path and coordinates by first freezing	2765	Moves the player to the given map-path and coordinates by first freezing
2634	her, loading and preparing them map, calling the provided $check callback	2766	her, loading and preparing them map, calling the provided $check callback
2635	that has to return the map if sucecssful, and then unfreezes the player on	2767	that has to return the map if sucecssful, and then unfreezes the player on
2636	the new (success) or old (failed) map position. In either case, $done will	2768	the new (success) or old (failed) map position. In either case, $done will
…		…
2643		2775
2644	our $GOTOGEN;	2776	our $GOTOGEN;
2645		2777
2646	sub cf::object::player::goto {	2778	sub cf::object::player::goto {
2647	my ($self, $path, $x, $y, $check, $done) = @_;	2779	my ($self, $path, $x, $y, $check, $done) = @_;
		2780
		2781	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2782	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2783	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2784	($path, $x, $y) = @$EMERGENCY_POSITION;
		2785	}
2648		2786
2649	# 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
2650	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2788	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2651		2789
2652	$self->enter_link;	2790	$self->enter_link;
…		…
2672	($path, $x, $y) = (undef, undef, undef);	2810	($path, $x, $y) = (undef, undef, undef);
2673	}	2811	}
2674	}	2812	}
2675		2813
2676	my $map = eval {	2814	my $map = eval {
2677	my $map = defined $path ? cf::map::find $path : undef;	2815	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2678		2816
2679	if ($map) {	2817	if ($map) {
2680	$map = $map->customise_for ($self);	2818	$map = $map->customise_for ($self);
2681	$map = $check->($map) if $check && $map;	2819	$map = $check->($map, $x, $y, $self) if $check && $map;
2682	} else {	2820	} else {
2683	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2821	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2684	}	2822	}
2685		2823
2686	$map	2824	$map
…		…
2694	if ($gen == $self->{_goto_generation}) {	2832	if ($gen == $self->{_goto_generation}) {
2695	delete $self->{_goto_generation};	2833	delete $self->{_goto_generation};
2696	$self->leave_link ($map, $x, $y);	2834	$self->leave_link ($map, $x, $y);
2697	}	2835	}
2698		2836
2699	$done->() if $done;	2837	$done->($self) if $done;
2700	})->prio (1);	2838	})->prio (1);
2701	}	2839	}
2702		2840
2703	=item $player_object->enter_exit ($exit_object)	2841	=item $player_object->enter_exit ($exit_object)
2704		2842
…		…
2772	$Coro::current->{desc} = "enter_exit";	2910	$Coro::current->{desc} = "enter_exit";
2773		2911
2774	unless (eval {	2912	unless (eval {
2775	$self->deactivate_recursive; # just to be sure	2913	$self->deactivate_recursive; # just to be sure
2776		2914
2777	# random map handling
2778	{
2779	my $guard = cf::lock_acquire "exit_prepare:$exit";
2780
2781	prepare_random_map $exit
2782	if $exit->slaying eq "/!";
2783	}
2784
2785	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2915	my $map = cf::map::normalise $exit->slaying, $exit->map;
2786	my $x = $exit->stats->hp;	2916	my $x = $exit->stats->hp;
2787	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	}
2788		2941
2789	$self->goto ($map, $x, $y);	2942	$self->goto ($map, $x, $y);
2790		2943
2791	# if exit is damned, update players death & WoR home-position	2944	# if exit is damned, update players death & WoR home-position
2792	$self->contr->savebed ($map, $x, $y)	2945	$self->contr->savebed ($map, $x, $y)
…		…
2797	$self->message ("Something went wrong deep within the deliantra server. "	2950	$self->message ("Something went wrong deep within the deliantra server. "
2798	. "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. "
2799	. "Please report this to the dungeon master!",	2952	. "Please report this to the dungeon master!",
2800	cf::NDI_UNIQUE | cf::NDI_RED);	2953	cf::NDI_UNIQUE | cf::NDI_RED);
2801		2954
2802	warn "ERROR in enter_exit: $@";	2955	error "ERROR in enter_exit: $@";
2803	$self->leave_link;	2956	$self->leave_link;
2804	}	2957	}
2805	})->prio (1);	2958	})->prio (1);
2806	}	2959	}
2807		2960
…		…
3034	=cut	3187	=cut
3035		3188
3036	sub cf::client::ext_reply($$@) {	3189	sub cf::client::ext_reply($$@) {
3037	my ($self, $id, @msg) = @_;	3190	my ($self, $id, @msg) = @_;
3038		3191
3039	if ($self->extcmd == 2) {	3192	return unless $self->extcmd == 2;
		3193
3040	$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]));
3041	} elsif ($self->extcmd == 1) {
3042	#TODO: version 1, remove
3043	unshift @msg, msgtype => "reply", msgid => $id;
3044	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3045	}
3046	}	3195	}
3047		3196
3048	=item $success = $client->query ($flags, "text", \&cb)	3197	=item $success = $client->query ($flags, "text", \&cb)
3049		3198
3050	Queues a query to the client, calling the given callback with	3199	Queues a query to the client, calling the given callback with
…		…
3105	my ($ns, $buf) = @_;	3254	my ($ns, $buf) = @_;
3106		3255
3107	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3256	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3108		3257
3109	if (ref $msg) {	3258	if (ref $msg) {
3110	my ($type, $reply, @payload) =	3259	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3111	"ARRAY" eq ref $msg
3112	? @$msg
3113	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3114		3260
3115	my @reply;	3261	my @reply;
3116		3262
3117	if (my $cb = $EXTICMD{$type}) {	3263	if (my $cb = $EXTICMD{$type}) {
3118	@reply = $cb->($ns, @payload);	3264	@reply = $cb->($ns, @payload);
…		…
3120		3266
3121	$ns->ext_reply ($reply, @reply)	3267	$ns->ext_reply ($reply, @reply)
3122	if $reply;	3268	if $reply;
3123		3269
3124	} else {	3270	} else {
3125	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";
3126	}	3272	}
3127		3273
3128	cf::override;	3274	cf::override;
3129	},	3275	},
3130	);	3276	);
…		…
3211	decrease split destroy change_exp value msg lore send_msg)],	3357	decrease split destroy change_exp value msg lore send_msg)],
3212	["cf::object::player" => qw(player)],	3358	["cf::object::player" => qw(player)],
3213	["cf::player" => qw(peaceful send_msg)],	3359	["cf::player" => qw(peaceful send_msg)],
3214	["cf::map" => qw(trigger)],	3360	["cf::map" => qw(trigger)],
3215	) {	3361	) {
3216	no strict 'refs';
3217	my ($pkg, @funs) = @$_;	3362	my ($pkg, @funs) = @$_;
3218	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3363	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3219	for @funs;	3364	for @funs;
3220	}	3365	}
3221		3366
…		…
3260	local @cf::_safe_eval_args = values %vars;	3405	local @cf::_safe_eval_args = values %vars;
3261	@res = wantarray ? eval eval : scalar eval $eval;	3406	@res = wantarray ? eval eval : scalar eval $eval;
3262	}	3407	}
3263		3408
3264	if ($@) {	3409	if ($@) {
3265	warn "$@";	3410	warn "$@",
3266	warn "while executing safe code '$code'\n";	3411	"while executing safe code '$code'\n",
3267	warn "with arguments " . (join " ", %vars) . "\n";	3412	"with arguments " . (join " ", %vars) . "\n";
3268	}	3413	}
3269		3414
3270	wantarray ? @res : $res[0]	3415	wantarray ? @res : $res[0]
3271	}	3416	}
3272		3417
…		…
3306	# for this (global event?)	3451	# for this (global event?)
3307	%ext::player_env::MUSIC_FACE_CACHE = ();	3452	%ext::player_env::MUSIC_FACE_CACHE = ();
3308		3453
3309	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3454	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3310		3455
3311	warn "loading facedata from $path\n";	3456	trace "loading facedata from $path\n";
3312		3457
3313	my $facedata;	3458	my $facedata = decode_storable load_file $path;
3314	0 < aio_load $path, $facedata
3315	or die "$path: $!";
3316
3317	$facedata = Coro::Storable::thaw $facedata;
3318		3459
3319	$facedata->{version} == 2	3460	$facedata->{version} == 2
3320	or cf::cleanup "$path: version mismatch, cannot proceed.";	3461	or cf::cleanup "$path: version mismatch, cannot proceed.";
3321		3462
3322	# patch in the exptable	3463	# patch in the exptable
…		…
3336		3477
3337	cf::face::set_visibility $idx, $info->{visibility};	3478	cf::face::set_visibility $idx, $info->{visibility};
3338	cf::face::set_magicmap $idx, $info->{magicmap};	3479	cf::face::set_magicmap $idx, $info->{magicmap};
3339	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3480	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3340	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} ;
3341		3483
3342	cf::cede_to_tick;	3484	cf::cede_to_tick;
3343	}	3485	}
3344		3486
3345	while (my ($face, $info) = each %$faces) {	3487	while (my ($face, $info) = each %$faces) {
…		…
3350		3492
3351	if (my $smooth = cf::face::find $info->{smooth}) {	3493	if (my $smooth = cf::face::find $info->{smooth}) {
3352	cf::face::set_smooth $idx, $smooth;	3494	cf::face::set_smooth $idx, $smooth;
3353	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3495	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3354	} else {	3496	} else {
3355	warn "smooth face '$info->{smooth}' not found for face '$face'";	3497	error "smooth face '$info->{smooth}' not found for face '$face'";
3356	}	3498	}
3357		3499
3358	cf::cede_to_tick;	3500	cf::cede_to_tick;
3359	}	3501	}
3360	}	3502	}
…		…
3372		3514
3373	{	3515	{
3374	my $res = $facedata->{resource};	3516	my $res = $facedata->{resource};
3375		3517
3376	while (my ($name, $info) = each %$res) {	3518	while (my ($name, $info) = each %$res) {
3377	if (defined $info->{type}) {	3519	if (defined (my $type = $info->{type})) {
		3520	# TODO: different hash - must free and use new index, or cache ixface data queue
3378	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3521	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3379		3522
3380	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3523	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3381	cf::face::set_type $idx, $info->{type};	3524	cf::face::set_type $idx, $type;
		3525	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3382	} else {	3526	} else {
3383	$RESOURCE{$name} = $info;	3527	# $RESOURCE{$name} = $info; # unused
3384	}	3528	}
3385		3529
3386	cf::cede_to_tick;	3530	cf::cede_to_tick;
3387	}	3531	}
3388	}	3532	}
3389		3533
3390	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3534	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3391		3535
3392	1	3536	1
3393	}	3537	}
3394
3395	cf::global->attach (on_resource_update => sub {
3396	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3397	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3398
3399	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3400	my $sound = $soundconf->{compat}[$_]
3401	or next;
3402
3403	my $face = cf::face::find "sound/$sound->[1]";
3404	cf::sound::set $sound->[0] => $face;
3405	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3406	}
3407
3408	while (my ($k, $v) = each %{$soundconf->{event}}) {
3409	my $face = cf::face::find "sound/$v";
3410	cf::sound::set $k => $face;
3411	}
3412	}
3413	});
3414		3538
3415	register_exticmd fx_want => sub {	3539	register_exticmd fx_want => sub {
3416	my ($ns, $want) = @_;	3540	my ($ns, $want) = @_;
3417		3541
3418	while (my ($k, $v) = each %$want) {	3542	while (my ($k, $v) = each %$want) {
…		…
3457	sub reload_treasures {	3581	sub reload_treasures {
3458	load_resource_file "$DATADIR/treasures"	3582	load_resource_file "$DATADIR/treasures"
3459	or die "unable to load treasurelists\n";	3583	or die "unable to load treasurelists\n";
3460	}	3584	}
3461		3585
		3586	sub reload_sound {
		3587	trace "loading sound config from $DATADIR/sound\n";
		3588
		3589	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3590
		3591	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3592	my $sound = $soundconf->{compat}[$_]
		3593	or next;
		3594
		3595	my $face = cf::face::find "sound/$sound->[1]";
		3596	cf::sound::set $sound->[0] => $face;
		3597	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3598	}
		3599
		3600	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3601	my $face = cf::face::find "sound/$v";
		3602	cf::sound::set $k => $face;
		3603	}
		3604	}
		3605
3462	sub reload_resources {	3606	sub reload_resources {
3463	warn "reloading resource files...\n";	3607	trace "reloading resource files...\n";
3464		3608
		3609	reload_exp_table;
		3610	reload_materials;
3465	reload_facedata;	3611	reload_facedata;
		3612	reload_sound;
3466	reload_archetypes;	3613	reload_archetypes;
3467	reload_regions;	3614	reload_regions;
3468	reload_treasures;	3615	reload_treasures;
3469		3616
3470	warn "finished reloading resource files\n";	3617	trace "finished reloading resource files\n";
3471	}	3618	}
3472		3619
3473	sub reload_config {	3620	sub reload_config {
3474	warn "reloading config file...\n";	3621	trace "reloading config file...\n";
3475		3622
3476	open my $fh, "<:utf8", "$CONFDIR/config"	3623	my $config = load_file "$CONFDIR/config";
3477	or return;	3624	utf8::decode $config;
		3625	*CFG = decode_yaml $config;
3478		3626
3479	local $/;
3480	*CFG = YAML::XS::Load scalar <$fh>;
3481
3482	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3627	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3483		3628
3484	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3629	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3485	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3630	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3486		3631
3487	if (exists $CFG{mlockall}) {	3632	if (exists $CFG{mlockall}) {
…		…
3489	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3634	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3490	and die "WARNING: m(un)lockall failed: $!\n";	3635	and die "WARNING: m(un)lockall failed: $!\n";
3491	};	3636	};
3492	warn $@ if $@;	3637	warn $@ if $@;
3493	}	3638	}
3494
3495	warn "finished reloading resource files\n";
3496	}	3639	}
3497		3640
3498	sub pidfile() {	3641	sub pidfile() {
3499	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3642	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3500	or die "$PIDFILE: $!";	3643	or die "$PIDFILE: $!";
…		…
3513	seek $fh, 0, 0;	3656	seek $fh, 0, 0;
3514	print $fh $$;	3657	print $fh $$;
3515	}	3658	}
3516		3659
3517	sub main_loop {	3660	sub main_loop {
3518	warn "EV::loop starting\n";	3661	trace "EV::loop starting\n";
3519	if (1) {	3662	if (1) {
3520	EV::loop;	3663	EV::loop;
3521	}	3664	}
3522	warn "EV::loop returned\n";	3665	trace "EV::loop returned\n";
3523	goto &main_loop unless $REALLY_UNLOOP;	3666	goto &main_loop unless $REALLY_UNLOOP;
3524	}	3667	}
3525		3668
3526	sub main {	3669	sub main {
3527	cf::init_globals; # initialise logging	3670	cf::init_globals; # initialise logging
3528		3671
3529	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3672	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3673	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3531	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3674	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3675	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3533
3534	cf::init_experience;
3535	cf::init_anim;
3536	cf::init_attackmess;
3537	cf::init_dynamic;
3538		3676
3539	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3677	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3540		3678
3541	# we must not ever block the main coroutine	3679	# we must not ever block the main coroutine
3542	local $Coro::idle = sub {	3680	local $Coro::idle = sub {
…		…
3548	};	3686	};
3549		3687
3550	evthread_start IO::AIO::poll_fileno;	3688	evthread_start IO::AIO::poll_fileno;
3551		3689
3552	cf::sync_job {	3690	cf::sync_job {
		3691	cf::incloader::init ();
		3692
		3693	cf::init_anim;
		3694	cf::init_attackmess;
		3695	cf::init_dynamic;
		3696
3553	cf::load_settings;	3697	cf::load_settings;
3554	cf::load_materials;
3555		3698
3556	reload_resources;	3699	reload_resources;
3557	reload_config;	3700	reload_config;
3558	db_init;	3701	db_init;
3559		3702
…		…
3571		3714
3572	# no (long-running) fork's whatsoever before this point(!)	3715	# no (long-running) fork's whatsoever before this point(!)
3573	use POSIX ();	3716	use POSIX ();
3574	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3717	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3575		3718
3576	(pop @POST_INIT)->(0) while @POST_INIT;	3719	cf::_post_init 0;
3577	};	3720	};
3578		3721
		3722	cf::object::thawer::errors_are_fatal 0;
		3723	info "parse errors in files are no longer fatal from this point on.\n";
		3724
		3725	AE::postpone {
		3726	undef &main; # free gobs of memory :)
		3727	};
		3728
3579	main_loop;	3729	goto &main_loop;
3580	}	3730	}
3581		3731
3582	#############################################################################	3732	#############################################################################
3583	# initialisation and cleanup	3733	# initialisation and cleanup
3584		3734
…		…
3623	or return;	3773	or return;
3624		3774
3625	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3775	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3626	and return;	3776	and return;
3627		3777
3628	warn sprintf "runtime file written (%gs).\n", AE::time - $t0;	3778	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3629		3779
3630	1	3780	1
3631	}	3781	}
3632		3782
3633	our $uuid_lock;	3783	our $uuid_lock;
…		…
3645	or return;	3795	or return;
3646		3796
3647	my $value = uuid_seq uuid_cur;	3797	my $value = uuid_seq uuid_cur;
3648		3798
3649	unless ($value) {	3799	unless ($value) {
3650	warn "cowardly refusing to write zero uuid value!\n";	3800	info "cowardly refusing to write zero uuid value!\n";
3651	return;	3801	return;
3652	}	3802	}
3653		3803
3654	my $value = uuid_str $value + $uuid_skip;	3804	my $value = uuid_str $value + $uuid_skip;
3655	$uuid_skip = 0;	3805	$uuid_skip = 0;
…		…
3665	or return;	3815	or return;
3666		3816
3667	aio_rename "$uuid~", $uuid	3817	aio_rename "$uuid~", $uuid
3668	and return;	3818	and return;
3669		3819
3670	warn "uuid file written ($value).\n";	3820	trace "uuid file written ($value).\n";
3671		3821
3672	1	3822	1
3673		3823
3674	}	3824	}
3675		3825
…		…
3681	}	3831	}
3682		3832
3683	sub emergency_save() {	3833	sub emergency_save() {
3684	my $freeze_guard = cf::freeze_mainloop;	3834	my $freeze_guard = cf::freeze_mainloop;
3685		3835
3686	warn "emergency_perl_save: enter\n";	3836	info "emergency_perl_save: enter\n";
		3837
		3838	# this is a trade-off: we want to be very quick here, so
		3839	# save all maps without fsync, and later call a global sync
		3840	# (which in turn might be very very slow)
		3841	local $USE_FSYNC = 0;
3687		3842
3688	cf::sync_job {	3843	cf::sync_job {
3689	# this is a trade-off: we want to be very quick here, so	3844	cf::write_runtime_sync; # external watchdog should not bark
3690	# save all maps without fsync, and later call a global sync
3691	# (which in turn might be very very slow)
3692	local $USE_FSYNC = 0;
3693		3845
3694	# use a peculiar iteration method to avoid tripping on perl	3846	# use a peculiar iteration method to avoid tripping on perl
3695	# refcount bugs in for. also avoids problems with players	3847	# refcount bugs in for. also avoids problems with players
3696	# and maps saved/destroyed asynchronously.	3848	# and maps saved/destroyed asynchronously.
3697	warn "emergency_perl_save: begin player save\n";	3849	info "emergency_perl_save: begin player save\n";
3698	for my $login (keys %cf::PLAYER) {	3850	for my $login (keys %cf::PLAYER) {
3699	my $pl = $cf::PLAYER{$login} or next;	3851	my $pl = $cf::PLAYER{$login} or next;
3700	$pl->valid or next;	3852	$pl->valid or next;
3701	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3853	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3702	$pl->save;	3854	$pl->save;
3703	}	3855	}
3704	warn "emergency_perl_save: end player save\n";	3856	info "emergency_perl_save: end player save\n";
3705		3857
		3858	cf::write_runtime_sync; # external watchdog should not bark
		3859
3706	warn "emergency_perl_save: begin map save\n";	3860	info "emergency_perl_save: begin map save\n";
3707	for my $path (keys %cf::MAP) {	3861	for my $path (keys %cf::MAP) {
3708	my $map = $cf::MAP{$path} or next;	3862	my $map = $cf::MAP{$path} or next;
3709	$map->valid or next;	3863	$map->valid or next;
3710	$map->save;	3864	$map->save;
3711	}	3865	}
3712	warn "emergency_perl_save: end map save\n";	3866	info "emergency_perl_save: end map save\n";
3713		3867
		3868	cf::write_runtime_sync; # external watchdog should not bark
		3869
3714	warn "emergency_perl_save: begin database checkpoint\n";	3870	info "emergency_perl_save: begin database checkpoint\n";
3715	BDB::db_env_txn_checkpoint $DB_ENV;	3871	BDB::db_env_txn_checkpoint $DB_ENV;
3716	warn "emergency_perl_save: end database checkpoint\n";	3872	info "emergency_perl_save: end database checkpoint\n";
3717		3873
3718	warn "emergency_perl_save: begin write uuid\n";	3874	info "emergency_perl_save: begin write uuid\n";
3719	write_uuid_sync 1;	3875	write_uuid_sync 1;
3720	warn "emergency_perl_save: end write uuid\n";	3876	info "emergency_perl_save: end write uuid\n";
		3877
		3878	cf::write_runtime_sync; # external watchdog should not bark
		3879
		3880	trace "emergency_perl_save: syncing database to disk";
		3881	BDB::db_env_txn_checkpoint $DB_ENV;
		3882
		3883	info "emergency_perl_save: starting sync\n";
		3884	IO::AIO::aio_sync sub {
		3885	info "emergency_perl_save: finished sync\n";
		3886	};
		3887
		3888	cf::write_runtime_sync; # external watchdog should not bark
		3889
		3890	trace "emergency_perl_save: flushing outstanding aio requests";
		3891	while (IO::AIO::nreqs || BDB::nreqs) {
		3892	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		3893	}
		3894
		3895	cf::write_runtime_sync; # external watchdog should not bark
3721	};	3896	};
3722		3897
3723	warn "emergency_perl_save: starting sync()\n";
3724	IO::AIO::aio_sync sub {
3725	warn "emergency_perl_save: finished sync()\n";
3726	};
3727
3728	warn "emergency_perl_save: leave\n";	3898	info "emergency_perl_save: leave\n";
3729	}	3899	}
3730		3900
3731	sub post_cleanup {	3901	sub post_cleanup {
3732	my ($make_core) = @_;	3902	my ($make_core) = @_;
3733		3903
		3904	IO::AIO::flush;
		3905
3734	warn Carp::longmess "post_cleanup backtrace"	3906	error Carp::longmess "post_cleanup backtrace"
3735	if $make_core;	3907	if $make_core;
3736		3908
3737	my $fh = pidfile;	3909	my $fh = pidfile;
3738	unlink $PIDFILE if <$fh> == $$;	3910	unlink $PIDFILE if <$fh> == $$;
3739	}	3911	}
…		…
3759	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3931	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3760	for my $name (keys %$leaf_symtab) {	3932	for my $name (keys %$leaf_symtab) {
3761	_gv_clear *{"$pkg$name"};	3933	_gv_clear *{"$pkg$name"};
3762	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3934	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3763	}	3935	}
3764	warn "cleared package $pkg\n";#d#
3765	}	3936	}
3766		3937
3767	sub do_reload_perl() {	3938	sub do_reload_perl() {
3768	# can/must only be called in main	3939	# can/must only be called in main
3769	if ($Coro::current != $Coro::main) {	3940	unless (in_main) {
3770	warn "can only reload from main coroutine";	3941	error "can only reload from main coroutine";
3771	return;	3942	return;
3772	}	3943	}
3773		3944
3774	return if $RELOAD++;	3945	return if $RELOAD++;
3775		3946
3776	my $t1 = AE::time;	3947	my $t1 = AE::time;
3777		3948
3778	while ($RELOAD) {	3949	while ($RELOAD) {
3779	warn "reloading...";	3950	cf::get_slot 0.1, -1, "reload_perl";
		3951	info "perl_reload: reloading...";
3780		3952
3781	warn "entering sync_job";	3953	trace "perl_reload: entering sync_job";
3782		3954
3783	cf::sync_job {	3955	cf::sync_job {
3784	cf::write_runtime_sync; # external watchdog should not bark
3785	cf::emergency_save;	3956	#cf::emergency_save;
3786	cf::write_runtime_sync; # external watchdog should not bark
3787		3957
3788	warn "syncing database to disk";
3789	BDB::db_env_txn_checkpoint $DB_ENV;
3790
3791	# if anything goes wrong in here, we should simply crash as we already saved
3792
3793	warn "flushing outstanding aio requests";
3794	while (IO::AIO::nreqs || BDB::nreqs) {
3795	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3796	}
3797
3798	warn "cancelling all extension coros";	3958	trace "perl_reload: cancelling all extension coros";
3799	$_->cancel for values %EXT_CORO;	3959	$_->cancel for values %EXT_CORO;
3800	%EXT_CORO = ();	3960	%EXT_CORO = ();
3801		3961
3802	warn "removing commands";	3962	trace "perl_reload: removing commands";
3803	%COMMAND = ();	3963	%COMMAND = ();
3804		3964
3805	warn "removing ext/exti commands";	3965	trace "perl_reload: removing ext/exti commands";
3806	%EXTCMD = ();	3966	%EXTCMD = ();
3807	%EXTICMD = ();	3967	%EXTICMD = ();
3808		3968
3809	warn "unloading/nuking all extensions";	3969	trace "perl_reload: unloading/nuking all extensions";
3810	for my $pkg (@EXTS) {	3970	for my $pkg (@EXTS) {
3811	warn "... unloading $pkg";	3971	trace "... unloading $pkg";
3812		3972
3813	if (my $cb = $pkg->can ("unload")) {	3973	if (my $cb = $pkg->can ("unload")) {
3814	eval {	3974	eval {
3815	$cb->($pkg);	3975	$cb->($pkg);
3816	1	3976	1
3817	} or warn "$pkg unloaded, but with errors: $@";	3977	} or error "$pkg unloaded, but with errors: $@";
3818	}	3978	}
3819		3979
3820	warn "... clearing $pkg";	3980	trace "... clearing $pkg";
3821	clear_package $pkg;	3981	clear_package $pkg;
3822	}	3982	}
3823		3983
3824	warn "unloading all perl modules loaded from $LIBDIR";	3984	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3825	while (my ($k, $v) = each %INC) {	3985	while (my ($k, $v) = each %INC) {
3826	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3986	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3827		3987
3828	warn "... unloading $k";	3988	trace "... unloading $k";
3829	delete $INC{$k};	3989	delete $INC{$k};
3830		3990
3831	$k =~ s/\.pm$//;	3991	$k =~ s/\.pm$//;
3832	$k =~ s/\//::/g;	3992	$k =~ s/\//::/g;
3833		3993
…		…
3836	}	3996	}
3837		3997
3838	clear_package $k;	3998	clear_package $k;
3839	}	3999	}
3840		4000
3841	warn "getting rid of safe::, as good as possible";	4001	trace "perl_reload: getting rid of safe::, as good as possible";
3842	clear_package "safe::$_"	4002	clear_package "safe::$_"
3843	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4003	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3844		4004
3845	warn "unloading cf.pm \"a bit\"";	4005	trace "perl_reload: unloading cf.pm \"a bit\"";
3846	delete $INC{"cf.pm"};	4006	delete $INC{"cf.pm"};
3847	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4007	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3848		4008
3849	# don't, removes xs symbols, too,	4009	# don't, removes xs symbols, too,
3850	# and global variables created in xs	4010	# and global variables created in xs
3851	#clear_package __PACKAGE__;	4011	#clear_package __PACKAGE__;
3852		4012
3853	warn "unload completed, starting to reload now";	4013	info "perl_reload: unload completed, starting to reload now";
3854		4014
3855	warn "reloading cf.pm";	4015	trace "perl_reload: reloading cf.pm";
3856	require cf;	4016	require cf;
3857	cf::_connect_to_perl_1;	4017	cf::_connect_to_perl_1;
3858		4018
3859	warn "loading config and database again";	4019	trace "perl_reload: loading config and database again";
3860	cf::reload_config;	4020	cf::reload_config;
3861		4021
3862	warn "loading extensions";	4022	trace "perl_reload: loading extensions";
3863	cf::load_extensions;	4023	cf::load_extensions;
3864		4024
3865	if ($REATTACH_ON_RELOAD) {	4025	if ($REATTACH_ON_RELOAD) {
3866	warn "reattaching attachments to objects/players";	4026	trace "perl_reload: reattaching attachments to objects/players";
3867	_global_reattach; # objects, sockets	4027	_global_reattach; # objects, sockets
3868	warn "reattaching attachments to maps";	4028	trace "perl_reload: reattaching attachments to maps";
3869	reattach $_ for values %MAP;	4029	reattach $_ for values %MAP;
3870	warn "reattaching attachments to players";	4030	trace "perl_reload: reattaching attachments to players";
3871	reattach $_ for values %PLAYER;	4031	reattach $_ for values %PLAYER;
3872	}	4032	}
3873		4033
3874	warn "running post_init jobs";	4034	cf::_post_init 1;
3875	(pop @POST_INIT)->(1) while @POST_INIT;
3876		4035
3877	warn "leaving sync_job";	4036	trace "perl_reload: leaving sync_job";
3878		4037
3879	1	4038	1
3880	} or do {	4039	} or do {
3881	warn $@;	4040	error $@;
3882	cf::cleanup "error while reloading, exiting.";	4041	cf::cleanup "perl_reload: error, exiting.";
3883	};	4042	};
3884		4043
3885	warn "reloaded";
3886	--$RELOAD;	4044	--$RELOAD;
3887	}	4045	}
3888		4046
3889	$t1 = AE::time - $t1;	4047	$t1 = AE::time - $t1;
3890	warn "reload completed in ${t1}s\n";	4048	info "perl_reload: completed in ${t1}s\n";
3891	};	4049	};
3892		4050
3893	our $RELOAD_WATCHER; # used only during reload	4051	our $RELOAD_WATCHER; # used only during reload
3894		4052
3895	sub reload_perl() {	4053	sub reload_perl() {
…		…
3916	reload_perl;	4074	reload_perl;
3917	};	4075	};
3918	}	4076	}
3919	};	4077	};
3920		4078
3921	unshift @INC, $LIBDIR;	4079	#############################################################################
3922		4080
3923	my $bug_warning = 0;	4081	my $bug_warning = 0;
3924		4082
3925	our @WAIT_FOR_TICK;
3926	our @WAIT_FOR_TICK_BEGIN;
3927
3928	sub wait_for_tick {	4083	sub wait_for_tick() {
3929	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4084	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3930		4085
3931	my $signal = new Coro::Signal;	4086	$WAIT_FOR_TICK->wait;
3932	push @WAIT_FOR_TICK, $signal;
3933	$signal->wait;
3934	}	4087	}
3935		4088
3936	sub wait_for_tick_begin {	4089	sub wait_for_tick_begin() {
3937	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4090	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3938		4091
3939	my $signal = new Coro::Signal;	4092	my $signal = new Coro::Signal;
3940	push @WAIT_FOR_TICK_BEGIN, $signal;	4093	push @WAIT_FOR_TICK_BEGIN, $signal;
3941	$signal->wait;	4094	$signal->wait;
3942	}	4095	}
…		…
3946	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4099	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3947	unless ++$bug_warning > 10;	4100	unless ++$bug_warning > 10;
3948	return;	4101	return;
3949	}	4102	}
3950		4103
3951	cf::server_tick; # one server iteration	4104	cf::one_tick; # one server iteration
3952		4105
3953	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4106	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3954		4107
3955	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4108	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3956	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4109	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3957	Coro::async_pool {	4110	Coro::async_pool {
3958	$Coro::current->{desc} = "runtime saver";	4111	$Coro::current->{desc} = "runtime saver";
3959	write_runtime_sync	4112	write_runtime_sync
3960	or warn "ERROR: unable to write runtime file: $!";	4113	or error "ERROR: unable to write runtime file: $!";
3961	};	4114	};
3962	}	4115	}
3963		4116
3964	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4117	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3965	$sig->send;	4118	$sig->send;
3966	}	4119	}
3967	while (my $sig = shift @WAIT_FOR_TICK) {	4120	$WAIT_FOR_TICK->broadcast;
3968	$sig->send;
3969	}
3970		4121
3971	$LOAD = ($NOW - $TICK_START) / $TICK;	4122	$LOAD = ($NOW - $TICK_START) / $TICK;
3972	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4123	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3973		4124
3974	if (0) {	4125	if (0) {
3975	if ($NEXT_TICK) {	4126	if ($NEXT_TICK) {
3976	my $jitter = $TICK_START - $NEXT_TICK;	4127	my $jitter = $TICK_START - $NEXT_TICK;
3977	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4128	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3978	warn "jitter $JITTER\n";#d#	4129	debug "jitter $JITTER\n";#d#
3979	}	4130	}
3980	}	4131	}
3981	}	4132	}
3982		4133
3983	{	4134	{
3984	# configure BDB	4135	# configure BDB
3985		4136
3986	BDB::min_parallel 16;	4137	BDB::min_parallel 16;
3987	BDB::max_poll_reqs $TICK * 0.1;	4138	BDB::max_poll_reqs $TICK * 0.1;
3988	$AnyEvent::BDB::WATCHER->priority (1);	4139	#$AnyEvent::BDB::WATCHER->priority (1);
3989		4140
3990	unless ($DB_ENV) {	4141	unless ($DB_ENV) {
3991	$DB_ENV = BDB::db_env_create;	4142	$DB_ENV = BDB::db_env_create;
3992	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4143	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3993	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4144	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4028	IO::AIO::min_parallel 8;	4179	IO::AIO::min_parallel 8;
4029	IO::AIO::max_poll_time $TICK * 0.1;	4180	IO::AIO::max_poll_time $TICK * 0.1;
4030	undef $AnyEvent::AIO::WATCHER;	4181	undef $AnyEvent::AIO::WATCHER;
4031	}	4182	}
4032		4183
4033	my $_log_backtrace;	4184	our $_log_backtrace;
		4185	our $_log_backtrace_last;
4034		4186
4035	sub _log_backtrace {	4187	sub _log_backtrace {
4036	my ($msg, @addr) = @_;	4188	my ($msg, @addr) = @_;
4037		4189
4038	$msg =~ s/\n//;	4190	$msg =~ s/\n$//;
4039		4191
		4192	if ($_log_backtrace_last eq $msg) {
		4193	LOG llevInfo, "[ABT] $msg\n";
		4194	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4040	# limit the # of concurrent backtraces	4195	# limit the # of concurrent backtraces
4041	if ($_log_backtrace < 2) {	4196	} elsif ($_log_backtrace < 2) {
		4197	$_log_backtrace_last = $msg;
4042	++$_log_backtrace;	4198	++$_log_backtrace;
4043	my $perl_bt = Carp::longmess $msg;	4199	my $perl_bt = Carp::longmess $msg;
4044	async {	4200	async {
4045	$Coro::current->{desc} = "abt $msg";	4201	$Coro::current->{desc} = "abt $msg";
4046		4202
…		…
4066	LOG llevInfo, "[ABT] $_\n" for @bt;	4222	LOG llevInfo, "[ABT] $_\n" for @bt;
4067	--$_log_backtrace;	4223	--$_log_backtrace;
4068	};	4224	};
4069	} else {	4225	} else {
4070	LOG llevInfo, "[ABT] $msg\n";	4226	LOG llevInfo, "[ABT] $msg\n";
4071	LOG llevInfo, "[ABT] [suppressed]\n";	4227	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4072	}	4228	}
4073	}	4229	}
4074		4230
4075	# load additional modules	4231	# load additional modules
4076	require "cf/$_.pm" for @EXTRA_MODULES;	4232	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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