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

Diff Legend

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