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.522 by root, Sat Apr 17 02:22:14 2010 UTC vs.
Revision 1.568 by root, Tue May 3 17:12:14 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;
…		…
230	from wherever your confdir points to.	235	from wherever your confdir points to.
231		236
232	=item cf::wait_for_tick, cf::wait_for_tick_begin	237	=item cf::wait_for_tick, cf::wait_for_tick_begin
233		238
234	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
235	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
236	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();
237		247
238	=item @cf::INVOKE_RESULTS	248	=item @cf::INVOKE_RESULTS
239		249
240	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
241	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
…		…
249		259
250	=back	260	=back
251		261
252	=cut	262	=cut
253		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
254	$Coro::State::WARNHOOK = sub {	270	$Coro::State::WARNHOOK = sub {
255	my $msg = join "", @_;	271	my $msg = join "", @_;
256		272
257	$msg .= "\n"	273	$msg .= "\n"
258	unless $msg =~ /\n$/;	274	unless $msg =~ /\n$/;
259		275
260	$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;
261		277
262	LOG llevError, $msg;	278	LOG llevWarn, $msg;
263	};	279	};
264		280
265	$Coro::State::DIEHOOK = sub {	281	$Coro::State::DIEHOOK = sub {
266	return unless $^S eq 0; # "eq", not "=="	282	return unless $^S eq 0; # "eq", not "=="
267		283
268	warn Carp::longmess $_[0];	284	error Carp::longmess $_[0];
269		285
270	if (in_main) {#d#	286	if (in_main) {#d#
271	warn "DIEHOOK called in main context, Coro bug?\n";#d#	287	error "DIEHOOK called in main context, Coro bug?\n";#d#
272	return;#d#	288	return;#d#
273	}#d#	289	}#d#
274		290
275	# kill coroutine otherwise	291	# kill coroutine otherwise
276	Coro::terminate	292	Coro::terminate
…		…
298	}	314	}
299		315
300	$EV::DIED = sub {	316	$EV::DIED = sub {
301	Carp::cluck "error in event callback: @_";	317	Carp::cluck "error in event callback: @_";
302	};	318	};
		319
		320	#############################################################################
		321
		322	sub fork_call(&@);
		323	sub get_slot($;$$);
