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.517 by root, Thu Apr 15 06:07:51 2010 UTC vs.
Revision 1.565 by root, Sat Apr 30 05:41:17 2011 UTC

1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify it under	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# the terms of the Affero GNU General Public License as published by the	7	# the terms of the Affero GNU General Public License as published by the
8	# Free Software Foundation, either version 3 of the License, or (at your	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# option) any later version.	9	# option) any later version.
…		…
20	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
21	#	21	#
22		22
23	package cf;	23	package cf;
24		24
25	use 5.10.0;	25	use common::sense;
26	use utf8;
27	use strict qw(vars subs);
28		26
29	use Symbol;	27	use Symbol;
30	use List::Util;	28	use List::Util;
31	use Socket;	29	use Socket;
32	use EV;	30	use EV;
…		…
78	# strictly for debugging	76	# strictly for debugging
79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	77	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80		78
81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	79	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82		80
		81	our @ORIG_INC;
		82
83	our %COMMAND = ();	83	our %COMMAND = ();
84	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
85		85
86	our @EXTS = (); # list of extension package names	86	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	87	our %EXTCMD = ();
…		…
93	our @EVENT;	93	our @EVENT;
94	our @REFLECT; # set by XS	94	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	95	our %REFLECT; # set by us
96		96
97	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
		98
98	our $DATADIR = datadir;	99	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	100	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	101	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	102	our $MAPDIR = "$DATADIR/" . mapdir;
		103
102	our $LOCALDIR = localdir;	104	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	105	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	106	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	107	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	108	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	109	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	110	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	111	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		112
111	our %RESOURCE;	113	our %RESOURCE; # unused
112		114
113	our $OUTPUT_RATE_MIN = 4000;	115	our $OUTPUT_RATE_MIN = 3000;
114	our $OUTPUT_RATE_MAX = 100000;	116	our $OUTPUT_RATE_MAX = 1000000;
		117
		118	our $MAX_LINKS = 32; # how many chained exits to follow
		119	our $VERBOSE_IO = 1;
115		120
116	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	121	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	122	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118	our $NEXT_TICK;	123	our $NEXT_TICK;
119	our $USE_FSYNC = 1; # use fsync to write maps - default on	124	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
121	our $BDB_DEADLOCK_WATCHER;	126	our $BDB_DEADLOCK_WATCHER;
122	our $BDB_CHECKPOINT_WATCHER;	127	our $BDB_CHECKPOINT_WATCHER;
123	our $BDB_TRICKLE_WATCHER;	128	our $BDB_TRICKLE_WATCHER;
124	our $DB_ENV;	129	our $DB_ENV;
125		130
126	our @EXTRA_MODULES = qw(pod match mapscript);	131	our @EXTRA_MODULES = qw(pod match mapscript incloader);
127		132
128	our %CFG;	133	our %CFG;
129		134
130	our $UPTIME; $UPTIME ||= time;	135	our $UPTIME; $UPTIME ||= time;
131	our $RUNTIME;	136	our $RUNTIME;
…		…
165		170
166	our $EMERGENCY_POSITION;	171	our $EMERGENCY_POSITION;
167		172
168	sub cf::map::normalise;	173	sub cf::map::normalise;
169		174
		175	sub in_main() {
		176	$Coro::current == $Coro::main
		177	}
		178
170	#############################################################################	179	#############################################################################
171		180
172	%REFLECT = ();	181	%REFLECT = ();
173	for (@REFLECT) {	182	for (@REFLECT) {
174	my $reflect = JSON::XS::decode_json $_;	183	my $reflect = JSON::XS::decode_json $_;
…		…
226	from wherever your confdir points to.	235	from wherever your confdir points to.
227		236
228	=item cf::wait_for_tick, cf::wait_for_tick_begin	237	=item cf::wait_for_tick, cf::wait_for_tick_begin
229		238
230	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	239	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	240	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.	241	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
		242
		243	=cut
		244
		245	sub wait_for_tick();
		246	sub wait_for_tick_begin();
233		247
234	=item @cf::INVOKE_RESULTS	248	=item @cf::INVOKE_RESULTS
235		249
236	This array contains the results of the last C<invoke ()> call. When	250	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	251	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
…		…
245		259
246	=back	260	=back
247		261
248	=cut	262	=cut
249		263
		264	sub error(@) { LOG llevError, join "", @_ }
		265	sub warn (@) { LOG llevWarn , join "", @_ }
		266	sub info (@) { LOG llevInfo , join "", @_ }
		267	sub debug(@) { LOG llevDebug, join "", @_ }
		268	sub trace(@) { LOG llevTrace, join "", @_ }
		269
250	$Coro::State::WARNHOOK = sub {	270	$Coro::State::WARNHOOK = sub {
251	my $msg = join "", @_;	271	my $msg = join "", @_;
252		272
253	$msg .= "\n"	273	$msg .= "\n"
254	unless $msg =~ /\n$/;	274	unless $msg =~ /\n$/;
255		275
256	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	276	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
257		277
258	LOG llevError, $msg;	278	LOG llevWarn, $msg;
259	};	279	};
260		280
261	$Coro::State::DIEHOOK = sub {	281	$Coro::State::DIEHOOK = sub {
262	return unless $^S eq 0; # "eq", not "=="	282	return unless $^S eq 0; # "eq", not "=="
263		283
264	warn Carp::longmess $_[0];	284	error Carp::longmess $_[0];
265		285
266	if ($Coro::current == $Coro::main) {#d#	286	if (in_main) {#d#
267	warn "DIEHOOK called in main context, Coro bug?\n";#d#	287	error "DIEHOOK called in main context, Coro bug?\n";#d#
268	return;#d#	288	return;#d#
269	}#d#	289	}#d#
270		290
271	# kill coroutine otherwise	291	# kill coroutine otherwise
272	Coro::terminate	292	Coro::terminate
…		…
294	}	314	}
295		315
296	$EV::DIED = sub {	316	$EV::DIED = sub {
297	Carp::cluck "error in event callback: @_";	317	Carp::cluck "error in event callback: @_";
298	};	318	};
		319
		320	#############################################################################
		321
		322	sub fork_call(&@);
		323	sub get_slot($;$$);
299		324
300	#############################################################################	325	#############################################################################
301		326
302	=head2 UTILITY FUNCTIONS	327	=head2 UTILITY FUNCTIONS
303		328
…		…
324	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	349	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
325	$d	350	$d
326	} || "[unable to dump $_[0]: '$@']";	351	} || "[unable to dump $_[0]: '$@']";
327	}	352	}
328		353
		354	=item $scalar = load_file $path
		355
		356	Loads the given file from path and returns its contents. Croaks on error
		357	and can block.
		358
		359	=cut
		360
		361	sub load_file($) {
		362	0 <= aio_load $_[0], my $data
		363	or Carp::croak "$_[0]: $!";
		364
		365	$data
		366	}
		367
329	=item $ref = cf::decode_json $json	368	=item $ref = cf::decode_json $json
330		369
331	Converts a JSON string into the corresponding perl data structure.	370	Converts a JSON string into the corresponding perl data structure.
332		371
333	=item $json = cf::encode_json $ref	372	=item $json = cf::encode_json $ref
…		…
339	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	378	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
340		379
341	sub encode_json($) { $json_coder->encode ($_[0]) }	380	sub encode_json($) { $json_coder->encode ($_[0]) }
342	sub decode_json($) { $json_coder->decode ($_[0]) }	381	sub decode_json($) { $json_coder->decode ($_[0]) }
343		382
		383	=item $ref = cf::decode_storable $scalar
		384
		385	Same as Coro::Storable::thaw, so blocks.
		386
		387	=cut
		388
		389	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		390
		391	=item $ref = cf::decode_yaml $scalar
		392
		393	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		394
		395	=cut
		396
		397	sub decode_yaml($) {
		398	fork_call { YAML::XS::Load $_[0] } @_
		399	}
		400
		401	=item $scalar = cf::unlzf $scalar
		402
		403	Same as Compress::LZF::compress, but takes server ticks into account, so
		404	blocks.
		405
		406	=cut
		407
		408	sub unlzf($) {
		409	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		410	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		411	Compress::LZF::decompress $_[0]
		412	}
		413
344	=item cf::post_init { BLOCK }	414	=item cf::post_init { BLOCK }
345		415
346	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	416	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347	but I<before> the server starts ticking again.	417	but I<before> the server starts ticking again.
348		418
349	The cdoeblock will have a single boolean argument to indicate whether this	419	The codeblock will have a single boolean argument to indicate whether this
350	is a reload or not.	420	is a reload or not.
351		421
352	=cut	422	=cut
353		423
354	sub post_init(&) {	424	sub post_init(&) {
355	push @POST_INIT, shift;	425	push @POST_INIT, shift;
		426	}
		427
		428	sub _post_init {
		429	trace "running post_init jobs";
		430
		431	# run them in parallel...
		432
		433	my @join;
		434
		435	while () {
		436	push @join, map &Coro::async ($_, 0), @POST_INIT;
		437	@POST_INIT = ();
		438
		439	@join or last;
		440
		441	(pop @join)->join;
		442	}
356	}	443	}
357		444
358	=item cf::lock_wait $string	445	=item cf::lock_wait $string
359		446
360	Wait until the given lock is available. See cf::lock_acquire.	447	Wait until the given lock is available. See cf::lock_acquire.
…		…
413	EV::periodic $start, $interval, 0, $cb	500	EV::periodic $start, $interval, 0, $cb
414	}	501	}
415		502
416	=item cf::get_slot $time[, $priority[, $name]]	503	=item cf::get_slot $time[, $priority[, $name]]
417		504
418	Allocate $time seconds of blocking CPU time at priority C<$priority>:	505	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	506	(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.	507	C<$time> seconds of cpu time till the next tick. The slot is only valid
		508	till the next cede.
		509
		510	Background jobs should use a priority les than zero, interactive jobs
		511	should use 100 or more.
421		512
422	The optional C<$name> can be used to identify the job to run. It might be	513	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.	514	used for statistical purposes and should identify the same time-class.
424		515
425	Useful for short background jobs.	516	Useful for short background jobs.
…		…
505	=cut	596	=cut
506		597
507	sub sync_job(&) {	598	sub sync_job(&) {
508	my ($job) = @_;	599	my ($job) = @_;
509		600
510	if ($Coro::current == $Coro::main) {	601	if (in_main) {
511	my $time = AE::time;	602	my $time = AE::time;
512		603
513	# this is the main coro, too bad, we have to block	604	# this is the main coro, too bad, we have to block
514	# till the operation succeeds, freezing the server :/	605	# till the operation succeeds, freezing the server :/
515		606
516	LOG llevError, Carp::longmess "sync job";#d#	607	#LOG llevError, Carp::longmess "sync job";#d#
517		608
518	my $freeze_guard = freeze_mainloop;	609	my $freeze_guard = freeze_mainloop;
519		610
520	my $busy = 1;	611	my $busy = 1;
521	my @res;	612	my @res;
522		613
523	(async {	614	(async {
524	$Coro::current->desc ("sync job coro");	615	$Coro::current->desc ("sync job coro");
525	@res = eval { $job->() };	616	@res = eval { $job->() };
526	warn $@ if $@;	617	error $@ if $@;
527	undef $busy;	618	undef $busy;
528	})->prio (Coro::PRIO_MAX);	619	})->prio (Coro::PRIO_MAX);
529		620
530	while ($busy) {	621	while ($busy) {
531	if (Coro::nready) {	622	if (Coro::nready) {
…		…
565	$EXT_CORO{$coro+0} = $coro;	656	$EXT_CORO{$coro+0} = $coro;
566		657
567	$coro	658	$coro
568	}	659	}
569		660
570	=item fork_call { }, $args	661	=item fork_call { }, @args
571		662
572	Executes the given code block with the given arguments in a seperate	663	Executes the given code block with the given arguments in a seperate
573	process, returning the results. Everything must be serialisable with	664	process, returning the results. Everything must be serialisable with
574	Coro::Storable. May, of course, block. Note that the executed sub may	665	Coro::Storable. May, of course, block. Note that the executed sub may
575	never block itself or use any form of event handling.	666	never block itself or use any form of event handling.
576		667
577	=cut	668	=cut
578		669
		670	sub post_fork {
		671	reset_signals;
		672	}
		673
579	sub fork_call(&@) {	674	sub fork_call(&@) {
580	my ($cb, @args) = @_;	675	my ($cb, @args) = @_;
581		676
582	# we seemingly have to make a local copy of the whole thing,	677	# we seemingly have to make a local copy of the whole thing,
583	# otherwise perl prematurely frees the stuff :/	678	# otherwise perl prematurely frees the stuff :/
584	# TODO: investigate and fix (likely this will be rather laborious)	679	# TODO: investigate and fix (likely this will be rather laborious)
585		680
586	my @res = Coro::Util::fork_eval {	681	my @res = Coro::Util::fork_eval {
587	reset_signals;	682	cf::post_fork;
588	&$cb	683	&$cb
589	}, @args;	684	} @args;
590		685
591	wantarray ? @res : $res[-1]	686	wantarray ? @res : $res[-1]
592	}	687	}
593		688
594	sub objinfo {	689	sub objinfo {
…		…
644	within each server.	739	within each server.
645		740
646	=cut	741	=cut
647		742
648	sub db_table($) {	743	sub db_table($) {
		744	cf::error "db_get called from main context"
		745	if $Coro::current == $Coro::main;
		746
649	my ($name) = @_;	747	my ($name) = @_;
650	my $db = BDB::db_create $DB_ENV;	748	my $db = BDB::db_create $DB_ENV;
651		749
652	eval {	750	eval {
653	$db->set_flags (BDB::CHKSUM);	751	$db->set_flags (BDB::CHKSUM);
…		…
663	}	761	}
664		762
665	our $DB;	763	our $DB;
666		764
667	sub db_init {	765	sub db_init {
668	cf::sync_job {
669	$DB ||= db_table "db";	766	$DB ||= db_table "db";
670	};
671	}	767	}
672		768
673	sub db_get($$) {	769	sub db_get($$) {
674	my $key = "$_[0]/$_[1]";	770	my $key = "$_[0]/$_[1]";
675		771
676	cf::sync_job {	772	cf::error "db_get called from main context"
		773	if $Coro::current == $Coro::main;
		774
677	BDB::db_get $DB, undef, $key, my $data;	775	BDB::db_get $DB, undef, $key, my $data;
678		776
679	$! ? ()	777	$! ? ()
680	: $data	778	: $data
681	}
682	}	779	}
683		780
684	sub db_put($$$) {	781	sub db_put($$$) {
685	BDB::dbreq_pri 4;	782	BDB::dbreq_pri 4;
686	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	783	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
714		811
715	my @data;	812	my @data;
716	my $md5;	813	my $md5;
717		814
718	for (0 .. $#$src) {	815	for (0 .. $#$src) {
719	0 <= aio_load $src->[$_], $data[$_]	816	$data[$_] = load_file $src->[$_];
720	or Carp::croak "$src->[$_]: $!";
721	}	817	}
722		818
723	# if processing is expensive, check	819	# if processing is expensive, check
724	# checksum first	820	# checksum first
725	if (1) {	821	if (1) {
…		…
742		838
743	my $t1 = Time::HiRes::time;	839	my $t1 = Time::HiRes::time;
744	my $data = $process->(\@data);	840	my $data = $process->(\@data);
745	my $t2 = Time::HiRes::time;	841	my $t2 = Time::HiRes::time;
746		842
747	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	843	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
748		844
749	db_put cache => "$id/data", $data;	845	db_put cache => "$id/data", $data;
750	db_put cache => "$id/md5" , $md5;	846	db_put cache => "$id/md5" , $md5;
751	db_put cache => "$id/meta", $meta;	847	db_put cache => "$id/meta", $meta;
752		848
…		…
762		858
763	=cut	859	=cut
764		860
765	sub datalog($@) {	861	sub datalog($@) {
766	my ($type, %kv) = @_;	862	my ($type, %kv) = @_;
767	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	863	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
768	}	864	}
769		865
770	=back	866	=back
771		867
772	=cut	868	=cut
…		…
967		1063
968	} elsif (exists $cb_id{$type}) {	1064	} elsif (exists $cb_id{$type}) {
969	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1065	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
970		1066
971	} elsif (ref $type) {	1067	} elsif (ref $type) {
972	warn "attaching objects not supported, ignoring.\n";	1068	error "attaching objects not supported, ignoring.\n";
973		1069
974	} else {	1070	} else {
975	shift @arg;	1071	shift @arg;
976	warn "attach argument '$type' not supported, ignoring.\n";	1072	error "attach argument '$type' not supported, ignoring.\n";
977	}	1073	}
978	}	1074	}
979	}	1075	}
980		1076
981	sub _object_attach {	1077	sub _object_attach {
…		…
991	_attach $registry, $klass, @attach;	1087	_attach $registry, $klass, @attach;
992	}	1088	}
993		1089
994	$obj->{$name} = \%arg;	1090	$obj->{$name} = \%arg;
995	} else {	1091	} else {
996	warn "object uses attachment '$name' which is not available, postponing.\n";	1092	info "object uses attachment '$name' which is not available, postponing.\n";
997	}	1093	}
998		1094
999	$obj->{_attachment}{$name} = undef;	1095	$obj->{_attachment}{$name} = undef;
1000	}	1096	}
1001		1097
…		…
1060		1156
1061	for (@$callbacks) {	1157	for (@$callbacks) {
1062	eval { &{$_->[1]} };	1158	eval { &{$_->[1]} };
1063		1159
1064	if ($@) {	1160	if ($@) {
1065	warn "$@";
1066	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1161	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1067	override;	1162	override;
1068	}	1163	}
1069		1164
1070	return 1 if $override;	1165	return 1 if $override;
1071	}	1166	}
…		…
1150	for (@$attach) {	1245	for (@$attach) {
1151	my ($klass, @attach) = @$_;	1246	my ($klass, @attach) = @$_;
1152	_attach $registry, $klass, @attach;	1247	_attach $registry, $klass, @attach;
1153	}	1248	}
1154	} else {	1249	} else {
1155	warn "object uses attachment '$name' that is not available, postponing.\n";	1250	info "object uses attachment '$name' that is not available, postponing.\n";
1156	}	1251	}
1157	}	1252	}
1158	}	1253	}
1159		1254
1160	cf::attachable->attach (	1255	cf::attachable->attach (
…		…
1187	my ($filename, $rdata, $objs) = @_;	1282	my ($filename, $rdata, $objs) = @_;
1188		1283
1189	sync_job {	1284	sync_job {
1190	if (length $$rdata) {	1285	if (length $$rdata) {
1191	utf8::decode (my $decname = $filename);	1286	utf8::decode (my $decname = $filename);
1192	warn sprintf "saving %s (%d,%d)\n",	1287	trace sprintf "saving %s (%d,%d)\n",
1193	$decname, length $$rdata, scalar @$objs;	1288	$decname, length $$rdata, scalar @$objs
		1289	if $VERBOSE_IO;
1194		1290
1195	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1291	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1196	aio_chmod $fh, SAVE_MODE;	1292	aio_chmod $fh, SAVE_MODE;
1197	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1293	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1198	if ($cf::USE_FSYNC) {	1294	if ($cf::USE_FSYNC) {
…		…
1220	aio_rename "$filename~", $filename;	1316	aio_rename "$filename~", $filename;
1221		1317
1222	$filename =~ s%/[^/]+$%%;	1318	$filename =~ s%/[^/]+$%%;
1223	aio_pathsync $filename if $cf::USE_FSYNC;	1319	aio_pathsync $filename if $cf::USE_FSYNC;
1224	} else {	1320	} else {
1225	warn "unable to save objects: $filename~: $!\n";	1321	error "unable to save objects: $filename~: $!\n";
1226	}	1322	}
1227	} else {	1323	} else {
1228	aio_unlink $filename;	1324	aio_unlink $filename;
1229	aio_unlink "$filename.pst";	1325	aio_unlink "$filename.pst";
1230	}	1326	}
…		…
1254	my $st = eval { Coro::Storable::thaw $av };	1350	my $st = eval { Coro::Storable::thaw $av };
1255	$av = $st->{objs};	1351	$av = $st->{objs};
1256	}	1352	}
1257		1353
1258	utf8::decode (my $decname = $filename);	1354	utf8::decode (my $decname = $filename);
1259	warn sprintf "loading %s (%d,%d)\n",	1355	trace sprintf "loading %s (%d,%d)\n",
1260	$decname, length $data, scalar @{$av || []};	1356	$decname, length $data, scalar @{$av || []}
		1357	if $VERBOSE_IO;
1261		1358
1262	($data, $av)	1359	($data, $av)
1263	}	1360	}
1264		1361
1265	=head2 COMMAND CALLBACKS	1362	=head2 COMMAND CALLBACKS
…		…
1357		1454
1358	$pl->ext_reply ($reply, @reply)	1455	$pl->ext_reply ($reply, @reply)
1359	if $reply;	1456	if $reply;
1360		1457
1361	} else {	1458	} else {
1362	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1459	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1363	}	1460	}
1364		1461
1365	cf::override;	1462	cf::override;
1366	},	1463	},
1367	);	1464	);
…		…
1378		1475
1379	$grp	1476	$grp
1380	}	1477	}
1381		1478
1382	sub load_extensions {	1479	sub load_extensions {
		1480	info "loading extensions...";
		1481
1383	cf::sync_job {	1482	cf::sync_job {
1384	my %todo;	1483	my %todo;
1385		1484
1386	for my $path (<$LIBDIR/*.ext>) {	1485	for my $path (<$LIBDIR/*.ext>) {
1387	next unless -r $path;	1486	next unless -r $path;
…		…
1405		1504
1406	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1505	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1407	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1506	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1408		1507
1409	$ext{source} =	1508	$ext{source} =
1410	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1509	"package $pkg; use common::sense;\n"
1411	. "#line 1 \"$path\"\n{\n"	1510	. "#line 1 \"$path\"\n{\n"
1412	. $source	1511	. $source
1413	. "\n};\n1";	1512	. "\n};\n1";
1414		1513
1415	$todo{$base} = \%ext;	1514	$todo{$base} = \%ext;
…		…
1427	for (split /,\s*/, $v->{meta}{depends}) {	1526	for (split /,\s*/, $v->{meta}{depends}) {
1428	next ext	1527	next ext
1429	unless exists $done{$_};	1528	unless exists $done{$_};
1430	}	1529	}
1431		1530
1432	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1531	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1433		1532
1434	my $active = eval $v->{source};	1533	my $active = eval $v->{source};
1435		1534
1436	if (length $@) {	1535	if (length $@) {
1437	warn "$v->{path}: $@\n";	1536	error "$v->{path}: $@\n";
1438		1537
1439	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1538	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1440	if exists $v->{meta}{mandatory};	1539	if exists $v->{meta}{mandatory};
		1540
		1541	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1542	delete $todo{$k};
1441	} else {	1543	} else {
1442	$done{$k} = delete $todo{$k};	1544	$done{$k} = delete $todo{$k};
1443	push @EXTS, $v->{pkg};	1545	push @EXTS, $v->{pkg};
1444	$progress = 1;	1546	$progress = 1;
1445		1547
1446	warn "$v->{base}: extension inactive.\n"	1548	info "$v->{base}: extension inactive.\n"
1447	unless $active;	1549	unless $active;
1448	}	1550	}
1449	}	1551	}
1450		1552
1451	unless ($progress) {	1553	unless ($progress) {
…		…
1453		1555
1454	while (my ($k, $v) = each %todo) {	1556	while (my ($k, $v) = each %todo) {
1455	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1557	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456	if exists $v->{meta}{mandatory};	1558	if exists $v->{meta}{mandatory};
1457	}	1559	}
		1560
		1561	last;
1458	}	1562	}
1459	}	1563	}
1460	};	1564	};
1461	}	1565	}
1462		1566
…		…
1620	my $name = $pl->ob->name;	1724	my $name = $pl->ob->name;
1621		1725
1622	$pl->{deny_save} = 1;	1726	$pl->{deny_save} = 1;
1623	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1727	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1624		1728
1625	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1729	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1626	$pl->deactivate;	1730	$pl->deactivate;
		1731