303		324
304	#############################################################################	325	#############################################################################
305		326
306	=head2 UTILITY FUNCTIONS	327	=head2 UTILITY FUNCTIONS
307		328
…		…
328	$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;
329	$d	350	$d
330	} || "[unable to dump $_[0]: '$@']";	351	} || "[unable to dump $_[0]: '$@']";
331	}	352	}
332		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
333	=item $ref = cf::decode_json $json	368	=item $ref = cf::decode_json $json
334		369
335	Converts a JSON string into the corresponding perl data structure.	370	Converts a JSON string into the corresponding perl data structure.
336		371
337	=item $json = cf::encode_json $ref	372	=item $json = cf::encode_json $ref
…		…
343	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
344		379
345	sub encode_json($) { $json_coder->encode ($_[0]) }	380	sub encode_json($) { $json_coder->encode ($_[0]) }
346	sub decode_json($) { $json_coder->decode ($_[0]) }	381	sub decode_json($) { $json_coder->decode ($_[0]) }
347		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
348	=item cf::post_init { BLOCK }	414	=item cf::post_init { BLOCK }
349		415
350	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,
351	but I<before> the server starts ticking again.	417	but I<before> the server starts ticking again.
352		418
353	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
354	is a reload or not.	420	is a reload or not.
355		421
356	=cut	422	=cut
357		423
358	sub post_init(&) {	424	sub post_init(&) {
359	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	}
360	}	443	}
361		444
362	=item cf::lock_wait $string	445	=item cf::lock_wait $string
363		446
364	Wait until the given lock is available. See cf::lock_acquire.	447	Wait until the given lock is available. See cf::lock_acquire.
…		…
417	EV::periodic $start, $interval, 0, $cb	500	EV::periodic $start, $interval, 0, $cb
418	}	501	}
419		502
420	=item cf::get_slot $time[, $priority[, $name]]	503	=item cf::get_slot $time[, $priority[, $name]]
421		504
422	Allocate $time seconds of blocking CPU time at priority C<$priority>:	505	Allocate $time seconds of blocking CPU time at priority C<$priority>
423	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
424	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.
425		512
426	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
427	used for statistical purposes and should identify the same time-class.	514	used for statistical purposes and should identify the same time-class.
428		515
429	Useful for short background jobs.	516	Useful for short background jobs.
…		…
509	=cut	596	=cut
510		597
511	sub sync_job(&) {	598	sub sync_job(&) {
512	my ($job) = @_;	599	my ($job) = @_;
513		600
514	if ($Coro::current == $Coro::main) {	601	if (in_main) {
515	my $time = AE::time;	602	my $time = AE::time;
516		603
517	# this is the main coro, too bad, we have to block	604	# this is the main coro, too bad, we have to block
518	# till the operation succeeds, freezing the server :/	605	# till the operation succeeds, freezing the server :/
519		606
520	LOG llevError, Carp::longmess "sync job";#d#	607	#LOG llevError, Carp::longmess "sync job";#d#
521		608
522	my $freeze_guard = freeze_mainloop;	609	my $freeze_guard = freeze_mainloop;
523		610
524	my $busy = 1;	611	my $busy = 1;
525	my @res;	612	my @res;
526		613
527	(async {	614	(async {
528	$Coro::current->desc ("sync job coro");	615	$Coro::current->desc ("sync job coro");
529	@res = eval { $job->() };	616	@res = eval { $job->() };
530	warn $@ if $@;	617	error $@ if $@;
531	undef $busy;	618	undef $busy;
532	})->prio (Coro::PRIO_MAX);	619	})->prio (Coro::PRIO_MAX);
533		620
534	while ($busy) {	621	while ($busy) {
535	if (Coro::nready) {	622	if (Coro::nready) {
…		…
569	$EXT_CORO{$coro+0} = $coro;	656	$EXT_CORO{$coro+0} = $coro;
570		657
571	$coro	658	$coro
572	}	659	}
573		660
574	=item fork_call { }, $args	661	=item fork_call { }, @args
575		662
576	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
577	process, returning the results. Everything must be serialisable with	664	process, returning the results. Everything must be serialisable with
578	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
579	never block itself or use any form of event handling.	666	never block itself or use any form of event handling.
580		667
581	=cut	668	=cut
582		669
		670	sub post_fork {
		671	reset_signals;
		672	}
		673
583	sub fork_call(&@) {	674	sub fork_call(&@) {
584	my ($cb, @args) = @_;	675	my ($cb, @args) = @_;
585		676
586	# 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,
587	# otherwise perl prematurely frees the stuff :/	678	# otherwise perl prematurely frees the stuff :/
588	# TODO: investigate and fix (likely this will be rather laborious)	679	# TODO: investigate and fix (likely this will be rather laborious)
589		680
590	my @res = Coro::Util::fork_eval {	681	my @res = Coro::Util::fork_eval {
591	reset_signals;	682	cf::post_fork;
592	&$cb	683	&$cb
593	}, @args;	684	} @args;
594		685
595	wantarray ? @res : $res[-1]	686	wantarray ? @res : $res[-1]
596	}	687	}
597		688
598	sub objinfo {	689	sub objinfo {
…		…
648	within each server.	739	within each server.
649		740
650	=cut	741	=cut
651		742
652	sub db_table($) {	743	sub db_table($) {
		744	cf::error "db_get called from main context"
		745	if $Coro::current == $Coro::main;
		746
653	my ($name) = @_;	747	my ($name) = @_;
654	my $db = BDB::db_create $DB_ENV;	748	my $db = BDB::db_create $DB_ENV;
655		749
656	eval {	750	eval {
657	$db->set_flags (BDB::CHKSUM);	751	$db->set_flags (BDB::CHKSUM);
…		…
667	}	761	}
668		762
669	our $DB;	763	our $DB;
670		764
671	sub db_init {	765	sub db_init {
672	cf::sync_job {
673	$DB ||= db_table "db";	766	$DB ||= db_table "db";
674	};
675	}	767	}
676		768
677	sub db_get($$) {	769	sub db_get($$) {
678	my $key = "$_[0]/$_[1]";	770	my $key = "$_[0]/$_[1]";
679		771
680	cf::sync_job {	772	cf::error "db_get called from main context"
		773	if $Coro::current == $Coro::main;
		774
681	BDB::db_get $DB, undef, $key, my $data;	775	BDB::db_get $DB, undef, $key, my $data;
682		776
683	$! ? ()	777	$! ? ()
684	: $data	778	: $data
685	}
686	}	779	}
687		780
688	sub db_put($$$) {	781	sub db_put($$$) {
689	BDB::dbreq_pri 4;	782	BDB::dbreq_pri 4;
690	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	783	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
718		811
719	my @data;	812	my @data;
720	my $md5;	813	my $md5;
721		814
722	for (0 .. $#$src) {	815	for (0 .. $#$src) {
723	0 <= aio_load $src->[$_], $data[$_]	816	$data[$_] = load_file $src->[$_];
724	or Carp::croak "$src->[$_]: $!";
725	}	817	}
726		818
727	# if processing is expensive, check	819	# if processing is expensive, check
728	# checksum first	820	# checksum first
729	if (1) {	821	if (1) {
…		…
746		838
747	my $t1 = Time::HiRes::time;	839	my $t1 = Time::HiRes::time;
748	my $data = $process->(\@data);	840	my $data = $process->(\@data);
749	my $t2 = Time::HiRes::time;	841	my $t2 = Time::HiRes::time;
750		842
751	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	843	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
752		844
753	db_put cache => "$id/data", $data;	845	db_put cache => "$id/data", $data;
754	db_put cache => "$id/md5" , $md5;	846	db_put cache => "$id/md5" , $md5;
755	db_put cache => "$id/meta", $meta;	847	db_put cache => "$id/meta", $meta;
756		848
…		…
766		858
767	=cut	859	=cut
768		860
769	sub datalog($@) {	861	sub datalog($@) {
770	my ($type, %kv) = @_;	862	my ($type, %kv) = @_;
771	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	863	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
772	}	864	}
773		865
774	=back	866	=back
775		867
776	=cut	868	=cut
…		…
971		1063
972	} elsif (exists $cb_id{$type}) {	1064	} elsif (exists $cb_id{$type}) {
973	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1065	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
974		1066
975	} elsif (ref $type) {	1067	} elsif (ref $type) {
976	warn "attaching objects not supported, ignoring.\n";	1068	error "attaching objects not supported, ignoring.\n";
977		1069
978	} else {	1070	} else {
979	shift @arg;	1071	shift @arg;
980	warn "attach argument '$type' not supported, ignoring.\n";	1072	error "attach argument '$type' not supported, ignoring.\n";
981	}	1073	}
982	}	1074	}
983	}	1075	}
984		1076
985	sub _object_attach {	1077	sub _object_attach {
…		…
995	_attach $registry, $klass, @attach;	1087	_attach $registry, $klass, @attach;
996	}	1088	}
997		1089
998	$obj->{$name} = \%arg;	1090	$obj->{$name} = \%arg;
999	} else {	1091	} else {
1000	warn "object uses attachment '$name' which is not available, postponing.\n";	1092	info "object uses attachment '$name' which is not available, postponing.\n";
1001	}	1093	}
1002		1094
1003	$obj->{_attachment}{$name} = undef;	1095	$obj->{_attachment}{$name} = undef;
1004	}	1096	}
1005		1097
…		…
1064		1156
1065	for (@$callbacks) {	1157	for (@$callbacks) {
1066	eval { &{$_->[1]} };	1158	eval { &{$_->[1]} };
1067		1159
1068	if ($@) {	1160	if ($@) {
1069	warn "$@";
1070	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1161	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1071	override;	1162	override;
1072	}	1163	}
1073		1164
1074	return 1 if $override;	1165	return 1 if $override;
1075	}	1166	}
…		…
1154	for (@$attach) {	1245	for (@$attach) {
1155	my ($klass, @attach) = @$_;	1246	my ($klass, @attach) = @$_;
1156	_attach $registry, $klass, @attach;	1247	_attach $registry, $klass, @attach;
1157	}	1248	}
1158	} else {	1249	} else {
1159	warn "object uses attachment '$name' that is not available, postponing.\n";	1250	info "object uses attachment '$name' that is not available, postponing.\n";
1160	}	1251	}
1161	}	1252	}
1162	}	1253	}
1163		1254
1164	cf::attachable->attach (	1255	cf::attachable->attach (
…		…
1191	my ($filename, $rdata, $objs) = @_;	1282	my ($filename, $rdata, $objs) = @_;
1192		1283
1193	sync_job {	1284	sync_job {
1194	if (length $$rdata) {	1285	if (length $$rdata) {
1195	utf8::decode (my $decname = $filename);	1286	utf8::decode (my $decname = $filename);
1196	warn sprintf "saving %s (%d,%d)\n",	1287	trace sprintf "saving %s (%d,%d)\n",
1197	$decname, length $$rdata, scalar @$objs;	1288	$decname, length $$rdata, scalar @$objs
		1289	if $VERBOSE_IO;
1198		1290
1199	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1291	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1200	aio_chmod $fh, SAVE_MODE;	1292	aio_chmod $fh, SAVE_MODE;
1201	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1293	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1202	if ($cf::USE_FSYNC) {	1294	if ($cf::USE_FSYNC) {
…		…
1224	aio_rename "$filename~", $filename;	1316	aio_rename "$filename~", $filename;
1225		1317
1226	$filename =~ s%/[^/]+$%%;	1318	$filename =~ s%/[^/]+$%%;
1227	aio_pathsync $filename if $cf::USE_FSYNC;	1319	aio_pathsync $filename if $cf::USE_FSYNC;
1228	} else {	1320	} else {
1229	warn "unable to save objects: $filename~: $!\n";	1321	error "unable to save objects: $filename~: $!\n";
1230	}	1322	}
1231	} else {	1323	} else {
1232	aio_unlink $filename;	1324	aio_unlink $filename;
1233	aio_unlink "$filename.pst";	1325	aio_unlink "$filename.pst";
1234	}	1326	}
…		…
1258	my $st = eval { Coro::Storable::thaw $av };	1350	my $st = eval { Coro::Storable::thaw $av };
1259	$av = $st->{objs};	1351	$av = $st->{objs};
1260	}	1352	}
1261		1353
1262	utf8::decode (my $decname = $filename);	1354	utf8::decode (my $decname = $filename);
1263	warn sprintf "loading %s (%d,%d)\n",	1355	trace sprintf "loading %s (%d,%d)\n",
1264	$decname, length $data, scalar @{$av || []};	1356	$decname, length $data, scalar @{$av || []}
		1357	if $VERBOSE_IO;
1265		1358
1266	($data, $av)	1359	($data, $av)
1267	}	1360	}
1268		1361
1269	=head2 COMMAND CALLBACKS	1362	=head2 COMMAND CALLBACKS
…		…
1361		1454
1362	$pl->ext_reply ($reply, @reply)	1455	$pl->ext_reply ($reply, @reply)
1363	if $reply;	1456	if $reply;
1364		1457
1365	} else {	1458	} else {
1366	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1459	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1367	}	1460	}
1368		1461
1369	cf::override;	1462	cf::override;
1370	},	1463	},
1371	);	1464	);
…		…
1382		1475
1383	$grp	1476	$grp
1384	}	1477	}
1385		1478
1386	sub load_extensions {	1479	sub load_extensions {
		1480	info "loading extensions...";
		1481
1387	cf::sync_job {	1482	cf::sync_job {
1388	my %todo;	1483	my %todo;
1389		1484
1390	for my $path (<$LIBDIR/*.ext>) {	1485	for my $path (<$LIBDIR/*.ext>) {
1391	next unless -r $path;	1486	next unless -r $path;
…		…
1409		1504
1410	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1505	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1411	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1506	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1412		1507
1413	$ext{source} =	1508	$ext{source} =
1414	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1509	"package $pkg; use common::sense;\n"
1415	. "#line 1 \"$path\"\n{\n"	1510	. "#line 1 \"$path\"\n{\n"
1416	. $source	1511	. $source
1417	. "\n};\n1";	1512	. "\n};\n1";
1418		1513
1419	$todo{$base} = \%ext;	1514	$todo{$base} = \%ext;
…		…
1431	for (split /,\s*/, $v->{meta}{depends}) {	1526	for (split /,\s*/, $v->{meta}{depends}) {
1432	next ext	1527	next ext
1433	unless exists $done{$_};	1528	unless exists $done{$_};
1434	}	1529	}
1435		1530
1436	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1531	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1437		1532
1438	my $active = eval $v->{source};	1533	my $active = eval $v->{source};
1439		1534
1440	if (length $@) {	1535	if (length $@) {
1441	warn "$v->{path}: $@\n";	1536	error "$v->{path}: $@\n";
1442		1537
1443	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1538	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1444	if exists $v->{meta}{mandatory};	1539	if exists $v->{meta}{mandatory};
1445		1540
1446	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";	1541	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
…		…
1448	} else {	1543	} else {
1449	$done{$k} = delete $todo{$k};	1544	$done{$k} = delete $todo{$k};
1450	push @EXTS, $v->{pkg};	1545	push @EXTS, $v->{pkg};
1451	$progress = 1;	1546	$progress = 1;
1452		1547
1453	warn "$v->{base}: extension inactive.\n"	1548	info "$v->{base}: extension inactive.\n"
1454	unless $active;	1549	unless $active;
1455	}	1550	}
1456	}	1551	}
1457		1552
1458	unless ($progress) {	1553	unless ($progress) {
…		…
1460		1555
1461	while (my ($k, $v) = each %todo) {	1556	while (my ($k, $v) = each %todo) {
1462	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1557	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463	if exists $v->{meta}{mandatory};	1558	if exists $v->{meta}{mandatory};
1464	}	1559	}
		1560
		1561	last;
1465	}	1562	}
1466	}	1563	}
1467	};	1564	};
1468	}	1565	}
1469		1566
…		…
1627	my $name = $pl->ob->name;	1724	my $name = $pl->ob->name;
1628		1725
1629	$pl->{deny_save} = 1;	1726	$pl->{deny_save} = 1;
1630	$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
1631		1728
1632	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1729	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1633	$pl->deactivate;	1730	$pl->deactivate;
		1731