1627	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1732	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1628	$pl->ob->check_score;
1629	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1733	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1734	ext::highscore::check ($pl->ob);
		1735
1630	$pl->ns->destroy if $pl->ns;	1736	$pl->ns->destroy if $pl->ns;
1631		1737
1632	my $path = playerdir $pl;	1738	my $path = playerdir $pl;
1633	my $temp = "$path~$cf::RUNTIME~deleting~";	1739	my $temp = "$path~$cf::RUNTIME~deleting~";
1634	aio_rename $path, $temp;	1740	aio_rename $path, $temp;
…		…
1688	\@logins	1794	\@logins
1689	}	1795	}
1690		1796
1691	=item $player->maps	1797	=item $player->maps
1692		1798
		1799	=item cf::player::maps $login
		1800
1693	Returns an arrayref of map paths that are private for this	1801	Returns an arrayref of map paths that are private for this
1694	player. May block.	1802	player. May block.
1695		1803
1696	=cut	1804	=cut
1697		1805
…		…
1759	=cut	1867	=cut
1760		1868
1761	sub find_by_path($) {	1869	sub find_by_path($) {
1762	my ($path) = @_;	1870	my ($path) = @_;
1763		1871
		1872	$path =~ s/^~[^\/]*//; # skip ~login
		1873
1764	my ($match, $specificity);	1874	my ($match, $specificity);
1765		1875
1766	for my $region (list) {	1876	for my $region (list) {
1767	if ($region->{match} && $path =~ $region->{match}) {	1877	if ($region->{match} && $path =~ $region->{match}) {
1768	($match, $specificity) = ($region, $region->specificity)	1878	($match, $specificity) = ($region, $region->specificity)
…		…
1796	sub generate_random_map {	1906	sub generate_random_map {
1797	my ($self, $rmp) = @_;	1907	my ($self, $rmp) = @_;
1798		1908
1799	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1909	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1800		1910
1801	# mit "rum" bekleckern, nicht
1802	$self->_create_random_map (	1911	$self->_create_random_map ($rmp);
1803	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1804	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1805	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1806	$rmp->{exit_on_final_map},
1807	$rmp->{xsize}, $rmp->{ysize},
1808	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1809	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1810	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1811	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1812	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1813	(cf::region::find $rmp->{region}), $rmp->{custom}
1814	)
1815	}	1912	}
1816		1913
1817	=item cf::map->register ($regex, $prio)	1914	=item cf::map->register ($regex, $prio)
1818		1915
1819	Register a handler for the map path matching the given regex at the	1916	Register a handler for the map path matching the given regex at the
…		…
1824		1921
1825	sub register {	1922	sub register {
1826	my (undef, $regex, $prio) = @_;	1923	my (undef, $regex, $prio) = @_;
1827	my $pkg = caller;	1924	my $pkg = caller;
1828		1925
1829	no strict;
1830	push @{"$pkg\::ISA"}, __PACKAGE__;	1926	push @{"$pkg\::ISA"}, __PACKAGE__;
1831		1927
1832	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1928	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1833	}	1929	}
1834		1930
1835	# also paths starting with '/'	1931	# also paths starting with '/'
1836	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1932	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1837		1933
1838	sub thawer_merge {	1934	sub thawer_merge {
1839	my ($self, $merge) = @_;	1935	my ($self, $merge) = @_;
1840		1936
1841	# we have to keep some variables in memory intact	1937	# we have to keep some variables in memory intact
…		…
1846	}	1942	}
1847		1943
1848	sub normalise {	1944	sub normalise {
1849	my ($path, $base) = @_;	1945	my ($path, $base) = @_;
1850		1946
1851	$path = "$path"; # make sure its a string	1947	$path = "$path"; # make sure it's a string
1852		1948
1853	$path =~ s/\.map$//;	1949	$path =~ s/\.map$//;
1854		1950
1855	# map plan:	1951	# map plan:
1856	#	1952	#
…		…
1858	# {... are special paths that are not being touched	1954	# {... are special paths that are not being touched
1859	# ?xxx/... are special absolute paths	1955	# ?xxx/... are special absolute paths
1860	# ?random/... random maps	1956	# ?random/... random maps
1861	# /... normal maps	1957	# /... normal maps
1862	# ~user/... per-player map of a specific user	1958	# ~user/... per-player map of a specific user
		1959	# !up !down for quad maps, or other maps with up/down layers
1863		1960
1864	$path =~ s/$PATH_SEP/\//go;	1961	$path =~ s/$PATH_SEP/\//go;
1865		1962
1866	# treat it as relative path if it starts with	1963	# treat it as relative path if it starts with
1867	# something that looks reasonable	1964	# something that looks reasonable
1868	if ($path =~ m{^(?:\./|\.\./|\w)}) {	1965	if ($path =~ m{^(?:\./|\.\./|\w)}) {
1869	$base or Carp::carp "normalise called with relative path and no base: '$path'";	1966	$base or Carp::carp "normalise called with relative path and no base: '$path'";
1870		1967
1871	$base =~ s{[^/]+/?$}{};	1968	$base =~ s{[^/]+/?$}{};
1872	$path = "$base/$path";	1969	$path = "$base/$path";
		1970
		1971	} elsif ($path eq '!up') {
		1972	$base && ref $base
		1973	or Carp::carp "normalise called with relative tile path and no base: '$path'";
		1974
		1975	my $uppth = $base->tile_path (cf::TILE_UP);
		1976	$path = $uppth if $uppth;
		1977
		1978	} elsif ($path eq '!down') {
		1979	$base && ref $base
		1980	or Carp::carp "normalise called with relative tile path and no base: '$path'";
		1981
		1982	my $dpth = $base->tile_path (cf::TILE_DOWN);
		1983	$path = $dpth if $dpth;
1873	}	1984	}
1874		1985
1875	for ($path) {	1986	for ($path) {
1876	redo if s{//}{/};
1877	redo if s{/\.?/}{/};	1987	redo if s{/\.?/}{/};
1878	redo if s{/[^/]+/\.\./}{/};	1988	redo if s{/[^/]+/\.\./}{/};
1879	}	1989	}
1880		1990
1881	$path	1991	$path
…		…
1895	$self->init; # pass $1 etc.	2005	$self->init; # pass $1 etc.
1896	return $self;	2006	return $self;
1897	}	2007	}
1898	}	2008	}
1899		2009
1900	Carp::cluck "unable to resolve path '$path' (base '$base').";	2010	Carp::cluck "unable to resolve path '$path' (base '$base')";
1901	()	2011	()
1902	}	2012	}
1903		2013
		2014	# may re-bless or do other evil things
1904	sub init {	2015	sub init {
1905	my ($self) = @_;	2016	my ($self) = @_;
1906		2017
1907	$self	2018	$self
1908	}	2019	}
…		…
2028		2139
2029	sub find;	2140	sub find;
2030	sub find {	2141	sub find {
2031	my ($path, $origin) = @_;	2142	my ($path, $origin) = @_;
2032		2143
		2144	cf::cede_to_tick;
		2145
2033	$path = normalise $path, $origin && $origin->path;	2146	$path = normalise $path, $origin;
2034		2147
2035	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2148	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036	my $guard2 = cf::lock_acquire "map_find:$path";	2149	my $guard2 = cf::lock_acquire "map_find:$path";
2037		2150
2038	$cf::MAP{$path} || do {	2151	$cf::MAP{$path} || do {
…		…
2078	$self->alloc;	2191	$self->alloc;
2079		2192
2080	$self->pre_load;	2193	$self->pre_load;
2081	cf::cede_to_tick;	2194	cf::cede_to_tick;
2082		2195
		2196	if (exists $self->{load_path}) {
2083	my $f = new_from_file cf::object::thawer $self->{load_path};	2197	my $f = new_from_file cf::object::thawer $self->{load_path};
2084	$f->skip_block;	2198	$f->skip_block;
2085	$self->_load_objects ($f)	2199	$self->_load_objects ($f)
2086	or return;	2200	or return;
2087		2201
2088	$self->post_load_original	2202	$self->post_load_original
2089	if delete $self->{load_original};	2203	if delete $self->{load_original};
2090		2204
2091	if (my $uniq = $self->uniq_path) {	2205	if (my $uniq = $self->uniq_path) {
2092	utf8::encode $uniq;	2206	utf8::encode $uniq;
2093	unless (aio_stat $uniq) {	2207	unless (aio_stat $uniq) {
2094	if (my $f = new_from_file cf::object::thawer $uniq) {	2208	if (my $f = new_from_file cf::object::thawer $uniq) {
2095	$self->clear_unique_items;	2209	$self->clear_unique_items;
2096	$self->_load_objects ($f);	2210	$self->_load_objects ($f);
2097	$f->resolve_delayed_derefs;	2211	$f->resolve_delayed_derefs;
		2212	}
2098	}	2213	}
2099	}	2214	}
2100	}
2101		2215
2102	$f->resolve_delayed_derefs;	2216	$f->resolve_delayed_derefs;
		2217	}
2103		2218
2104	cf::cede_to_tick;	2219	cf::cede_to_tick;
2105	# now do the right thing for maps	2220	# now do the right thing for maps
2106	$self->link_multipart_objects;	2221	$self->link_multipart_objects;
2107	$self->difficulty ($self->estimate_difficulty)	2222	$self->difficulty ($self->estimate_difficulty)
…		…
2121		2236
2122	$self->in_memory (cf::MAP_ACTIVE);	2237	$self->in_memory (cf::MAP_ACTIVE);
2123	}	2238	}
2124		2239
2125	$self->post_load;	2240	$self->post_load;
		2241
		2242	1
2126	}	2243	}
2127		2244
2128	# customize the map for a given player, i.e.	2245	# customize the map for a given player, i.e.
2129	# return the _real_ map. used by e.g. per-player	2246	# return the _real_ map. used by e.g. per-player
2130	# maps to change the path to ~playername/mappath	2247	# maps to change the path to ~playername/mappath
…		…
2151	or next;	2268	or next;
2152	$neigh = find $neigh, $map	2269	$neigh = find $neigh, $map
2153	or next;	2270	or next;
2154	$neigh->load;	2271	$neigh->load;
2155		2272
		2273	# now find the diagonal neighbours
2156	push @neigh,	2274	push @neigh,
2157	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2275	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2158	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2276	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2159	}	2277	}
2160		2278
…		…
2167	}	2285	}
2168		2286
2169	sub find_sync {	2287	sub find_sync {
2170	my ($path, $origin) = @_;	2288	my ($path, $origin) = @_;
2171		2289
2172	cf::sync_job { find $path, $origin }	2290	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2291	if $Coro::current == $Coro::main;
		2292
		2293	find $path, $origin
2173	}	2294	}
2174		2295
2175	sub do_load_sync {	2296	sub do_load_sync {
2176	my ($map) = @_;	2297	my ($map) = @_;
2177		2298
2178	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2299	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2179	if $Coro::current == $Coro::main;	2300	if $Coro::current == $Coro::main;
2180		2301
2181	cf::sync_job { $map->load };	2302	$map->load;
2182	}	2303	}
2183		2304
2184	our %MAP_PREFETCH;	2305	our %MAP_PREFETCH;
2185	our $MAP_PREFETCHER = undef;	2306	our $MAP_PREFETCHER = undef;
2186		2307
2187	sub find_async {	2308	sub find_async {
2188	my ($path, $origin, $load) = @_;	2309	my ($path, $origin, $load) = @_;
2189		2310
2190	$path = normalise $path, $origin && $origin->{path};	2311	$path = normalise $path, $origin;
2191		2312
2192	if (my $map = $cf::MAP{$path}) {	2313	if (my $map = $cf::MAP{$path}) {
2193	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2314	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2194	}	2315	}
2195		2316
…		…
2212	$MAP_PREFETCHER->prio (6);	2333	$MAP_PREFETCHER->prio (6);
2213		2334
2214	()	2335	()
2215	}	2336	}
2216		2337
		2338	# common code, used by both ->save and ->swapout
2217	sub save {	2339	sub _save {
2218	my ($self) = @_;	2340	my ($self) = @_;
2219
2220	my $lock = cf::lock_acquire "map_data:$self->{path}";
2221		2341
2222	$self->{last_save} = $cf::RUNTIME;	2342	$self->{last_save} = $cf::RUNTIME;
2223		2343
2224	return unless $self->dirty;	2344	return unless $self->dirty;
2225		2345
…		…
2245	} else {	2365	} else {
2246	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2366	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2247	}	2367	}
2248	}	2368	}
2249		2369
		2370	sub save {
		2371	my ($self) = @_;
		2372
		2373	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2374
		2375	$self->_save;
		2376	}
		2377
2250	sub swap_out {	2378	sub swap_out {
2251	my ($self) = @_;	2379	my ($self) = @_;
2252		2380
2253	# save first because save cedes
2254	$self->save;
2255
2256	my $lock = cf::lock_acquire "map_data:$self->{path}";	2381	my $lock = cf::lock_acquire "map_data:$self->{path}";
2257		2382
2258	return if $self->players;
2259	return if $self->in_memory != cf::MAP_ACTIVE;	2383	return if $self->in_memory != cf::MAP_ACTIVE;
2260	return if $self->{deny_save};	2384	return if $self->{deny_save};
		2385	return if $self->players;
2261		2386
		2387	# first deactivate the map and "unlink" it from the core
		2388	$self->deactivate;
		2389	$_->clear_links_to ($self) for values %cf::MAP;
2262	$self->in_memory (cf::MAP_SWAPPED);	2390	$self->in_memory (cf::MAP_SWAPPED);
		2391
		2392	# then atomically save
		2393	$self->_save;
		2394
		2395	# then free the map
		2396	$self->clear;
		2397	}
		2398
		2399	sub reset_at {
		2400	my ($self) = @_;
		2401
		2402	# TODO: safety, remove and allow resettable per-player maps
		2403	return 1e99 if $self->{deny_reset};
		2404
		2405	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2406	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2407
		2408	$time + $to
		2409	}
		2410
		2411	sub should_reset {
		2412	my ($self) = @_;
		2413
		2414	$self->reset_at <= $cf::RUNTIME
		2415	}
		2416
		2417	sub reset {
		2418	my ($self) = @_;
		2419
		2420	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2421
		2422	return if $self->players;
		2423
		2424	cf::trace "resetting map ", $self->path, "\n";
		2425
		2426	$self->in_memory (cf::MAP_SWAPPED);
		2427
		2428	# need to save uniques path
		2429	unless ($self->{deny_save}) {
		2430	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2431
		2432	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2433	if $uniq;
		2434	}
		2435
		2436	delete $cf::MAP{$self->path};
2263		2437
2264	$self->deactivate;	2438	$self->deactivate;
2265	$_->clear_links_to ($self) for values %cf::MAP;	2439	$_->clear_links_to ($self) for values %cf::MAP;
2266	$self->clear;	2440	$self->clear;
2267	}
2268
2269	sub reset_at {
2270	my ($self) = @_;
2271
2272	# TODO: safety, remove and allow resettable per-player maps
2273	return 1e99 if $self->{deny_reset};
2274
2275	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2276	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2277
2278	$time + $to
2279	}
2280
2281	sub should_reset {
2282	my ($self) = @_;
2283
2284	$self->reset_at <= $cf::RUNTIME
2285	}
2286
2287	sub reset {
2288	my ($self) = @_;
2289
2290	my $lock = cf::lock_acquire "map_data:$self->{path}";
2291
2292	return if $self->players;
2293
2294	warn "resetting map ", $self->path, "\n";
2295
2296	$self->in_memory (cf::MAP_SWAPPED);
2297
2298	# need to save uniques path
2299	unless ($self->{deny_save}) {
2300	my $uniq = $self->uniq_path; utf8::encode $uniq;
2301
2302	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2303	if $uniq;
2304	}
2305
2306	delete $cf::MAP{$self->path};
2307
2308	$self->deactivate;
2309	$_->clear_links_to ($self) for values %cf::MAP;
2310	$self->clear;
2311		2441
2312	$self->unlink_save;	2442	$self->unlink_save;
2313	$self->destroy;	2443	$self->destroy;
2314	}	2444	}
2315		2445
…		…
2323		2453
2324	delete $cf::MAP{$self->path};	2454	delete $cf::MAP{$self->path};
2325		2455
2326	$self->unlink_save;	2456	$self->unlink_save;
2327		2457
2328	bless $self, "cf::map";	2458	bless $self, "cf::map::wrap";
2329	delete $self->{deny_reset};	2459	delete $self->{deny_reset};
2330	$self->{deny_save} = 1;	2460	$self->{deny_save} = 1;
2331	$self->reset_timeout (1);	2461	$self->reset_timeout (1);
2332	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2462	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2333		2463
…		…
2563		2693
2564	Freezes the player and moves him/her to a special map (C<{link}>).	2694	Freezes the player and moves him/her to a special map (C<{link}>).
2565		2695
2566	The player should be reasonably safe there for short amounts of time (e.g.	2696	The player should be reasonably safe there for short amounts of time (e.g.
2567	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2697	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2568	though, as the palyer cannot control the character while it is on the link	2698	though, as the player cannot control the character while it is on the link
2569	map.	2699	map.
2570		2700
2571	Will never block.	2701	Will never block.
2572		2702
2573	=item $player_object->leave_link ($map, $x, $y)	2703	=item $player_object->leave_link ($map, $x, $y)
…		…
2594	sub cf::object::player::enter_link {	2724	sub cf::object::player::enter_link {
2595	my ($self) = @_;	2725	my ($self) = @_;
2596		2726
2597	$self->deactivate_recursive;	2727	$self->deactivate_recursive;
2598		2728
		2729	++$self->{_link_recursion};
		2730
2599	return if UNIVERSAL::isa $self->map, "ext::map_link";	2731	return if UNIVERSAL::isa $self->map, "ext::map_link";
2600		2732
2601	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2733	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2602	if $self->map && $self->map->{path} ne "{link}";	2734	if $self->map && $self->map->{path} ne "{link}";
2603		2735
2604	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2736	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2605	}	2737	}
2606		2738
2607	sub cf::object::player::leave_link {	2739	sub cf::object::player::leave_link {
2608	my ($self, $map, $x, $y) = @_;	2740	my ($self, $map, $x, $y) = @_;
2609		2741
…		…
2634	$map->load_neighbours;	2766	$map->load_neighbours;
2635		2767
2636	return unless $self->contr->active;	2768	return unless $self->contr->active;
2637		2769
2638	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2770	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2639	$self->enter_map ($map, $x, $y);	2771	if ($self->enter_map ($map, $x, $y)) {
2640		2772	# entering was successful
		2773	delete $self->{_link_recursion};
2641	# only activate afterwards, to support waiting in hooks	2774	# only activate afterwards, to support waiting in hooks
2642	$self->activate_recursive;	2775	$self->activate_recursive;
2643	}	2776	}
2644		2777
		2778	}
		2779
2645	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2780	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2646		2781
2647	Moves the player to the given map-path and coordinates by first freezing	2782	Moves the player to the given map-path and coordinates by first freezing
2648	her, loading and preparing them map, calling the provided $check callback	2783	her, loading and preparing them map, calling the provided $check callback
2649	that has to return the map if sucecssful, and then unfreezes the player on	2784	that has to return the map if sucecssful, and then unfreezes the player on
2650	the new (success) or old (failed) map position. In either case, $done will	2785	the new (success) or old (failed) map position. In either case, $done will
…		…
2657		2792
2658	our $GOTOGEN;	2793	our $GOTOGEN;
2659		2794
2660	sub cf::object::player::goto {	2795	sub cf::object::player::goto {
2661	my ($self, $path, $x, $y, $check, $done) = @_;	2796	my ($self, $path, $x, $y, $check, $done) = @_;
		2797
		2798	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2799	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2800	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2801	($path, $x, $y) = @$EMERGENCY_POSITION;
		2802	}
2662		2803
2663	# do generation counting so two concurrent goto's will be executed in-order	2804	# do generation counting so two concurrent goto's will be executed in-order
2664	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2805	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2665		2806
2666	$self->enter_link;	2807	$self->enter_link;
…		…
2686	($path, $x, $y) = (undef, undef, undef);	2827	($path, $x, $y) = (undef, undef, undef);
2687	}	2828	}
2688	}	2829	}
2689		2830
2690	my $map = eval {	2831	my $map = eval {
2691	my $map = defined $path ? cf::map::find $path : undef;	2832	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2692		2833
2693	if ($map) {	2834	if ($map) {
2694	$map = $map->customise_for ($self);	2835	$map = $map->customise_for ($self);
2695	$map = $check->($map) if $check && $map;	2836	$map = $check->($map, $x, $y, $self) if $check && $map;
2696	} else {	2837	} else {
2697	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2838	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2698	}	2839	}
2699		2840
2700	$map	2841	$map
…		…
2708	if ($gen == $self->{_goto_generation}) {	2849	if ($gen == $self->{_goto_generation}) {
2709	delete $self->{_goto_generation};	2850	delete $self->{_goto_generation};
2710	$self->leave_link ($map, $x, $y);	2851	$self->leave_link ($map, $x, $y);
2711	}	2852	}
2712		2853
2713	$done->() if $done;	2854	$done->($self) if $done;
2714	})->prio (1);	2855	})->prio (1);
2715	}	2856	}
2716		2857
2717	=item $player_object->enter_exit ($exit_object)	2858	=item $player_object->enter_exit ($exit_object)
2718		2859
…		…
2794		2935
2795	prepare_random_map $exit	2936	prepare_random_map $exit
2796	if $exit->slaying eq "/!";	2937	if $exit->slaying eq "/!";
2797	}	2938	}
2798		2939
2799	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2940	my $map = cf::map::normalise $exit->slaying, $exit->map;
2800	my $x = $exit->stats->hp;	2941	my $x = $exit->stats->hp;
2801	my $y = $exit->stats->sp;	2942	my $y = $exit->stats->sp;
2802		2943
2803	$self->goto ($map, $x, $y);	2944	$self->goto ($map, $x, $y);
2804		2945
…		…
2811	$self->message ("Something went wrong deep within the deliantra server. "	2952	$self->message ("Something went wrong deep within the deliantra server. "
2812	. "I'll try to bring you back to the map you were before. "	2953	. "I'll try to bring you back to the map you were before. "
2813	. "Please report this to the dungeon master!",	2954	. "Please report this to the dungeon master!",
2814	cf::NDI_UNIQUE | cf::NDI_RED);	2955	cf::NDI_UNIQUE | cf::NDI_RED);
2815		2956
2816	warn "ERROR in enter_exit: $@";	2957	error "ERROR in enter_exit: $@";
2817	$self->leave_link;	2958	$self->leave_link;
2818	}	2959	}
2819	})->prio (1);	2960	})->prio (1);
2820	}	2961	}
2821		2962
…		…
3134		3275
3135	$ns->ext_reply ($reply, @reply)	3276	$ns->ext_reply ($reply, @reply)
3136	if $reply;	3277	if $reply;
3137		3278
3138	} else {	3279	} else {
3139	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3280	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3140	}	3281	}
3141		3282
3142	cf::override;	3283	cf::override;
3143	},	3284	},
3144	);	3285	);
…		…
3225	decrease split destroy change_exp value msg lore send_msg)],	3366	decrease split destroy change_exp value msg lore send_msg)],
3226	["cf::object::player" => qw(player)],	3367	["cf::object::player" => qw(player)],
3227	["cf::player" => qw(peaceful send_msg)],	3368	["cf::player" => qw(peaceful send_msg)],
3228	["cf::map" => qw(trigger)],	3369	["cf::map" => qw(trigger)],
3229	) {	3370	) {
3230	no strict 'refs';
3231	my ($pkg, @funs) = @$_;	3371	my ($pkg, @funs) = @$_;
3232	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3372	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3233	for @funs;	3373	for @funs;
3234	}	3374	}
3235		3375
…		…
3274	local @cf::_safe_eval_args = values %vars;	3414	local @cf::_safe_eval_args = values %vars;
3275	@res = wantarray ? eval eval : scalar eval $eval;	3415	@res = wantarray ? eval eval : scalar eval $eval;
3276	}	3416	}
3277		3417
3278	if ($@) {	3418	if ($@) {
3279	warn "$@";	3419	warn "$@",
3280	warn "while executing safe code '$code'\n";	3420	"while executing safe code '$code'\n",
3281	warn "with arguments " . (join " ", %vars) . "\n";	3421	"with arguments " . (join " ", %vars) . "\n";
3282	}	3422	}
3283		3423
3284	wantarray ? @res : $res[0]	3424	wantarray ? @res : $res[0]
3285	}	3425	}
3286		3426
…		…
3320	# for this (global event?)	3460	# for this (global event?)
3321	%ext::player_env::MUSIC_FACE_CACHE = ();	3461	%ext::player_env::MUSIC_FACE_CACHE = ();
3322		3462
3323	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3463	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3324		3464
3325	warn "loading facedata from $path\n";	3465	trace "loading facedata from $path\n";
3326		3466
3327	my $facedata;	3467	my $facedata = decode_storable load_file $path;
3328	0 < aio_load $path, $facedata
3329	or die "$path: $!";
3330
3331	$facedata = Coro::Storable::thaw $facedata;
3332		3468
3333	$facedata->{version} == 2	3469	$facedata->{version} == 2
3334	or cf::cleanup "$path: version mismatch, cannot proceed.";	3470	or cf::cleanup "$path: version mismatch, cannot proceed.";
3335		3471
3336	# patch in the exptable	3472	# patch in the exptable
…		…
3350		3486
3351	cf::face::set_visibility $idx, $info->{visibility};	3487	cf::face::set_visibility $idx, $info->{visibility};
3352	cf::face::set_magicmap $idx, $info->{magicmap};	3488	cf::face::set_magicmap $idx, $info->{magicmap};
3353	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3489	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3354	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3490	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3491	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3355		3492
3356	cf::cede_to_tick;	3493	cf::cede_to_tick;
3357	}	3494	}
3358		3495
3359	while (my ($face, $info) = each %$faces) {	3496	while (my ($face, $info) = each %$faces) {
…		…
3364		3501
3365	if (my $smooth = cf::face::find $info->{smooth}) {	3502	if (my $smooth = cf::face::find $info->{smooth}) {
3366	cf::face::set_smooth $idx, $smooth;	3503	cf::face::set_smooth $idx, $smooth;
3367	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3504	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3368	} else {	3505	} else {
3369	warn "smooth face '$info->{smooth}' not found for face '$face'";	3506	error "smooth face '$info->{smooth}' not found for face '$face'";
3370	}	3507	}
3371		3508
3372	cf::cede_to_tick;	3509	cf::cede_to_tick;
3373	}	3510	}
3374	}	3511	}
…		…
3392	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3529	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3393		3530
3394	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3531	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3395	cf::face::set_type $idx, $info->{type};	3532	cf::face::set_type $idx, $info->{type};
3396	} else {	3533	} else {
3397	$RESOURCE{$name} = $info;	3534	$RESOURCE{$name} = $info; # unused
3398	}	3535	}
3399		3536
3400	cf::cede_to_tick;	3537	cf::cede_to_tick;
3401	}	3538	}
3402	}	3539	}
3403		3540
3404	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3541	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3405		3542
3406	1	3543	1
3407	}	3544	}
3408
3409	cf::global->attach (on_resource_update => sub {
3410	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3411	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3412
3413	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3414	my $sound = $soundconf->{compat}[$_]
3415	or next;
3416
3417	my $face = cf::face::find "sound/$sound->[1]";
3418	cf::sound::set $sound->[0] => $face;
3419	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3420	}
3421
3422	while (my ($k, $v) = each %{$soundconf->{event}}) {
3423	my $face = cf::face::find "sound/$v";
3424	cf::sound::set $k => $face;
3425	}
3426	}
3427	});
3428		3545
3429	register_exticmd fx_want => sub {	3546	register_exticmd fx_want => sub {
3430	my ($ns, $want) = @_;	3547	my ($ns, $want) = @_;
3431		3548
3432	while (my ($k, $v) = each %$want) {	3549	while (my ($k, $v) = each %$want) {
…		…
3471	sub reload_treasures {	3588	sub reload_treasures {
3472	load_resource_file "$DATADIR/treasures"	3589	load_resource_file "$DATADIR/treasures"
3473	or die "unable to load treasurelists\n";	3590	or die "unable to load treasurelists\n";
3474	}	3591	}
3475		3592
		3593	sub reload_sound {
		3594	trace "loading sound config from $DATADIR/sound\n";
		3595
		3596	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3597
		3598	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3599	my $sound = $soundconf->{compat}[$_]
		3600	or next;
		3601
		3602	my $face = cf::face::find "sound/$sound->[1]";
		3603	cf::sound::set $sound->[0] => $face;
		3604	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3605	}
		3606
		3607	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3608	my $face = cf::face::find "sound/$v";
		3609	cf::sound::set $k => $face;
		3610	}
		3611	}
		3612
3476	sub reload_resources {	3613	sub reload_resources {
3477	warn "reloading resource files...\n";	3614	trace "reloading resource files...\n";
3478		3615
		3616	reload_exp_table;
		3617	reload_materials;
3479	reload_facedata;	3618	reload_facedata;
		3619	reload_sound;
3480	reload_archetypes;	3620	reload_archetypes;
3481	reload_regions;	3621	reload_regions;
3482	reload_treasures;	3622	reload_treasures;
3483		3623
3484	warn "finished reloading resource files\n";	3624	trace "finished reloading resource files\n";
3485	}	3625	}
3486		3626
3487	sub reload_config {	3627	sub reload_config {
3488	warn "reloading config file...\n";	3628	trace "reloading config file...\n";
3489		3629
3490	open my $fh, "<:utf8", "$CONFDIR/config"	3630	my $config = load_file "$CONFDIR/config";
3491	or return;	3631	utf8::decode $config;
		3632	*CFG = decode_yaml $config;
3492		3633
3493	local $/;
3494	*CFG = YAML::XS::Load scalar <$fh>;
3495
3496	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3634	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3497		3635
3498	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3636	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3499	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3637	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3500		3638
3501	if (exists $CFG{mlockall}) {	3639	if (exists $CFG{mlockall}) {
…		…
3503	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3641	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3504	and die "WARNING: m(un)lockall failed: $!\n";	3642	and die "WARNING: m(un)lockall failed: $!\n";
3505	};	3643	};
3506	warn $@ if $@;	3644	warn $@ if $@;
3507	}	3645	}
3508
3509	warn "finished reloading resource files\n";
3510	}	3646	}
3511		3647
3512	sub pidfile() {	3648	sub pidfile() {
3513	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3649	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3514	or die "$PIDFILE: $!";	3650	or die "$PIDFILE: $!";
…		…
3527	seek $fh, 0, 0;	3663	seek $fh, 0, 0;
3528	print $fh $$;	3664	print $fh $$;
3529	}	3665	}
3530		3666
3531	sub main_loop {	3667	sub main_loop {
3532	warn "EV::loop starting\n";	3668	trace "EV::loop starting\n";
3533	if (1) {	3669	if (1) {
3534	EV::loop;	3670	EV::loop;
3535	}	3671	}
3536	warn "EV::loop returned\n";	3672	trace "EV::loop returned\n";
3537	goto &main_loop unless $REALLY_UNLOOP;	3673	goto &main_loop unless $REALLY_UNLOOP;
3538	}	3674	}
3539		3675
3540	sub main {	3676	sub main {
3541	cf::init_globals; # initialise logging	3677	cf::init_globals; # initialise logging
3542		3678
3543	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3679	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3544	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3680	LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3545	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3681	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3546	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3682	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3547		3683
3548	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3684	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3549		3685
…		…
3557	};	3693	};
3558		3694
3559	evthread_start IO::AIO::poll_fileno;	3695	evthread_start IO::AIO::poll_fileno;
3560		3696
3561	cf::sync_job {	3697	cf::sync_job {
3562	cf::init_experience;	3698	cf::incloader::init ();
		3699
3563	cf::init_anim;	3700	cf::init_anim;
3564	cf::init_attackmess;	3701	cf::init_attackmess;
3565	cf::init_dynamic;	3702	cf::init_dynamic;
3566		3703
3567	cf::load_settings;	3704	cf::load_settings;
3568	cf::load_materials;
3569		3705
3570	reload_resources;	3706	reload_resources;
3571	reload_config;	3707	reload_config;
3572	db_init;	3708	db_init;
3573		3709
…		…
3585		3721
3586	# no (long-running) fork's whatsoever before this point(!)	3722	# no (long-running) fork's whatsoever before this point(!)
3587	use POSIX ();	3723	use POSIX ();
3588	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3724	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3589		3725
3590	(pop @POST_INIT)->(0) while @POST_INIT;	3726	cf::_post_init 0;
3591	};	3727	};
3592		3728
3593	cf::object::thawer::errors_are_fatal 0;	3729	cf::object::thawer::errors_are_fatal 0;
3594	warn "parse errors in files are no longer fatal from this point on.\n";	3730	info "parse errors in files are no longer fatal from this point on.\n";
3595		3731
		3732	my $free_main; $free_main = EV::idle sub {
		3733	undef $free_main;
		3734	undef &main; # free gobs of memory :)
		3735	};
		3736