1634	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;
1635	$pl->ob->check_score;
1636	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1733	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1734	ext::highscore::check ($pl->ob);
		1735
1637	$pl->ns->destroy if $pl->ns;	1736	$pl->ns->destroy if $pl->ns;
1638		1737
1639	my $path = playerdir $pl;	1738	my $path = playerdir $pl;
1640	my $temp = "$path~$cf::RUNTIME~deleting~";	1739	my $temp = "$path~$cf::RUNTIME~deleting~";
1641	aio_rename $path, $temp;	1740	aio_rename $path, $temp;
…		…
1695	\@logins	1794	\@logins
1696	}	1795	}
1697		1796
1698	=item $player->maps	1797	=item $player->maps
1699		1798
		1799	=item cf::player::maps $login
		1800
1700	Returns an arrayref of map paths that are private for this	1801	Returns an arrayref of map paths that are private for this
1701	player. May block.	1802	player. May block.
1702		1803
1703	=cut	1804	=cut
1704		1805
…		…
1766	=cut	1867	=cut
1767		1868
1768	sub find_by_path($) {	1869	sub find_by_path($) {
1769	my ($path) = @_;	1870	my ($path) = @_;
1770		1871
		1872	$path =~ s/^~[^\/]*//; # skip ~login
		1873
1771	my ($match, $specificity);	1874	my ($match, $specificity);
1772		1875
1773	for my $region (list) {	1876	for my $region (list) {
1774	if ($region->{match} && $path =~ $region->{match}) {	1877	if ($region->{match} && $path =~ $region->{match}) {
1775	($match, $specificity) = ($region, $region->specificity)	1878	($match, $specificity) = ($region, $region->specificity)
…		…
1803	sub generate_random_map {	1906	sub generate_random_map {
1804	my ($self, $rmp) = @_;	1907	my ($self, $rmp) = @_;
1805		1908
1806	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
1807		1910
1808	# mit "rum" bekleckern, nicht
1809	$self->_create_random_map (	1911	$self->_create_random_map ($rmp);
1810	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1811	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1812	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1813	$rmp->{exit_on_final_map},
1814	$rmp->{xsize}, $rmp->{ysize},
1815	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1816	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1817	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1818	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1819	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1820	(cf::region::find $rmp->{region}), $rmp->{custom}
1821	)
1822	}	1912	}
1823		1913
1824	=item cf::map->register ($regex, $prio)	1914	=item cf::map->register ($regex, $prio)
1825		1915
1826	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
…		…
1831		1921
1832	sub register {	1922	sub register {
1833	my (undef, $regex, $prio) = @_;	1923	my (undef, $regex, $prio) = @_;
1834	my $pkg = caller;	1924	my $pkg = caller;
1835		1925
1836	no strict;
1837	push @{"$pkg\::ISA"}, __PACKAGE__;	1926	push @{"$pkg\::ISA"}, __PACKAGE__;
1838		1927
1839	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1928	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1840	}	1929	}
1841		1930
1842	# also paths starting with '/'	1931	# also paths starting with '/'
1843	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1932	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1844		1933
1845	sub thawer_merge {	1934	sub thawer_merge {
1846	my ($self, $merge) = @_;	1935	my ($self, $merge) = @_;
1847		1936
1848	# we have to keep some variables in memory intact	1937	# we have to keep some variables in memory intact
…		…
1853	}	1942	}
1854		1943
1855	sub normalise {	1944	sub normalise {
1856	my ($path, $base) = @_;	1945	my ($path, $base) = @_;
1857		1946
1858	$path = "$path"; # make sure its a string	1947	$path = "$path"; # make sure it's a string
1859		1948
1860	$path =~ s/\.map$//;	1949	$path =~ s/\.map$//;
1861		1950
1862	# map plan:	1951	# map plan:
1863	#	1952	#
…		…
1878	$base =~ s{[^/]+/?$}{};	1967	$base =~ s{[^/]+/?$}{};
1879	$path = "$base/$path";	1968	$path = "$base/$path";
1880	}	1969	}
1881		1970
1882	for ($path) {	1971	for ($path) {
1883	redo if s{//}{/};
1884	redo if s{/\.?/}{/};	1972	redo if s{/\.?/}{/};
1885	redo if s{/[^/]+/\.\./}{/};	1973	redo if s{/[^/]+/\.\./}{/};
1886	}	1974	}
1887		1975
1888	$path	1976	$path
…		…
1902	$self->init; # pass $1 etc.	1990	$self->init; # pass $1 etc.
1903	return $self;	1991	return $self;
1904	}	1992	}
1905	}	1993	}
1906		1994
1907	Carp::cluck "unable to resolve path '$path' (base '$base').";	1995	Carp::cluck "unable to resolve path '$path' (base '$base')";
1908	()	1996	()
1909	}	1997	}
1910		1998
		1999	# may re-bless or do other evil things
1911	sub init {	2000	sub init {
1912	my ($self) = @_;	2001	my ($self) = @_;
1913		2002
1914	$self	2003	$self
1915	}	2004	}
…		…
1980	$self->{load_path} = $path;	2069	$self->{load_path} = $path;
1981		2070
1982	1	2071	1
1983	}	2072	}
1984		2073
		2074	# used to laod the header of an original map
1985	sub load_header_orig {	2075	sub load_header_orig {
1986	my ($self) = @_;	2076	my ($self) = @_;
1987		2077
1988	$self->load_header_from ($self->load_path)	2078	$self->load_header_from ($self->load_path)
1989	}	2079	}
1990		2080
		2081	# used to laod the header of an instantiated map
1991	sub load_header_temp {	2082	sub load_header_temp {
1992	my ($self) = @_;	2083	my ($self) = @_;
1993		2084
1994	$self->load_header_from ($self->save_path)	2085	$self->load_header_from ($self->save_path)
1995	}	2086	}
1996		2087
		2088	# called after loading the header from an instantiated map
1997	sub prepare_temp {	2089	sub prepare_temp {
1998	my ($self) = @_;	2090	my ($self) = @_;
1999		2091
2000	$self->last_access ((delete $self->{last_access})	2092	$self->last_access ((delete $self->{last_access})
2001	|| $cf::RUNTIME); #d#	2093	|| $cf::RUNTIME); #d#
2002	# safety	2094	# safety
2003	$self->{instantiate_time} = $cf::RUNTIME	2095	$self->{instantiate_time} = $cf::RUNTIME
2004	if $self->{instantiate_time} > $cf::RUNTIME;	2096	if $self->{instantiate_time} > $cf::RUNTIME;
2005	}	2097	}
2006		2098
		2099	# called after loading the header from an original map
2007	sub prepare_orig {	2100	sub prepare_orig {
2008	my ($self) = @_;	2101	my ($self) = @_;
2009		2102
2010	$self->{load_original} = 1;	2103	$self->{load_original} = 1;
2011	$self->{instantiate_time} = $cf::RUNTIME;	2104	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2035		2128
2036	sub find;	2129	sub find;
2037	sub find {	2130	sub find {
2038	my ($path, $origin) = @_;	2131	my ($path, $origin) = @_;
2039		2132
		2133	cf::cede_to_tick;
		2134
2040	$path = normalise $path, $origin && $origin->path;	2135	$path = normalise $path, $origin;
2041		2136
2042	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2137	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2043	my $guard2 = cf::lock_acquire "map_find:$path";	2138	my $guard2 = cf::lock_acquire "map_find:$path";
2044		2139
2045	$cf::MAP{$path} || do {	2140	$cf::MAP{$path} || do {
…		…
2085	$self->alloc;	2180	$self->alloc;
2086		2181
2087	$self->pre_load;	2182	$self->pre_load;
2088	cf::cede_to_tick;	2183	cf::cede_to_tick;
2089		2184
		2185	if (exists $self->{load_path}) {
2090	my $f = new_from_file cf::object::thawer $self->{load_path};	2186	my $f = new_from_file cf::object::thawer $self->{load_path};
2091	$f->skip_block;	2187	$f->skip_block;
2092	$self->_load_objects ($f)	2188	$self->_load_objects ($f)
2093	or return;	2189	or return;
2094		2190
2095	$self->post_load_original	2191	$self->post_load_original
2096	if delete $self->{load_original};	2192	if delete $self->{load_original};
2097		2193
2098	if (my $uniq = $self->uniq_path) {	2194	if (my $uniq = $self->uniq_path) {
2099	utf8::encode $uniq;	2195	utf8::encode $uniq;
2100	unless (aio_stat $uniq) {	2196	unless (aio_stat $uniq) {
2101	if (my $f = new_from_file cf::object::thawer $uniq) {	2197	if (my $f = new_from_file cf::object::thawer $uniq) {
2102	$self->clear_unique_items;	2198	$self->clear_unique_items;
2103	$self->_load_objects ($f);	2199	$self->_load_objects ($f);
2104	$f->resolve_delayed_derefs;	2200	$f->resolve_delayed_derefs;
		2201	}
2105	}	2202	}
2106	}	2203	}
2107	}
2108		2204
2109	$f->resolve_delayed_derefs;	2205	$f->resolve_delayed_derefs;
		2206	} else {
		2207	$self->post_load_original
		2208	if delete $self->{load_original};
		2209	}
2110		2210
2111	cf::cede_to_tick;	2211	cf::cede_to_tick;
2112	# now do the right thing for maps	2212	# now do the right thing for maps
2113	$self->link_multipart_objects;	2213	$self->link_multipart_objects;
2114	$self->difficulty ($self->estimate_difficulty)	2214	$self->difficulty ($self->estimate_difficulty)
…		…
2118	unless ($self->{deny_activate}) {	2218	unless ($self->{deny_activate}) {
2119	$self->decay_objects;	2219	$self->decay_objects;
2120	$self->fix_auto_apply;	2220	$self->fix_auto_apply;
2121	$self->update_buttons;	2221	$self->update_buttons;
2122	cf::cede_to_tick;	2222	cf::cede_to_tick;
2123	$self->activate;	2223	#$self->activate; # no longer activate maps automatically
2124	}	2224	}
2125		2225
2126	$self->{last_save} = $cf::RUNTIME;	2226	$self->{last_save} = $cf::RUNTIME;
2127	$self->last_access ($cf::RUNTIME);	2227	$self->last_access ($cf::RUNTIME);
2128		2228
2129	$self->in_memory (cf::MAP_ACTIVE);	2229	$self->in_memory (cf::MAP_ACTIVE);
2130	}	2230	}
2131		2231
2132	$self->post_load;	2232	$self->post_load;
		2233
		2234	1
2133	}	2235	}
2134		2236
2135	# customize the map for a given player, i.e.	2237	# customize the map for a given player, i.e.
2136	# return the _real_ map. used by e.g. per-player	2238	# return the _real_ map. used by e.g. per-player
2137	# maps to change the path to ~playername/mappath	2239	# maps to change the path to ~playername/mappath
…		…
2158	or next;	2260	or next;
2159	$neigh = find $neigh, $map	2261	$neigh = find $neigh, $map
2160	or next;	2262	or next;
2161	$neigh->load;	2263	$neigh->load;
2162		2264
		2265	# now find the diagonal neighbours
2163	push @neigh,	2266	push @neigh,
2164	[$neigh->tile_path (($_ + 3) % 4), $neigh],	2267	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2165	[$neigh->tile_path (($_ + 1) % 4), $neigh];	2268	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2166	}	2269	}
2167		2270
…		…
2174	}	2277	}
2175		2278
2176	sub find_sync {	2279	sub find_sync {
2177	my ($path, $origin) = @_;	2280	my ($path, $origin) = @_;
2178		2281
2179	cf::sync_job { find $path, $origin }	2282	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2283	if $Coro::current == $Coro::main;
		2284
		2285	find $path, $origin
2180	}	2286	}
2181		2287
2182	sub do_load_sync {	2288	sub do_load_sync {
2183	my ($map) = @_;	2289	my ($map) = @_;
2184		2290
2185	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2291	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2186	if $Coro::current == $Coro::main;	2292	if $Coro::current == $Coro::main;
2187		2293
2188	cf::sync_job { $map->load };	2294	$map->load;
2189	}	2295	}
2190		2296
2191	our %MAP_PREFETCH;	2297	our %MAP_PREFETCH;
2192	our $MAP_PREFETCHER = undef;	2298	our $MAP_PREFETCHER = undef;
2193		2299
2194	sub find_async {	2300	sub find_async {
2195	my ($path, $origin, $load) = @_;	2301	my ($path, $origin, $load) = @_;
2196		2302
2197	$path = normalise $path, $origin && $origin->{path};	2303	$path = normalise $path, $origin;
2198		2304
2199	if (my $map = $cf::MAP{$path}) {	2305	if (my $map = $cf::MAP{$path}) {
2200	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2306	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2201	}	2307	}
2202		2308
…		…
2305		2411
2306	my $lock = cf::lock_acquire "map_data:$self->{path}";	2412	my $lock = cf::lock_acquire "map_data:$self->{path}";
2307		2413
2308	return if $self->players;	2414	return if $self->players;
2309		2415
2310	warn "resetting map ", $self->path, "\n";	2416	cf::trace "resetting map ", $self->path, "\n";
2311		2417
2312	$self->in_memory (cf::MAP_SWAPPED);	2418	$self->in_memory (cf::MAP_SWAPPED);
2313		2419
2314	# need to save uniques path	2420	# need to save uniques path
2315	unless ($self->{deny_save}) {	2421	unless ($self->{deny_save}) {
…		…
2339		2445
2340	delete $cf::MAP{$self->path};	2446	delete $cf::MAP{$self->path};
2341		2447
2342	$self->unlink_save;	2448	$self->unlink_save;
2343		2449
2344	bless $self, "cf::map";	2450	bless $self, "cf::map::wrap";
2345	delete $self->{deny_reset};	2451	delete $self->{deny_reset};
2346	$self->{deny_save} = 1;	2452	$self->{deny_save} = 1;
2347	$self->reset_timeout (1);	2453	$self->reset_timeout (1);
2348	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2454	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2349		2455
…		…
2579		2685
2580	Freezes the player and moves him/her to a special map (C<{link}>).	2686	Freezes the player and moves him/her to a special map (C<{link}>).
2581		2687
2582	The player should be reasonably safe there for short amounts of time (e.g.	2688	The player should be reasonably safe there for short amounts of time (e.g.
2583	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2689	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2584	though, as the palyer cannot control the character while it is on the link	2690	though, as the player cannot control the character while it is on the link
2585	map.	2691	map.
2586		2692
2587	Will never block.	2693	Will never block.
2588		2694
2589	=item $player_object->leave_link ($map, $x, $y)	2695	=item $player_object->leave_link ($map, $x, $y)
…		…
2610	sub cf::object::player::enter_link {	2716	sub cf::object::player::enter_link {
2611	my ($self) = @_;	2717	my ($self) = @_;
2612		2718
2613	$self->deactivate_recursive;	2719	$self->deactivate_recursive;
2614		2720
		2721	++$self->{_link_recursion};
		2722
2615	return if UNIVERSAL::isa $self->map, "ext::map_link";	2723	return if UNIVERSAL::isa $self->map, "ext::map_link";
2616		2724
2617	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2725	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2618	if $self->map && $self->map->{path} ne "{link}";	2726	if $self->map && $self->map->{path} ne "{link}";
2619		2727
…		…
2650	$map->load_neighbours;	2758	$map->load_neighbours;
2651		2759
2652	return unless $self->contr->active;	2760	return unless $self->contr->active;
2653		2761
2654	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2762	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2655	$self->enter_map ($map, $x, $y);	2763	if ($self->enter_map ($map, $x, $y)) {
2656		2764	# entering was successful
		2765	delete $self->{_link_recursion};
2657	# only activate afterwards, to support waiting in hooks	2766	# only activate afterwards, to support waiting in hooks
2658	$self->activate_recursive;	2767	$self->activate_recursive;
2659	}	2768	}
2660		2769
		2770	}
		2771
2661	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2772	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2662		2773
2663	Moves the player to the given map-path and coordinates by first freezing	2774	Moves the player to the given map-path and coordinates by first freezing
2664	her, loading and preparing them map, calling the provided $check callback	2775	her, loading and preparing them map, calling the provided $check callback
2665	that has to return the map if sucecssful, and then unfreezes the player on	2776	that has to return the map if sucecssful, and then unfreezes the player on
2666	the new (success) or old (failed) map position. In either case, $done will	2777	the new (success) or old (failed) map position. In either case, $done will
…		…
2673		2784
2674	our $GOTOGEN;	2785	our $GOTOGEN;
2675		2786
2676	sub cf::object::player::goto {	2787	sub cf::object::player::goto {
2677	my ($self, $path, $x, $y, $check, $done) = @_;	2788	my ($self, $path, $x, $y, $check, $done) = @_;
		2789
		2790	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2791	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2792	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2793	($path, $x, $y) = @$EMERGENCY_POSITION;
		2794	}
2678		2795
2679	# do generation counting so two concurrent goto's will be executed in-order	2796	# do generation counting so two concurrent goto's will be executed in-order
2680	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2797	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2681		2798
2682	$self->enter_link;	2799	$self->enter_link;
…		…
2702	($path, $x, $y) = (undef, undef, undef);	2819	($path, $x, $y) = (undef, undef, undef);
2703	}	2820	}
2704	}	2821	}
2705		2822
2706	my $map = eval {	2823	my $map = eval {
2707	my $map = defined $path ? cf::map::find $path : undef;	2824	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2708		2825
2709	if ($map) {	2826	if ($map) {
2710	$map = $map->customise_for ($self);	2827	$map = $map->customise_for ($self);
2711	$map = $check->($map) if $check && $map;	2828	$map = $check->($map, $x, $y, $self) if $check && $map;
2712	} else {	2829	} else {
2713	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2830	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2714	}	2831	}
2715		2832
2716	$map	2833	$map
…		…
2724	if ($gen == $self->{_goto_generation}) {	2841	if ($gen == $self->{_goto_generation}) {
2725	delete $self->{_goto_generation};	2842	delete $self->{_goto_generation};
2726	$self->leave_link ($map, $x, $y);	2843	$self->leave_link ($map, $x, $y);
2727	}	2844	}
2728		2845
2729	$done->() if $done;	2846	$done->($self) if $done;
2730	})->prio (1);	2847	})->prio (1);
2731	}	2848	}
2732		2849
2733	=item $player_object->enter_exit ($exit_object)	2850	=item $player_object->enter_exit ($exit_object)
2734		2851
…		…
2802	$Coro::current->{desc} = "enter_exit";	2919	$Coro::current->{desc} = "enter_exit";
2803		2920
2804	unless (eval {	2921	unless (eval {
2805	$self->deactivate_recursive; # just to be sure	2922	$self->deactivate_recursive; # just to be sure
2806		2923
2807	# random map handling
2808	{
2809	my $guard = cf::lock_acquire "exit_prepare:$exit";
2810
2811	prepare_random_map $exit
2812	if $exit->slaying eq "/!";
2813	}
2814
2815	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2924	my $map = cf::map::normalise $exit->slaying, $exit->map;
2816	my $x = $exit->stats->hp;	2925	my $x = $exit->stats->hp;
2817	my $y = $exit->stats->sp;	2926	my $y = $exit->stats->sp;
		2927
		2928	# special map handling
		2929	my $slaying = $exit->slaying;
		2930
		2931	# special map handling
		2932	if ($slaying eq "/!") {
		2933	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2934
		2935	prepare_random_map $exit
		2936	if $slaying eq "/!"; # need to re-check after getting the lock
		2937
		2938	} elsif ($slaying eq '!up') {
		2939	$map = $exit->map->tile_path (cf::TILE_UP);
		2940	$x = $exit->x;
		2941	$y = $exit->y;
		2942
		2943	} elsif ($slaying eq '!down') {
		2944	$map = $exit->map->tile_path (cf::TILE_DOWN);
		2945	$x = $exit->x;
		2946	$y = $exit->y;
		2947	}
2818		2948
2819	$self->goto ($map, $x, $y);	2949	$self->goto ($map, $x, $y);
2820		2950
2821	# if exit is damned, update players death & WoR home-position	2951	# if exit is damned, update players death & WoR home-position
2822	$self->contr->savebed ($map, $x, $y)	2952	$self->contr->savebed ($map, $x, $y)
…		…
2827	$self->message ("Something went wrong deep within the deliantra server. "	2957	$self->message ("Something went wrong deep within the deliantra server. "
2828	. "I'll try to bring you back to the map you were before. "	2958	. "I'll try to bring you back to the map you were before. "
2829	. "Please report this to the dungeon master!",	2959	. "Please report this to the dungeon master!",
2830	cf::NDI_UNIQUE | cf::NDI_RED);	2960	cf::NDI_UNIQUE | cf::NDI_RED);
2831		2961
2832	warn "ERROR in enter_exit: $@";	2962	error "ERROR in enter_exit: $@";
2833	$self->leave_link;	2963	$self->leave_link;
2834	}	2964	}
2835	})->prio (1);	2965	})->prio (1);
2836	}	2966	}
2837		2967
…		…
3150		3280
3151	$ns->ext_reply ($reply, @reply)	3281	$ns->ext_reply ($reply, @reply)
3152	if $reply;	3282	if $reply;
3153		3283
3154	} else {	3284	} else {
3155	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3285	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3156	}	3286	}
3157		3287
3158	cf::override;	3288	cf::override;
3159	},	3289	},
3160	);	3290	);
…		…
3241	decrease split destroy change_exp value msg lore send_msg)],	3371	decrease split destroy change_exp value msg lore send_msg)],
3242	["cf::object::player" => qw(player)],	3372	["cf::object::player" => qw(player)],
3243	["cf::player" => qw(peaceful send_msg)],	3373	["cf::player" => qw(peaceful send_msg)],
3244	["cf::map" => qw(trigger)],	3374	["cf::map" => qw(trigger)],
3245	) {	3375	) {
3246	no strict 'refs';
3247	my ($pkg, @funs) = @$_;	3376	my ($pkg, @funs) = @$_;
3248	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3377	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3249	for @funs;	3378	for @funs;
3250	}	3379	}
3251		3380
…		…
3290	local @cf::_safe_eval_args = values %vars;	3419	local @cf::_safe_eval_args = values %vars;
3291	@res = wantarray ? eval eval : scalar eval $eval;	3420	@res = wantarray ? eval eval : scalar eval $eval;
3292	}	3421	}
3293		3422
3294	if ($@) {	3423	if ($@) {
3295	warn "$@";	3424	warn "$@",
3296	warn "while executing safe code '$code'\n";	3425	"while executing safe code '$code'\n",
3297	warn "with arguments " . (join " ", %vars) . "\n";	3426	"with arguments " . (join " ", %vars) . "\n";
3298	}	3427	}
3299		3428
3300	wantarray ? @res : $res[0]	3429	wantarray ? @res : $res[0]
3301	}	3430	}
3302		3431
…		…
3336	# for this (global event?)	3465	# for this (global event?)
3337	%ext::player_env::MUSIC_FACE_CACHE = ();	3466	%ext::player_env::MUSIC_FACE_CACHE = ();
3338		3467
3339	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3468	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3340		3469
3341	warn "loading facedata from $path\n";	3470	trace "loading facedata from $path\n";
3342		3471
3343	my $facedata;	3472	my $facedata = decode_storable load_file $path;
3344	0 < aio_load $path, $facedata
3345	or die "$path: $!";
3346
3347	$facedata = Coro::Storable::thaw $facedata;
3348		3473
3349	$facedata->{version} == 2	3474	$facedata->{version} == 2
3350	or cf::cleanup "$path: version mismatch, cannot proceed.";	3475	or cf::cleanup "$path: version mismatch, cannot proceed.";
3351		3476
3352	# patch in the exptable	3477	# patch in the exptable
…		…
3366		3491
3367	cf::face::set_visibility $idx, $info->{visibility};	3492	cf::face::set_visibility $idx, $info->{visibility};
3368	cf::face::set_magicmap $idx, $info->{magicmap};	3493	cf::face::set_magicmap $idx, $info->{magicmap};
3369	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3494	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3370	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3495	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3496	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3371		3497
3372	cf::cede_to_tick;	3498	cf::cede_to_tick;
3373	}	3499	}
3374		3500
3375	while (my ($face, $info) = each %$faces) {	3501	while (my ($face, $info) = each %$faces) {
…		…
3380		3506
3381	if (my $smooth = cf::face::find $info->{smooth}) {	3507	if (my $smooth = cf::face::find $info->{smooth}) {
3382	cf::face::set_smooth $idx, $smooth;	3508	cf::face::set_smooth $idx, $smooth;
3383	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3509	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3384	} else {	3510	} else {
3385	warn "smooth face '$info->{smooth}' not found for face '$face'";	3511	error "smooth face '$info->{smooth}' not found for face '$face'";
3386	}	3512	}
3387		3513
3388	cf::cede_to_tick;	3514	cf::cede_to_tick;
3389	}	3515	}
3390	}	3516	}
…		…
3408	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3534	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3409		3535
3410	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3536	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3411	cf::face::set_type $idx, $info->{type};	3537	cf::face::set_type $idx, $info->{type};
3412	} else {	3538	} else {
3413	$RESOURCE{$name} = $info;	3539	$RESOURCE{$name} = $info; # unused
3414	}	3540	}
3415		3541
3416	cf::cede_to_tick;	3542	cf::cede_to_tick;
3417	}	3543	}
3418	}	3544	}
3419		3545
3420	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3546	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3421		3547
3422	1	3548	1
3423	}	3549	}
3424
3425	cf::global->attach (on_resource_update => sub {
3426	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3427	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3428
3429	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3430	my $sound = $soundconf->{compat}[$_]
3431	or next;
3432
3433	my $face = cf::face::find "sound/$sound->[1]";
3434	cf::sound::set $sound->[0] => $face;
3435	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3436	}
3437
3438	while (my ($k, $v) = each %{$soundconf->{event}}) {
3439	my $face = cf::face::find "sound/$v";
3440	cf::sound::set $k => $face;
3441	}
3442	}
3443	});
3444		3550
3445	register_exticmd fx_want => sub {	3551	register_exticmd fx_want => sub {
3446	my ($ns, $want) = @_;	3552	my ($ns, $want) = @_;
3447		3553
3448	while (my ($k, $v) = each %$want) {	3554	while (my ($k, $v) = each %$want) {
…		…
3487	sub reload_treasures {	3593	sub reload_treasures {
3488	load_resource_file "$DATADIR/treasures"	3594	load_resource_file "$DATADIR/treasures"
3489	or die "unable to load treasurelists\n";	3595	or die "unable to load treasurelists\n";
3490	}	3596	}
3491		3597
		3598	sub reload_sound {
		3599	trace "loading sound config from $DATADIR/sound\n";
		3600
		3601	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3602
		3603	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3604	my $sound = $soundconf->{compat}[$_]
		3605	or next;
		3606
		3607	my $face = cf::face::find "sound/$sound->[1]";
		3608	cf::sound::set $sound->[0] => $face;
		3609	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3610	}
		3611
		3612	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3613	my $face = cf::face::find "sound/$v";
		3614	cf::sound::set $k => $face;
		3615	}
		3616	}
		3617
3492	sub reload_resources {	3618	sub reload_resources {
3493	warn "reloading resource files...\n";	3619	trace "reloading resource files...\n";
3494		3620
		3621	reload_exp_table;
		3622	reload_materials;
3495	reload_facedata;	3623	reload_facedata;
		3624	reload_sound;
3496	reload_archetypes;	3625	reload_archetypes;
3497	reload_regions;	3626	reload_regions;
3498	reload_treasures;	3627	reload_treasures;
3499		3628
3500	warn "finished reloading resource files\n";	3629	trace "finished reloading resource files\n";
3501	}	3630	}
3502		3631
3503	sub reload_config {	3632	sub reload_config {
3504	warn "reloading config file...\n";	3633	trace "reloading config file...\n";
3505		3634
3506	open my $fh, "<:utf8", "$CONFDIR/config"	3635	my $config = load_file "$CONFDIR/config";
3507	or return;	3636	utf8::decode $config;
		3637	*CFG = decode_yaml $config;
3508		3638
3509	local $/;
3510	*CFG = YAML::XS::Load scalar <$fh>;
3511
3512	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3639	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3513		3640
3514	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3641	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3515	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3642	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3516		3643
3517	if (exists $CFG{mlockall}) {	3644	if (exists $CFG{mlockall}) {
…		…
3519	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3646	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3520	and die "WARNING: m(un)lockall failed: $!\n";	3647	and die "WARNING: m(un)lockall failed: $!\n";
3521	};	3648	};
3522	warn $@ if $@;	3649	warn $@ if $@;
3523	}	3650	}
3524
3525	warn "finished reloading resource files\n";
3526	}	3651	}
3527		3652
3528	sub pidfile() {	3653	sub pidfile() {
3529	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3654	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3530	or die "$PIDFILE: $!";	3655	or die "$PIDFILE: $!";
…		…
3543	seek $fh, 0, 0;	3668	seek $fh, 0, 0;
3544	print $fh $$;	3669	print $fh $$;
3545	}	3670	}
3546		3671
3547	sub main_loop {	3672	sub main_loop {
3548	warn "EV::loop starting\n";	3673	trace "EV::loop starting\n";
3549	if (1) {	3674	if (1) {
3550	EV::loop;	3675	EV::loop;
3551	}	3676	}
3552	warn "EV::loop returned\n";	3677	trace "EV::loop returned\n";
3553	goto &main_loop unless $REALLY_UNLOOP;	3678	goto &main_loop unless $REALLY_UNLOOP;
3554	}	3679	}
3555		3680
3556	sub main {	3681	sub main {
3557	cf::init_globals; # initialise logging	3682	cf::init_globals; # initialise logging
3558		3683
3559	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3684	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3560	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3685	LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3561	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3686	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3562	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3687	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3563		3688
3564	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3689	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3565		3690
…		…
3573	};	3698	};
3574		3699
3575	evthread_start IO::AIO::poll_fileno;	3700	evthread_start IO::AIO::poll_fileno;
3576		3701
3577	cf::sync_job {	3702	cf::sync_job {
3578	cf::init_experience;	3703	cf::incloader::init ();
		3704
3579	cf::init_anim;	3705	cf::init_anim;
3580	cf::init_attackmess;	3706	cf::init_attackmess;
3581	cf::init_dynamic;	3707	cf::init_dynamic;
3582		3708
3583	cf::load_settings;	3709	cf::load_settings;
3584	cf::load_materials;
3585		3710
3586	reload_resources;	3711	reload_resources;
3587	reload_config;	3712	reload_config;
3588	db_init;	3713	db_init;
3589		3714
…		…
3601		3726
3602	# no (long-running) fork's whatsoever before this point(!)	3727	# no (long-running) fork's whatsoever before this point(!)
3603	use POSIX ();	3728	use POSIX ();
3604	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3729	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3605		3730
3606	(pop @POST_INIT)->(0) while @POST_INIT;	3731	cf::_post_init 0;
3607	};	3732	};
3608		3733
3609	cf::object::thawer::errors_are_fatal 0;	3734	cf::object::thawer::errors_are_fatal 0;
3610	warn "parse errors in files are no longer fatal from this point on.\n";	3735	info "parse errors in files are no longer fatal from this point on.\n";
3611		3736
		3737	my $free_main; $free_main = EV::idle sub {
		3738	undef $free_main;
		3739	undef &main; # free gobs of memory :)
		3740	};
		3741