3596	main_loop;	3737	goto &main_loop;
3597	}	3738	}
3598		3739
3599	#############################################################################	3740	#############################################################################
3600	# initialisation and cleanup	3741	# initialisation and cleanup
3601		3742
…		…
3640	or return;	3781	or return;
3641		3782
3642	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3783	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3643	and return;	3784	and return;
3644		3785
3645	warn sprintf "runtime file written (%gs).\n", AE::time - $t0;	3786	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3646		3787
3647	1	3788	1
3648	}	3789	}
3649		3790
3650	our $uuid_lock;	3791	our $uuid_lock;
…		…
3662	or return;	3803	or return;
3663		3804
3664	my $value = uuid_seq uuid_cur;	3805	my $value = uuid_seq uuid_cur;
3665		3806
3666	unless ($value) {	3807	unless ($value) {
3667	warn "cowardly refusing to write zero uuid value!\n";	3808	info "cowardly refusing to write zero uuid value!\n";
3668	return;	3809	return;
3669	}	3810	}
3670		3811
3671	my $value = uuid_str $value + $uuid_skip;	3812	my $value = uuid_str $value + $uuid_skip;
3672	$uuid_skip = 0;	3813	$uuid_skip = 0;
…		…
3682	or return;	3823	or return;
3683		3824
3684	aio_rename "$uuid~", $uuid	3825	aio_rename "$uuid~", $uuid
3685	and return;	3826	and return;
3686		3827
3687	warn "uuid file written ($value).\n";	3828	trace "uuid file written ($value).\n";
3688		3829
3689	1	3830	1
3690		3831
3691	}	3832	}
3692		3833
…		…
3698	}	3839	}
3699		3840
3700	sub emergency_save() {	3841	sub emergency_save() {
3701	my $freeze_guard = cf::freeze_mainloop;	3842	my $freeze_guard = cf::freeze_mainloop;
3702		3843
3703	warn "emergency_perl_save: enter\n";	3844	info "emergency_perl_save: enter\n";
		3845
		3846	# this is a trade-off: we want to be very quick here, so
		3847	# save all maps without fsync, and later call a global sync
		3848	# (which in turn might be very very slow)
		3849	local $USE_FSYNC = 0;
3704		3850
3705	cf::sync_job {	3851	cf::sync_job {
3706	# this is a trade-off: we want to be very quick here, so	3852	cf::write_runtime_sync; # external watchdog should not bark
3707	# save all maps without fsync, and later call a global sync
3708	# (which in turn might be very very slow)
3709	local $USE_FSYNC = 0;
3710		3853
3711	# use a peculiar iteration method to avoid tripping on perl	3854	# use a peculiar iteration method to avoid tripping on perl
3712	# refcount bugs in for. also avoids problems with players	3855	# refcount bugs in for. also avoids problems with players
3713	# and maps saved/destroyed asynchronously.	3856	# and maps saved/destroyed asynchronously.
3714	warn "emergency_perl_save: begin player save\n";	3857	info "emergency_perl_save: begin player save\n";
3715	for my $login (keys %cf::PLAYER) {	3858	for my $login (keys %cf::PLAYER) {
3716	my $pl = $cf::PLAYER{$login} or next;	3859	my $pl = $cf::PLAYER{$login} or next;
3717	$pl->valid or next;	3860	$pl->valid or next;
3718	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3861	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3719	$pl->save;	3862	$pl->save;
3720	}	3863	}
3721	warn "emergency_perl_save: end player save\n";	3864	info "emergency_perl_save: end player save\n";
3722		3865
		3866	cf::write_runtime_sync; # external watchdog should not bark
		3867
3723	warn "emergency_perl_save: begin map save\n";	3868	info "emergency_perl_save: begin map save\n";
3724	for my $path (keys %cf::MAP) {	3869	for my $path (keys %cf::MAP) {
3725	my $map = $cf::MAP{$path} or next;	3870	my $map = $cf::MAP{$path} or next;
3726	$map->valid or next;	3871	$map->valid or next;
3727	$map->save;	3872	$map->save;
3728	}	3873	}
3729	warn "emergency_perl_save: end map save\n";	3874	info "emergency_perl_save: end map save\n";
3730		3875
		3876	cf::write_runtime_sync; # external watchdog should not bark
		3877
3731	warn "emergency_perl_save: begin database checkpoint\n";	3878	info "emergency_perl_save: begin database checkpoint\n";
3732	BDB::db_env_txn_checkpoint $DB_ENV;	3879	BDB::db_env_txn_checkpoint $DB_ENV;
3733	warn "emergency_perl_save: end database checkpoint\n";	3880	info "emergency_perl_save: end database checkpoint\n";
3734		3881
3735	warn "emergency_perl_save: begin write uuid\n";	3882	info "emergency_perl_save: begin write uuid\n";
3736	write_uuid_sync 1;	3883	write_uuid_sync 1;
3737	warn "emergency_perl_save: end write uuid\n";	3884	info "emergency_perl_save: end write uuid\n";
		3885
		3886	cf::write_runtime_sync; # external watchdog should not bark
		3887
		3888	trace "emergency_perl_save: syncing database to disk";
		3889	BDB::db_env_txn_checkpoint $DB_ENV;
		3890
		3891	info "emergency_perl_save: starting sync\n";
		3892	IO::AIO::aio_sync sub {
		3893	info "emergency_perl_save: finished sync\n";
		3894	};
		3895
		3896	cf::write_runtime_sync; # external watchdog should not bark
		3897
		3898	trace "emergency_perl_save: flushing outstanding aio requests";
		3899	while (IO::AIO::nreqs || BDB::nreqs) {
		3900	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
		3901	}
		3902
		3903	cf::write_runtime_sync; # external watchdog should not bark
3738	};	3904	};
3739		3905
3740	warn "emergency_perl_save: starting sync()\n";
3741	IO::AIO::aio_sync sub {
3742	warn "emergency_perl_save: finished sync()\n";
3743	};
3744
3745	warn "emergency_perl_save: leave\n";	3906	info "emergency_perl_save: leave\n";
3746	}	3907	}
3747		3908
3748	sub post_cleanup {	3909	sub post_cleanup {
3749	my ($make_core) = @_;	3910	my ($make_core) = @_;
3750		3911
		3912	IO::AIO::flush;
		3913
3751	warn Carp::longmess "post_cleanup backtrace"	3914	error Carp::longmess "post_cleanup backtrace"
3752	if $make_core;	3915	if $make_core;
3753		3916
3754	my $fh = pidfile;	3917	my $fh = pidfile;
3755	unlink $PIDFILE if <$fh> == $$;	3918	unlink $PIDFILE if <$fh> == $$;
3756	}	3919	}
…		…
3776	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3939	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3777	for my $name (keys %$leaf_symtab) {	3940	for my $name (keys %$leaf_symtab) {
3778	_gv_clear *{"$pkg$name"};	3941	_gv_clear *{"$pkg$name"};
3779	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3942	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3780	}	3943	}
3781	warn "cleared package $pkg\n";#d#
3782	}	3944	}
3783		3945
3784	sub do_reload_perl() {	3946	sub do_reload_perl() {
3785	# can/must only be called in main	3947	# can/must only be called in main
3786	if ($Coro::current != $Coro::main) {	3948	unless (in_main) {
3787	warn "can only reload from main coroutine";	3949	error "can only reload from main coroutine";
3788	return;	3950	return;
3789	}	3951	}
3790		3952
3791	return if $RELOAD++;	3953	return if $RELOAD++;
3792		3954
3793	my $t1 = AE::time;	3955	my $t1 = AE::time;
3794		3956
3795	while ($RELOAD) {	3957	while ($RELOAD) {
3796	warn "reloading...";	3958	cf::get_slot 0.1, -1, "reload_perl";
		3959	info "perl_reload: reloading...";
3797		3960
3798	warn "entering sync_job";	3961	trace "perl_reload: entering sync_job";
3799		3962
3800	cf::sync_job {	3963	cf::sync_job {
3801	cf::write_runtime_sync; # external watchdog should not bark
3802	cf::emergency_save;	3964	#cf::emergency_save;
3803	cf::write_runtime_sync; # external watchdog should not bark
3804		3965
3805	warn "syncing database to disk";
3806	BDB::db_env_txn_checkpoint $DB_ENV;
3807
3808	# if anything goes wrong in here, we should simply crash as we already saved
3809
3810	warn "flushing outstanding aio requests";
3811	while (IO::AIO::nreqs || BDB::nreqs) {
3812	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3813	}
3814
3815	warn "cancelling all extension coros";	3966	trace "perl_reload: cancelling all extension coros";
3816	$_->cancel for values %EXT_CORO;	3967	$_->cancel for values %EXT_CORO;
3817	%EXT_CORO = ();	3968	%EXT_CORO = ();
3818		3969
3819	warn "removing commands";	3970	trace "perl_reload: removing commands";
3820	%COMMAND = ();	3971	%COMMAND = ();
3821		3972
3822	warn "removing ext/exti commands";	3973	trace "perl_reload: removing ext/exti commands";
3823	%EXTCMD = ();	3974	%EXTCMD = ();
3824	%EXTICMD = ();	3975	%EXTICMD = ();
3825		3976
3826	warn "unloading/nuking all extensions";	3977	trace "perl_reload: unloading/nuking all extensions";
3827	for my $pkg (@EXTS) {	3978	for my $pkg (@EXTS) {
3828	warn "... unloading $pkg";	3979	trace "... unloading $pkg";
3829		3980
3830	if (my $cb = $pkg->can ("unload")) {	3981	if (my $cb = $pkg->can ("unload")) {
3831	eval {	3982	eval {
3832	$cb->($pkg);	3983	$cb->($pkg);
3833	1	3984	1
3834	} or warn "$pkg unloaded, but with errors: $@";	3985	} or error "$pkg unloaded, but with errors: $@";
3835	}	3986	}
3836		3987
3837	warn "... clearing $pkg";	3988	trace "... clearing $pkg";
3838	clear_package $pkg;	3989	clear_package $pkg;
3839	}	3990	}
3840		3991
3841	warn "unloading all perl modules loaded from $LIBDIR";	3992	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3842	while (my ($k, $v) = each %INC) {	3993	while (my ($k, $v) = each %INC) {
3843	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3994	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3844		3995
3845	warn "... unloading $k";	3996	trace "... unloading $k";
3846	delete $INC{$k};	3997	delete $INC{$k};
3847		3998
3848	$k =~ s/\.pm$//;	3999	$k =~ s/\.pm$//;
3849	$k =~ s/\//::/g;	4000	$k =~ s/\//::/g;
3850		4001
…		…
3853	}	4004	}
3854		4005
3855	clear_package $k;	4006	clear_package $k;
3856	}	4007	}
3857		4008
3858	warn "getting rid of safe::, as good as possible";	4009	trace "perl_reload: getting rid of safe::, as good as possible";
3859	clear_package "safe::$_"	4010	clear_package "safe::$_"
3860	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4011	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3861		4012
3862	warn "unloading cf.pm \"a bit\"";	4013	trace "perl_reload: unloading cf.pm \"a bit\"";
3863	delete $INC{"cf.pm"};	4014	delete $INC{"cf.pm"};
3864	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4015	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3865		4016
3866	# don't, removes xs symbols, too,	4017	# don't, removes xs symbols, too,
3867	# and global variables created in xs	4018	# and global variables created in xs
3868	#clear_package __PACKAGE__;	4019	#clear_package __PACKAGE__;
3869		4020
3870	warn "unload completed, starting to reload now";	4021	info "perl_reload: unload completed, starting to reload now";
3871		4022
3872	warn "reloading cf.pm";	4023	trace "perl_reload: reloading cf.pm";
3873	require cf;	4024	require cf;
3874	cf::_connect_to_perl_1;	4025	cf::_connect_to_perl_1;
3875		4026
3876	warn "loading config and database again";	4027	trace "perl_reload: loading config and database again";
3877	cf::reload_config;	4028	cf::reload_config;
3878		4029
3879	warn "loading extensions";	4030	trace "perl_reload: loading extensions";
3880	cf::load_extensions;	4031	cf::load_extensions;
3881		4032
3882	if ($REATTACH_ON_RELOAD) {	4033	if ($REATTACH_ON_RELOAD) {
3883	warn "reattaching attachments to objects/players";	4034	trace "perl_reload: reattaching attachments to objects/players";
3884	_global_reattach; # objects, sockets	4035	_global_reattach; # objects, sockets
3885	warn "reattaching attachments to maps";	4036	trace "perl_reload: reattaching attachments to maps";
3886	reattach $_ for values %MAP;	4037	reattach $_ for values %MAP;
3887	warn "reattaching attachments to players";	4038	trace "perl_reload: reattaching attachments to players";
3888	reattach $_ for values %PLAYER;	4039	reattach $_ for values %PLAYER;
3889	}	4040	}
3890		4041
3891	warn "running post_init jobs";	4042	cf::_post_init 1;
3892	(pop @POST_INIT)->(1) while @POST_INIT;
3893		4043
3894	warn "leaving sync_job";	4044	trace "perl_reload: leaving sync_job";
3895		4045
3896	1	4046	1
3897	} or do {	4047	} or do {
3898	warn $@;	4048	error $@;
3899	cf::cleanup "error while reloading, exiting.";	4049	cf::cleanup "perl_reload: error, exiting.";
3900	};	4050	};
3901		4051
3902	warn "reloaded";
3903	--$RELOAD;	4052	--$RELOAD;
3904	}	4053	}
3905		4054
3906	$t1 = AE::time - $t1;	4055	$t1 = AE::time - $t1;
3907	warn "reload completed in ${t1}s\n";	4056	info "perl_reload: completed in ${t1}s\n";
3908	};	4057	};
3909		4058
3910	our $RELOAD_WATCHER; # used only during reload	4059	our $RELOAD_WATCHER; # used only during reload
3911		4060
3912	sub reload_perl() {	4061	sub reload_perl() {
…		…
3933	reload_perl;	4082	reload_perl;
3934	};	4083	};
3935	}	4084	}
3936	};	4085	};
3937		4086
3938	unshift @INC, $LIBDIR;	4087	#############################################################################
3939		4088
3940	my $bug_warning = 0;	4089	my $bug_warning = 0;
3941		4090
3942	our @WAIT_FOR_TICK;	4091	our @WAIT_FOR_TICK;
3943	our @WAIT_FOR_TICK_BEGIN;	4092	our @WAIT_FOR_TICK_BEGIN;
3944		4093
3945	sub wait_for_tick {	4094	sub wait_for_tick() {
3946	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4095	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3947		4096
3948	my $signal = new Coro::Signal;	4097	my $signal = new Coro::Signal;
3949	push @WAIT_FOR_TICK, $signal;	4098	push @WAIT_FOR_TICK, $signal;
3950	$signal->wait;	4099	$signal->wait;
3951	}	4100	}
3952		4101
3953	sub wait_for_tick_begin {	4102	sub wait_for_tick_begin() {
3954	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4103	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3955		4104
3956	my $signal = new Coro::Signal;	4105	my $signal = new Coro::Signal;
3957	push @WAIT_FOR_TICK_BEGIN, $signal;	4106	push @WAIT_FOR_TICK_BEGIN, $signal;
3958	$signal->wait;	4107	$signal->wait;
…		…
3972	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4121	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3973	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4122	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3974	Coro::async_pool {	4123	Coro::async_pool {
3975	$Coro::current->{desc} = "runtime saver";	4124	$Coro::current->{desc} = "runtime saver";
3976	write_runtime_sync	4125	write_runtime_sync
3977	or warn "ERROR: unable to write runtime file: $!";	4126	or error "ERROR: unable to write runtime file: $!";
3978	};	4127	};
3979	}	4128	}
3980		4129
3981	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4130	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3982	$sig->send;	4131	$sig->send;
…		…
3990		4139
3991	if (0) {	4140	if (0) {
3992	if ($NEXT_TICK) {	4141	if ($NEXT_TICK) {
3993	my $jitter = $TICK_START - $NEXT_TICK;	4142	my $jitter = $TICK_START - $NEXT_TICK;
3994	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4143	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3995	warn "jitter $JITTER\n";#d#	4144	debug "jitter $JITTER\n";#d#
3996	}	4145	}
3997	}	4146	}
3998	}	4147	}
3999		4148
4000	{	4149	{
…		…
4045	IO::AIO::min_parallel 8;	4194	IO::AIO::min_parallel 8;
4046	IO::AIO::max_poll_time $TICK * 0.1;	4195	IO::AIO::max_poll_time $TICK * 0.1;
4047	undef $AnyEvent::AIO::WATCHER;	4196	undef $AnyEvent::AIO::WATCHER;
4048	}	4197	}
4049		4198
4050	my $_log_backtrace;	4199	our $_log_backtrace;
		4200	our $_log_backtrace_last;