3612	main_loop;	3742	goto &main_loop;
3613	}	3743	}
3614		3744
3615	#############################################################################	3745	#############################################################################
3616	# initialisation and cleanup	3746	# initialisation and cleanup
3617		3747
…		…
3656	or return;	3786	or return;
3657		3787
3658	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3788	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3659	and return;	3789	and return;
3660		3790
3661	warn sprintf "runtime file written (%gs).\n", AE::time - $t0;	3791	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3662		3792
3663	1	3793	1
3664	}	3794	}
3665		3795
3666	our $uuid_lock;	3796	our $uuid_lock;
…		…
3678	or return;	3808	or return;
3679		3809
3680	my $value = uuid_seq uuid_cur;	3810	my $value = uuid_seq uuid_cur;
3681		3811
3682	unless ($value) {	3812	unless ($value) {
3683	warn "cowardly refusing to write zero uuid value!\n";	3813	info "cowardly refusing to write zero uuid value!\n";
3684	return;	3814	return;
3685	}	3815	}
3686		3816
3687	my $value = uuid_str $value + $uuid_skip;	3817	my $value = uuid_str $value + $uuid_skip;
3688	$uuid_skip = 0;	3818	$uuid_skip = 0;
…		…
3698	or return;	3828	or return;
3699		3829
3700	aio_rename "$uuid~", $uuid	3830	aio_rename "$uuid~", $uuid
3701	and return;	3831	and return;
3702		3832
3703	warn "uuid file written ($value).\n";	3833	trace "uuid file written ($value).\n";
3704		3834
3705	1	3835	1
3706		3836
3707	}	3837	}
3708		3838
…		…
3714	}	3844	}
3715		3845
3716	sub emergency_save() {	3846	sub emergency_save() {
3717	my $freeze_guard = cf::freeze_mainloop;	3847	my $freeze_guard = cf::freeze_mainloop;
3718		3848
3719	warn "emergency_perl_save: enter\n";	3849	info "emergency_perl_save: enter\n";
		3850
		3851	# this is a trade-off: we want to be very quick here, so
		3852	# save all maps without fsync, and later call a global sync
		3853	# (which in turn might be very very slow)
		3854	local $USE_FSYNC = 0;
3720		3855
3721	cf::sync_job {	3856	cf::sync_job {
3722	# this is a trade-off: we want to be very quick here, so	3857	cf::write_runtime_sync; # external watchdog should not bark
3723	# save all maps without fsync, and later call a global sync
3724	# (which in turn might be very very slow)
3725	local $USE_FSYNC = 0;
3726		3858
3727	# use a peculiar iteration method to avoid tripping on perl	3859	# use a peculiar iteration method to avoid tripping on perl
3728	# refcount bugs in for. also avoids problems with players	3860	# refcount bugs in for. also avoids problems with players
3729	# and maps saved/destroyed asynchronously.	3861	# and maps saved/destroyed asynchronously.
3730	warn "emergency_perl_save: begin player save\n";	3862	info "emergency_perl_save: begin player save\n";
3731	for my $login (keys %cf::PLAYER) {	3863	for my $login (keys %cf::PLAYER) {
3732	my $pl = $cf::PLAYER{$login} or next;	3864	my $pl = $cf::PLAYER{$login} or next;
3733	$pl->valid or next;	3865	$pl->valid or next;
3734	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3866	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3735	$pl->save;	3867	$pl->save;
3736	}	3868	}
3737	warn "emergency_perl_save: end player save\n";	3869	info "emergency_perl_save: end player save\n";
3738		3870
		3871	cf::write_runtime_sync; # external watchdog should not bark
		3872
3739	warn "emergency_perl_save: begin map save\n";	3873	info "emergency_perl_save: begin map save\n";
3740	for my $path (keys %cf::MAP) {	3874	for my $path (keys %cf::MAP) {
3741	my $map = $cf::MAP{$path} or next;	3875	my $map = $cf::MAP{$path} or next;
3742	$map->valid or next;	3876	$map->valid or next;
3743	$map->save;	3877	$map->save;
3744	}	3878	}
3745	warn "emergency_perl_save: end map save\n";	3879	info "emergency_perl_save: end map save\n";
3746		3880
		3881	cf::write_runtime_sync; # external watchdog should not bark
		3882
3747	warn "emergency_perl_save: begin database checkpoint\n";	3883	info "emergency_perl_save: begin database checkpoint\n";
3748	BDB::db_env_txn_checkpoint $DB_ENV;	3884	BDB::db_env_txn_checkpoint $DB_ENV;
3749	warn "emergency_perl_save: end database checkpoint\n";	3885	info "emergency_perl_save: end database checkpoint\n";
3750		3886
3751	warn "emergency_perl_save: begin write uuid\n";	3887	info "emergency_perl_save: begin write uuid\n";
3752	write_uuid_sync 1;	3888	write_uuid_sync 1;
3753	warn "emergency_perl_save: end write uuid\n";	3889	info "emergency_perl_save: end write uuid\n";
		3890
		3891	cf::write_runtime_sync; # external watchdog should not bark
		3892
		3893	trace "emergency_perl_save: syncing database to disk";
		3894	BDB::db_env_txn_checkpoint $DB_ENV;
		3895
		3896	info "emergency_perl_save: starting sync\n";
		3897	IO::AIO::aio_sync sub {
		3898	info "emergency_perl_save: finished sync\n";
		3899	};
		3900
		3901	cf::write_runtime_sync; # external watchdog should not bark
		3902
		3903	trace "emergency_perl_save: flushing outstanding aio requests";
		3904	while (IO::AIO::nreqs || BDB::nreqs) {
		3905	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
		3906	}
		3907
		3908	cf::write_runtime_sync; # external watchdog should not bark
3754	};	3909	};
3755		3910
3756	warn "emergency_perl_save: starting sync()\n";
3757	IO::AIO::aio_sync sub {
3758	warn "emergency_perl_save: finished sync()\n";
3759	};
3760
3761	warn "emergency_perl_save: leave\n";	3911	info "emergency_perl_save: leave\n";
3762	}	3912	}
3763		3913
3764	sub post_cleanup {	3914	sub post_cleanup {
3765	my ($make_core) = @_;	3915	my ($make_core) = @_;
3766		3916
		3917	IO::AIO::flush;
		3918
3767	warn Carp::longmess "post_cleanup backtrace"	3919	error Carp::longmess "post_cleanup backtrace"
3768	if $make_core;	3920	if $make_core;
3769		3921
3770	my $fh = pidfile;	3922	my $fh = pidfile;
3771	unlink $PIDFILE if <$fh> == $$;	3923	unlink $PIDFILE if <$fh> == $$;
3772	}	3924	}
…		…
3796	}	3948	}
3797	}	3949	}
3798		3950
3799	sub do_reload_perl() {	3951	sub do_reload_perl() {
3800	# can/must only be called in main	3952	# can/must only be called in main
3801	if (in_main) {	3953	unless (in_main) {
3802	warn "can only reload from main coroutine";	3954	error "can only reload from main coroutine";
3803	return;	3955	return;
3804	}	3956	}
3805		3957
3806	return if $RELOAD++;	3958	return if $RELOAD++;
3807		3959
3808	my $t1 = AE::time;	3960	my $t1 = AE::time;
3809		3961
3810	while ($RELOAD) {	3962	while ($RELOAD) {
3811	warn "reloading...";	3963	cf::get_slot 0.1, -1, "reload_perl";
		3964	info "perl_reload: reloading...";
3812		3965
3813	warn "entering sync_job";	3966	trace "perl_reload: entering sync_job";
3814		3967
3815	cf::sync_job {	3968	cf::sync_job {
3816	cf::write_runtime_sync; # external watchdog should not bark
3817	cf::emergency_save;	3969	#cf::emergency_save;
3818	cf::write_runtime_sync; # external watchdog should not bark
3819		3970
3820	warn "syncing database to disk";
3821	BDB::db_env_txn_checkpoint $DB_ENV;
3822
3823	# if anything goes wrong in here, we should simply crash as we already saved
3824
3825	warn "flushing outstanding aio requests";
3826	while (IO::AIO::nreqs || BDB::nreqs) {
3827	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3828	}
3829
3830	warn "cancelling all extension coros";	3971	trace "perl_reload: cancelling all extension coros";
3831	$_->cancel for values %EXT_CORO;	3972	$_->cancel for values %EXT_CORO;
3832	%EXT_CORO = ();	3973	%EXT_CORO = ();
3833		3974
3834	warn "removing commands";	3975	trace "perl_reload: removing commands";
3835	%COMMAND = ();	3976	%COMMAND = ();
3836		3977
3837	warn "removing ext/exti commands";	3978	trace "perl_reload: removing ext/exti commands";
3838	%EXTCMD = ();	3979	%EXTCMD = ();
3839	%EXTICMD = ();	3980	%EXTICMD = ();
3840		3981
3841	warn "unloading/nuking all extensions";	3982	trace "perl_reload: unloading/nuking all extensions";
3842	for my $pkg (@EXTS) {	3983	for my $pkg (@EXTS) {
3843	warn "... unloading $pkg";	3984	trace "... unloading $pkg";
3844		3985
3845	if (my $cb = $pkg->can ("unload")) {	3986	if (my $cb = $pkg->can ("unload")) {
3846	eval {	3987	eval {
3847	$cb->($pkg);	3988	$cb->($pkg);
3848	1	3989	1
3849	} or warn "$pkg unloaded, but with errors: $@";	3990	} or error "$pkg unloaded, but with errors: $@";
3850	}	3991	}
3851		3992
3852	warn "... clearing $pkg";	3993	trace "... clearing $pkg";
3853	clear_package $pkg;	3994	clear_package $pkg;
3854	}	3995	}
3855		3996
3856	warn "unloading all perl modules loaded from $LIBDIR";	3997	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3857	while (my ($k, $v) = each %INC) {	3998	while (my ($k, $v) = each %INC) {
3858	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3999	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3859		4000
3860	warn "... unloading $k";	4001	trace "... unloading $k";
3861	delete $INC{$k};	4002	delete $INC{$k};
3862		4003
3863	$k =~ s/\.pm$//;	4004	$k =~ s/\.pm$//;
3864	$k =~ s/\//::/g;	4005	$k =~ s/\//::/g;
3865		4006
…		…
3868	}	4009	}
3869		4010
3870	clear_package $k;	4011	clear_package $k;
3871	}	4012	}
3872		4013
3873	warn "getting rid of safe::, as good as possible";	4014	trace "perl_reload: getting rid of safe::, as good as possible";
3874	clear_package "safe::$_"	4015	clear_package "safe::$_"
3875	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4016	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3876		4017
3877	warn "unloading cf.pm \"a bit\"";	4018	trace "perl_reload: unloading cf.pm \"a bit\"";
3878	delete $INC{"cf.pm"};	4019	delete $INC{"cf.pm"};
3879	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4020	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3880		4021
3881	# don't, removes xs symbols, too,	4022	# don't, removes xs symbols, too,
3882	# and global variables created in xs	4023	# and global variables created in xs
3883	#clear_package __PACKAGE__;	4024	#clear_package __PACKAGE__;
3884		4025
3885	warn "unload completed, starting to reload now";	4026	info "perl_reload: unload completed, starting to reload now";
3886		4027
3887	warn "reloading cf.pm";	4028	trace "perl_reload: reloading cf.pm";
3888	require cf;	4029	require cf;
3889	cf::_connect_to_perl_1;	4030	cf::_connect_to_perl_1;
3890		4031
3891	warn "loading config and database again";	4032	trace "perl_reload: loading config and database again";
3892	cf::reload_config;	4033	cf::reload_config;
3893		4034
3894	warn "loading extensions";	4035	trace "perl_reload: loading extensions";
3895	cf::load_extensions;	4036	cf::load_extensions;
3896		4037
3897	if ($REATTACH_ON_RELOAD) {	4038	if ($REATTACH_ON_RELOAD) {
3898	warn "reattaching attachments to objects/players";	4039	trace "perl_reload: reattaching attachments to objects/players";
3899	_global_reattach; # objects, sockets	4040	_global_reattach; # objects, sockets
3900	warn "reattaching attachments to maps";	4041	trace "perl_reload: reattaching attachments to maps";
3901	reattach $_ for values %MAP;	4042	reattach $_ for values %MAP;
3902	warn "reattaching attachments to players";	4043	trace "perl_reload: reattaching attachments to players";
3903	reattach $_ for values %PLAYER;	4044	reattach $_ for values %PLAYER;
3904	}	4045	}
3905		4046
3906	warn "running post_init jobs";	4047	cf::_post_init 1;
3907	(pop @POST_INIT)->(1) while @POST_INIT;
3908		4048
3909	warn "leaving sync_job";	4049	trace "perl_reload: leaving sync_job";
3910		4050
3911	1	4051	1
3912	} or do {	4052	} or do {
3913	warn $@;	4053	error $@;
3914	cf::cleanup "error while reloading, exiting.";	4054	cf::cleanup "perl_reload: error, exiting.";
3915	};	4055	};
3916		4056
3917	warn "reloaded";
3918	--$RELOAD;	4057	--$RELOAD;
3919	}	4058	}
3920		4059
3921	$t1 = AE::time - $t1;	4060	$t1 = AE::time - $t1;
3922	warn "reload completed in ${t1}s\n";	4061	info "perl_reload: completed in ${t1}s\n";
3923	};	4062	};
3924		4063
3925	our $RELOAD_WATCHER; # used only during reload	4064	our $RELOAD_WATCHER; # used only during reload
3926		4065
3927	sub reload_perl() {	4066	sub reload_perl() {
…		…
3948	reload_perl;	4087	reload_perl;
3949	};	4088	};
3950	}	4089	}
3951	};	4090	};
3952		4091
3953	unshift @INC, $LIBDIR;	4092	#############################################################################
3954		4093
3955	my $bug_warning = 0;	4094	my $bug_warning = 0;
3956		4095
3957	our @WAIT_FOR_TICK;	4096	our @WAIT_FOR_TICK;
3958	our @WAIT_FOR_TICK_BEGIN;	4097	our @WAIT_FOR_TICK_BEGIN;
3959		4098
3960	sub wait_for_tick {	4099	sub wait_for_tick() {
3961	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4100	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3962		4101
3963	my $signal = new Coro::Signal;	4102	my $signal = new Coro::Signal;
3964	push @WAIT_FOR_TICK, $signal;	4103	push @WAIT_FOR_TICK, $signal;
3965	$signal->wait;	4104	$signal->wait;
3966	}	4105	}
3967		4106
3968	sub wait_for_tick_begin {	4107	sub wait_for_tick_begin() {
3969	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4108	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3970		4109
3971	my $signal = new Coro::Signal;	4110	my $signal = new Coro::Signal;
3972	push @WAIT_FOR_TICK_BEGIN, $signal;	4111	push @WAIT_FOR_TICK_BEGIN, $signal;
3973	$signal->wait;	4112	$signal->wait;
…		…
3987	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4126	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3988	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4127	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3989	Coro::async_pool {	4128	Coro::async_pool {
3990	$Coro::current->{desc} = "runtime saver";	4129	$Coro::current->{desc} = "runtime saver";
3991	write_runtime_sync	4130	write_runtime_sync
3992	or warn "ERROR: unable to write runtime file: $!";	4131	or error "ERROR: unable to write runtime file: $!";
3993	};	4132	};
3994	}	4133	}
3995		4134
3996	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4135	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3997	$sig->send;	4136	$sig->send;
…		…
4005		4144
4006	if (0) {	4145	if (0) {
4007	if ($NEXT_TICK) {	4146	if ($NEXT_TICK) {
4008	my $jitter = $TICK_START - $NEXT_TICK;	4147	my $jitter = $TICK_START - $NEXT_TICK;
4009	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4148	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
4010	warn "jitter $JITTER\n";#d#	4149	debug "jitter $JITTER\n";#d#
4011	}	4150	}
4012	}	4151	}
4013	}	4152	}
4014		4153
4015	{	4154	{
…		…
4060	IO::AIO::min_parallel 8;	4199	IO::AIO::min_parallel 8;
4061	IO::AIO::max_poll_time $TICK * 0.1;	4200	IO::AIO::max_poll_time $TICK * 0.1;
4062	undef $AnyEvent::AIO::WATCHER;	4201	undef $AnyEvent::AIO::WATCHER;
4063	}	4202	}
4064		4203
4065	my $_log_backtrace;	4204	our $_log_backtrace;
		4205	our $_log_backtrace_last;
4066		4206
4067	sub _log_backtrace {	4207	sub _log_backtrace {
4068	my ($msg, @addr) = @_;	4208	my ($msg, @addr) = @_;
4069		4209
4070	$msg =~ s/\n//;	4210	$msg =~ s/\n$//;
4071		4211
		4212	if ($_log_backtrace_last eq $msg) {
		4213	LOG llevInfo, "[ABT] $msg\n";
		4214	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4072	# limit the # of concurrent backtraces	4215	# limit the # of concurrent backtraces
4073	if ($_log_backtrace < 2) {	4216	} elsif ($_log_backtrace < 2) {
		4217	$_log_backtrace_last = $msg;
4074	++$_log_backtrace;	4218	++$_log_backtrace;
4075	my $perl_bt = Carp::longmess $msg;	4219	my $perl_bt = Carp::longmess $msg;
4076	async {	4220	async {
4077	$Coro::current->{desc} = "abt $msg";	4221	$Coro::current->{desc} = "abt $msg";
4078		4222
…		…
4098	LOG llevInfo, "[ABT] $_\n" for @bt;	4242	LOG llevInfo, "[ABT] $_\n" for @bt;
4099	--$_log_backtrace;	4243	--$_log_backtrace;
4100	};	4244	};
4101	} else {	4245	} else {
4102	LOG llevInfo, "[ABT] $msg\n";	4246	LOG llevInfo, "[ABT] $msg\n";
4103	LOG llevInfo, "[ABT] [suppressed]\n";	4247	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4104	}	4248	}
4105	}	4249	}
4106		4250
4107	# load additional modules	4251	# load additional modules
4108	require "cf/$_.pm" for @EXTRA_MODULES;	4252	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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