4051		4201
4052	sub _log_backtrace {	4202	sub _log_backtrace {
4053	my ($msg, @addr) = @_;	4203	my ($msg, @addr) = @_;
4054		4204
4055	$msg =~ s/\n//;	4205	$msg =~ s/\n$//;
4056		4206
		4207	if ($_log_backtrace_last eq $msg) {
		4208	LOG llevInfo, "[ABT] $msg\n";
		4209	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4057	# limit the # of concurrent backtraces	4210	# limit the # of concurrent backtraces
4058	if ($_log_backtrace < 2) {	4211	} elsif ($_log_backtrace < 2) {
		4212	$_log_backtrace_last = $msg;
4059	++$_log_backtrace;	4213	++$_log_backtrace;
4060	my $perl_bt = Carp::longmess $msg;	4214	my $perl_bt = Carp::longmess $msg;
4061	async {	4215	async {
4062	$Coro::current->{desc} = "abt $msg";	4216	$Coro::current->{desc} = "abt $msg";
4063		4217
…		…
4083	LOG llevInfo, "[ABT] $_\n" for @bt;	4237	LOG llevInfo, "[ABT] $_\n" for @bt;
4084	--$_log_backtrace;	4238	--$_log_backtrace;
4085	};	4239	};
4086	} else {	4240	} else {
4087	LOG llevInfo, "[ABT] $msg\n";	4241	LOG llevInfo, "[ABT] $msg\n";
4088	LOG llevInfo, "[ABT] [suppressed]\n";	4242	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4089	}	4243	}
4090	}	4244	}
4091		4245
4092	# load additional modules	4246	# load additional modules
4093	require "cf/$_.pm" for @EXTRA_MODULES;	4247	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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