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.113 by root, Mon Jan 1 15:32:40 2007 UTC vs.
Revision 1.165 by root, Fri Jan 12 22:09:22 2007 UTC

…		…
8	use Storable;	8	use Storable;
9	use Opcode;	9	use Opcode;
10	use Safe;	10	use Safe;
11	use Safe::Hole;	11	use Safe::Hole;
12		12
13	use Coro 3.3;	13	use Coro 3.3 ();
14	use Coro::Event;	14	use Coro::Event;
15	use Coro::Timer;	15	use Coro::Timer;
16	use Coro::Signal;	16	use Coro::Signal;
17	use Coro::Semaphore;	17	use Coro::Semaphore;
18	use Coro::AIO;	18	use Coro::AIO;
19		19
		20	use Data::Dumper;
20	use Digest::MD5;	21	use Digest::MD5;
21	use Fcntl;	22	use Fcntl;
22	use IO::AIO 2.31 ();	23	use IO::AIO 2.32 ();
23	use YAML::Syck ();	24	use YAML::Syck ();
24	use Time::HiRes;	25	use Time::HiRes;
25		26
26	use Event; $Event::Eval = 1; # no idea why this is required, but it is	27	use Event; $Event::Eval = 1; # no idea why this is required, but it is
27		28
		29	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
		30
28	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?	31	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29	$YAML::Syck::ImplicitUnicode = 1;	32	$YAML::Syck::ImplicitUnicode = 1;
30		33
31	$Coro::main->prio (2); # run main coroutine ("the server") with very high priority	34	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32
33	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34		35
35	our %COMMAND = ();	36	our %COMMAND = ();
36	our %COMMAND_TIME = ();	37	our %COMMAND_TIME = ();
		38
		39	our @EXTS = (); # list of extension package names
37	our %EXTCMD = ();	40	our %EXTCMD = ();
		41	our %EXT_CORO = (); # coroutines bound to extensions
		42	our %EXT_MAP = (); # pluggable maps
38		43
39	our @EVENT;	44	our @EVENT;
40	our $LIBDIR = datadir . "/ext";	45	our $LIBDIR = datadir . "/ext";
41		46
42	our $TICK = MAX_TIME * 1e-6;	47	our $TICK = MAX_TIME * 1e-6;
…		…
47	our %CFG;	52	our %CFG;
48		53
49	our $UPTIME; $UPTIME ||= time;	54	our $UPTIME; $UPTIME ||= time;
50	our $RUNTIME;	55	our $RUNTIME;
51		56
		57	our %PLAYER; # all users
52	our %MAP; # all maps	58	our %MAP; # all maps
53	our $LINK_MAP; # the special {link} map	59	our $LINK_MAP; # the special {link} map
54	our $FREEZE;
55	our $RANDOM_MAPS = cf::localdir . "/random";	60	our $RANDOM_MAPS = cf::localdir . "/random";
56	our %EXT_CORO;	61
		62	our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
		63	our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
57		64
58	binmode STDOUT;	65	binmode STDOUT;
59	binmode STDERR;	66	binmode STDERR;
60		67
61	# read virtual server time, if available	68	# read virtual server time, if available
…		…
71	mkdir cf::localdir . "/" . cf::uniquedir;	78	mkdir cf::localdir . "/" . cf::uniquedir;
72	mkdir $RANDOM_MAPS;	79	mkdir $RANDOM_MAPS;
73		80
74	# a special map that is always available	81	# a special map that is always available
75	our $LINK_MAP;	82	our $LINK_MAP;
76		83	our $EMERGENCY_POSITION;
77	our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78		84
79	#############################################################################	85	#############################################################################
80		86
81	=head2 GLOBAL VARIABLES	87	=head2 GLOBAL VARIABLES
82		88
…		…
106		112
107	=item %cf::CFG	113	=item %cf::CFG
108		114
109	Configuration for the server, loaded from C</etc/crossfire/config>, or	115	Configuration for the server, loaded from C</etc/crossfire/config>, or
110	from wherever your confdir points to.	116	from wherever your confdir points to.
		117
		118	=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
		119
		120	These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
		121	or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
		122	processing has been done. Call C<< ->wait >> on them to maximise the
		123	window of cpu time available, or simply to synchronise to the server tick.
111		124
112	=back	125	=back
113		126
114	=cut	127	=cut
115		128
…		…
119	utf8::encode $msg;	132	utf8::encode $msg;
120		133
121	$msg .= "\n"	134	$msg .= "\n"
122	unless $msg =~ /\n$/;	135	unless $msg =~ /\n$/;
123		136
124	LOG llevError, "cfperl: $msg";	137	LOG llevError, $msg;
125	};	138	};
126	}	139	}
127		140
128	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	141	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
129	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	142	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
…		…
147		160
148	$Event::DIED = sub {	161	$Event::DIED = sub {
149	warn "error in event callback: @_";	162	warn "error in event callback: @_";
150	};	163	};
151		164
152	my %ext_pkg;
153	my @exts;
154	my @hook;
155
156	=head2 UTILITY FUNCTIONS	165	=head2 UTILITY FUNCTIONS
157		166
158	=over 4	167	=over 4
159		168
		169	=item dumpval $ref
		170
160	=cut	171	=cut
		172
		173	sub dumpval {
		174	eval {
		175	local $SIG{__DIE__};
		176	my $d;
		177	if (1) {
		178	$d = new Data::Dumper([$_[0]], ["*var"]);
		179	$d->Terse(1);
		180	$d->Indent(2);
		181	$d->Quotekeys(0);
		182	$d->Useqq(1);
		183	#$d->Bless(...);
		184	$d->Seen($_[1]) if @_ > 1;
		185	$d = $d->Dump();
		186	}
		187	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
		188	$d
		189	} || "[unable to dump $_[0]: '$@']";
		190	}
161		191
162	use JSON::Syck (); # TODO# replace by JSON::PC once working	192	use JSON::Syck (); # TODO# replace by JSON::PC once working
163		193
164	=item $ref = cf::from_json $json	194	=item $ref = cf::from_json $json
165		195
…		…
180		210
181	sub to_json($) {	211	sub to_json($) {
182	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs	212	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183	JSON::Syck::Dump $_[0]	213	JSON::Syck::Dump $_[0]
184	}	214	}
		215
		216	=item cf::lock_wait $string
		217
		218	Wait until the given lock is available. See cf::lock_acquire.
		219
		220	=item my $lock = cf::lock_acquire $string
		221
		222	Wait until the given lock is available and then acquires it and returns
		223	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
		224	for example when the coroutine gets canceled), the lock is automatically
		225	returned.
		226
		227	Lock names should begin with a unique identifier (for example, cf::map::find
		228	uses map_find and cf::map::load uses map_load).
		229
		230	=cut
		231
		232	our %LOCK;
		233
		234	sub lock_wait($) {
		235	my ($key) = @_;
		236
		237	# wait for lock, if any
		238	while ($LOCK{$key}) {
		239	push @{ $LOCK{$key} }, $Coro::current;
		240	Coro::schedule;
		241	}
		242	}
		243
		244	sub lock_acquire($) {
		245	my ($key) = @_;
		246
		247	# wait, to be sure we are not locked
		248	lock_wait $key;
		249
		250	$LOCK{$key} = [];
		251
		252	Coro::guard {
		253	# wake up all waiters, to be on the safe side
		254	$_->ready for @{ delete $LOCK{$key} };
		255	}
		256	}
		257
		258	sub freeze_mainloop {
		259	return unless $TICK_WATCHER->is_active;
		260
		261	my $guard = Coro::guard { $TICK_WATCHER->start };
		262	$TICK_WATCHER->stop;
		263	$guard
		264	}
		265
		266	=item cf::async { BLOCK }
		267
		268	Currently the same as Coro::async_pool, meaning you cannot use
		269	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
		270	thing you are allowed to do is call C<prio> on it.
		271
		272	=cut
		273
		274	BEGIN { *async = \&Coro::async_pool }
185		275
186	=item cf::sync_job { BLOCK }	276	=item cf::sync_job { BLOCK }
187		277
188	The design of crossfire+ requires that the main coro ($Coro::main) is	278	The design of crossfire+ requires that the main coro ($Coro::main) is
189	always able to handle events or runnable, as crossfire+ is only partly	279	always able to handle events or runnable, as crossfire+ is only partly
…		…
203	# this is the main coro, too bad, we have to block	293	# this is the main coro, too bad, we have to block
204	# till the operation succeeds, freezing the server :/	294	# till the operation succeeds, freezing the server :/
205		295
206	# TODO: use suspend/resume instead	296	# TODO: use suspend/resume instead
207	# (but this is cancel-safe)	297	# (but this is cancel-safe)
208	local $FREEZE = 1;	298	my $freeze_guard = freeze_mainloop;
209		299
210	my $busy = 1;	300	my $busy = 1;
211	my @res;	301	my @res;
212		302
213	(Coro::async {	303	(async {
214	@res = eval { $job->() };	304	@res = eval { $job->() };
215	warn $@ if $@;	305	warn $@ if $@;
216	undef $busy;	306	undef $busy;
217	})->prio (Coro::PRIO_MAX);	307	})->prio (Coro::PRIO_MAX);
218		308
219	while ($busy) {	309	while ($busy) {
220	Coro::cede_notself;	310	Coro::cede or Event::one_event;
221	Event::one_event unless Coro::nready;
222	}	311	}
223		312
224	wantarray ? @res : $res[0]	313	wantarray ? @res : $res[0]
225	} else {	314	} else {
226	# we are in another coroutine, how wonderful, everything just works	315	# we are in another coroutine, how wonderful, everything just works
227		316
228	$job->()	317	$job->()
229	}	318	}
230	}	319	}
231		320
232	=item $coro = cf::coro { BLOCK }	321	=item $coro = cf::async_ext { BLOCK }
233		322
234	Creates and returns a new coro. This coro is automcatially being canceled	323	Like async, but this coro is automatically being canceled when the
235	when the extension calling this is being unloaded.	324	extension calling this is being unloaded.
236		325
237	=cut	326	=cut
238		327
239	sub coro(&) {	328	sub async_ext(&) {
240	my $cb = shift;	329	my $cb = shift;
241		330
242	my $coro; $coro = async {	331	my $coro = &Coro::async ($cb);
243	eval {
244	$cb->();
245	};
246	warn $@ if $@;
247	};
248		332
249	$coro->on_destroy (sub {	333	$coro->on_destroy (sub {
250	delete $EXT_CORO{$coro+0};	334	delete $EXT_CORO{$coro+0};
251	});	335	});
252	$EXT_CORO{$coro+0} = $coro;	336	$EXT_CORO{$coro+0} = $coro;
…		…
282		366
283	#############################################################################	367	#############################################################################
284		368
285	package cf::path;	369	package cf::path;
286		370
		371	use overload
		372	'""' => \&as_string;
		373
		374	# used to convert map paths into valid unix filenames by repalcing / by ∕
		375	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
		376
		377	sub register {
		378	my ($pkg, $prefix) = @_;
		379
		380	$EXT_MAP{$prefix} = $pkg;
		381	}
		382
287	sub new {	383	sub new {
288	my ($class, $path, $base) = @_;	384	my ($class, $path, $base) = @_;
289		385
290	$path = $path->as_string if ref $path;	386	return $path if ref $path;
291		387
292	my $self = bless { }, $class;	388	my $self = {};
293		389
294	if ($path =~ s{^\?random/}{}) {	390	# {... are special paths that are not being touched
295	Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;	391	# ?xxx/... are special absolute paths
296	$self->{random} = cf::from_json $data;	392	# ?random/... random maps
		393	# /! non-realised random map exit
		394	# /... normal maps
		395	# ~/... per-player maps without a specific player (DO NOT USE)
		396	# ~user/... per-player map of a specific user
		397
		398	$path =~ s/$PATH_SEP/\//go;
		399
		400	if ($path =~ /^{/) {
		401	# fine as it is
297	} else {	402	} else {
298	if ($path =~ s{^~([^/]+)?}{}) {	403	if ($path =~ s{^~([^/]+)?}{}) {
		404	# ~user
299	$self->{user_rel} = 1;	405	$self->{user_rel} = 1;
300		406
301	if (defined $1) {	407	if (defined $1) {
302	$self->{user} = $1;	408	$self->{user} = $1;
303	} elsif ($base =~ m{^~([^/]+)/}) {	409	} elsif ($base =~ m{^~([^/]+)/}) {
304	$self->{user} = $1;	410	$self->{user} = $1;
305	} else {	411	} else {
306	warn "cannot resolve user-relative path without user <$path,$base>\n";	412	warn "cannot resolve user-relative path without user <$path,$base>\n";
307	}	413	}
		414	} elsif ($path =~ s{^\?([^/]+)/}{}) {
		415	# ?...
		416	$self->{ext} = $1;
		417	if (my $ext = $EXT_MAP{$1}) {
		418	bless $self, $ext;
		419	}
308	} elsif ($path =~ /^\//) {	420	} elsif ($path =~ /^\//) {
		421	# /...
309	# already absolute	422	# already absolute
310	} else {	423	} else {
		424	# relative
311	$base =~ s{[^/]+/?$}{};	425	$base =~ s{[^/]+/?$}{};
312	return $class->new ("$base/$path");	426	return $class->new ("$base/$path");
313	}	427	}
314		428
315	for ($path) {	429	for ($path) {
…		…
318	}	432	}
319	}	433	}
320		434
321	$self->{path} = $path;	435	$self->{path} = $path;
322		436
		437	if ("HASH" eq ref $self) {
		438	bless $self, $class;
		439	} else {
		440	$self->init;
		441	}
		442
		443	for my $ext (values %EXT_MAP) {
		444	if (my $subst = $ext->substitute ($self)) {
		445	return $subst;
		446	}
		447	}
		448
323	$self	449	$self
		450	}
		451
		452	sub init {
		453	# nop
		454	}
		455
		456	sub substitute {
		457	()
324	}	458	}
325		459
326	# the name / primary key / in-game path	460	# the name / primary key / in-game path
327	sub as_string {	461	sub as_string {
328	my ($self) = @_;	462	my ($self) = @_;
329		463
330	$self->{user_rel} ? "~$self->{user}$self->{path}"	464	$self->{user_rel} ? "~$self->{user}$self->{path}"
331	: $self->{random} ? "?random/$self->{path}"	465	: $self->{ext} ? "?$self->{ext}/$self->{path}"
332	: $self->{path}	466	: $self->{path}
333	}	467	}
334		468
335	# the displayed name, this is a one way mapping	469	# the displayed name, this is a one way mapping
336	sub visible_name {	470	sub visible_name {
337	my ($self) = @_;	471	&as_string
338
339	# if (my $rmp = $self->{random}) {
340	# # todo: be more intelligent about this
341	# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
342	# } else {
343	$self->as_string
344	# }
345	}	472	}
346		473
347	# escape the /'s in the path	474	# escape the /'s in the path
348	sub _escaped_path {	475	sub _escaped_path {
349	# ∕ is U+2215
350	(my $path = $_[0]{path}) =~ s/\//∕/g;	476	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
		477
351	$path	478	$path
352	}	479	}
353		480
354	# the original (read-only) location	481	# the original (read-only) location
355	sub load_path {	482	sub load_path {
…		…
360		487
361	# the temporary/swap location	488	# the temporary/swap location
362	sub save_path {	489	sub save_path {
363	my ($self) = @_;	490	my ($self) = @_;
364		491
		492	$self->{user_rel}
365	$self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path	493	? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
366	: $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
367	: sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path	494	: sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
368	}	495	}
369		496
370	# the unique path, might be eq to save_path	497	# the unique path, undef == no special unique path
371	sub uniq_path {	498	sub uniq_path {
372	my ($self) = @_;	499	my ($self) = @_;
373		500
374	$self->{user_rel} || $self->{random}	501	$self->{user_rel} || $self->{ext}
375	? undef	502	? undef
376	: sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path	503	: sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
377	}	504	}
378		505
379	# return random map parameters, or undef	506	sub customise_for {
380	sub random_map_params {
381	my ($self) = @_;	507	my ($self, $map, $ob) = @_;
382		508
383	$self->{random}	509	if ($map->per_player) {
		510	return cf::map::find ("~" . $ob->name . "/" . $map->{path}{path});
		511	}
		512
		513	$map
384	}	514	}
385		515
386	# this is somewhat ugly, but style maps do need special treatment	516	# this is somewhat ugly, but style maps do need special treatment
387	sub is_style_map {	517	sub is_style_map {
388	$_[0]{path} =~ m{^/styles/}	518	$_[0]{path} =~ m{^/styles/}
		519	}
		520
		521	sub load_orig {
		522	my ($self) = @_;
		523
		524	&cf::map::load_map_header ($self->load_path)
		525	}
		526
		527	sub load_temp {
		528	my ($self) = @_;
		529
		530	&cf::map::load_map_header ($self->save_path)
		531	}
		532
		533	sub unlink_save {
		534	my ($self) = @_;
		535
		536	utf8::encode (my $save = $self->save_path);
		537	IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
		538	IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
389	}	539	}
390		540
391	package cf;	541	package cf;
392		542
393	#############################################################################	543	#############################################################################
…		…
807	(aio_load "$filename.pst", $av) >= 0	957	(aio_load "$filename.pst", $av) >= 0
808	or return;	958	or return;
809	$av = eval { (Storable::thaw $av)->{objs} };	959	$av = eval { (Storable::thaw $av)->{objs} };
810	}	960	}
811		961
		962	warn sprintf "loading %s (%d)\n",
		963	$filename, length $data, scalar @{$av || []};#d#
812	return ($data, $av);	964	return ($data, $av);
813	}	965	}
814		966
815	#############################################################################	967	#############################################################################
816	# command handling &c	968	# command handling &c
…		…
841	=cut	993	=cut
842		994
843	sub register_extcmd {	995	sub register_extcmd {
844	my ($name, $cb) = @_;	996	my ($name, $cb) = @_;
845		997
846	my $caller = caller;
847	#warn "registering extcmd '$name' to '$caller'";
848
849	$EXTCMD{$name} = [$cb, $caller];	998	$EXTCMD{$name} = $cb;
850	}	999	}
851		1000
852	cf::player->attach (	1001	cf::player->attach (
853	on_command => sub {	1002	on_command => sub {
854	my ($pl, $name, $params) = @_;	1003	my ($pl, $name, $params) = @_;
…		…
867		1016
868	my $msg = eval { from_json $buf };	1017	my $msg = eval { from_json $buf };
869		1018
870	if (ref $msg) {	1019	if (ref $msg) {
871	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	1020	if (my $cb = $EXTCMD{$msg->{msgtype}}) {
872	if (my %reply = $cb->[0]->($pl, $msg)) {	1021	if (my %reply = $cb->($pl, $msg)) {
873	$pl->ext_reply ($msg->{msgid}, %reply);	1022	$pl->ext_reply ($msg->{msgid}, %reply);
874	}	1023	}
875	}	1024	}
876	} else {	1025	} else {
877	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1026	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
…		…
879		1028
880	cf::override;	1029	cf::override;
881	},	1030	},
882	);	1031	);
883		1032
884	sub register {
885	my ($base, $pkg) = @_;
886
887	#TODO
888	}
889
890	sub load_extension {	1033	sub load_extension {
891	my ($path) = @_;	1034	my ($path) = @_;
892		1035
893	$path =~ /([^\/\\]+)\.ext$/ or die "$path";	1036	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
894	my $base = $1;	1037	my $base = $1;
895	my $pkg = $1;	1038	my $pkg = $1;
896	$pkg =~ s/[^[:word:]]/_/g;	1039	$pkg =~ s/[^[:word:]]/_/g;
897	$pkg = "ext::$pkg";	1040	$pkg = "ext::$pkg";
898		1041
899	warn "loading '$path' into '$pkg'\n";	1042	warn "... loading '$path' into '$pkg'\n";
900		1043
901	open my $fh, "<:utf8", $path	1044	open my $fh, "<:utf8", $path
902	or die "$path: $!";	1045	or die "$path: $!";
903		1046
904	my $source =	1047	my $source =
…		…
909		1052
910	eval $source	1053	eval $source
911	or die $@ ? "$path: $@\n"	1054	or die $@ ? "$path: $@\n"
912	: "extension disabled.\n";	1055	: "extension disabled.\n";
913		1056
914	push @exts, $pkg;	1057	push @EXTS, $pkg;
915	$ext_pkg{$base} = $pkg;
916
917	# no strict 'refs';
918	# @{"$pkg\::ISA"} = ext::;
919
920	register $base, $pkg;
921	}
922
923	sub unload_extension {
924	my ($pkg) = @_;
925
926	warn "removing extension $pkg\n";
927
928	# remove hooks
929	#TODO
930	# for my $idx (0 .. $#PLUGIN_EVENT) {
931	# delete $hook[$idx]{$pkg};
932	# }
933
934	# remove commands
935	for my $name (keys %COMMAND) {
936	my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
937
938	if (@cb) {
939	$COMMAND{$name} = \@cb;
940	} else {
941	delete $COMMAND{$name};
942	}
943	}
944
945	# remove extcmds
946	for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
947	delete $EXTCMD{$name};
948	}
949
950	if (my $cb = $pkg->can ("unload")) {
951	eval {
952	$cb->($pkg);
953	1
954	} or warn "$pkg unloaded, but with errors: $@";
955	}
956
957	Symbol::delete_package $pkg;
958	}	1058	}
959		1059
960	sub load_extensions {	1060	sub load_extensions {
961	for my $ext (<$LIBDIR/*.ext>) {	1061	for my $ext (<$LIBDIR/*.ext>) {
962	next unless -r $ext;	1062	next unless -r $ext;
…		…
980	};	1080	};
981		1081
982	cf::map->attach (prio => -10000, package => cf::mapsupport::);	1082	cf::map->attach (prio => -10000, package => cf::mapsupport::);
983		1083
984	#############################################################################	1084	#############################################################################
985	# load/save perl data associated with player->ob objects
986
987	sub all_objects(@) {
988	@_, map all_objects ($_->inv), @_
989	}
990
991	# TODO: compatibility cruft, remove when no longer needed
992	cf::player->attach (
993	on_load => sub {
994	my ($pl, $path) = @_;
995
996	for my $o (all_objects $pl->ob) {
997	if (my $value = $o->get_ob_key_value ("_perl_data")) {
998	$o->set_ob_key_value ("_perl_data");
999
1000	%$o = %{ Storable::thaw pack "H*", $value };
1001	}
1002	}
1003	},
1004	);
1005
1006	#############################################################################
1007		1085
1008	=head2 CORE EXTENSIONS	1086	=head2 CORE EXTENSIONS
1009		1087
1010	Functions and methods that extend core crossfire objects.	1088	Functions and methods that extend core crossfire objects.
1011		1089
		1090	=cut
		1091
		1092	package cf::player;
		1093
		1094	use Coro::AIO;
		1095
1012	=head3 cf::player	1096	=head3 cf::player
1013		1097
1014	=over 4	1098	=over 4
1015		1099
1016	=item cf::player::exists $login	1100	=item cf::player::find $login
1017		1101
1018	Returns true when the given account exists.	1102	Returns the given player object, loading it if necessary (might block).
1019		1103
1020	=cut	1104	=cut
1021		1105
1022	sub cf::player::exists($) {	1106	sub playerdir($) {
1023	cf::player::find $_[0]	1107	cf::localdir
1024	or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2;	1108	. "/"
		1109	. cf::playerdir
		1110	. "/"
		1111	. (ref $_[0] ? $_[0]->ob->name : $_[0])
		1112	}
		1113
		1114	sub path($) {
		1115	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
		1116
		1117	(playerdir $login) . "/$login.pl"
		1118	}
		1119
		1120	sub find_active($) {
		1121	$cf::PLAYER{$_[0]}
		1122	and $cf::PLAYER{$_[0]}->active
		1123	and $cf::PLAYER{$_[0]}
		1124	}
		1125
		1126	sub exists($) {
		1127	my ($login) = @_;
		1128
		1129	$cf::PLAYER{$login}
		1130	or cf::sync_job { !aio_stat $login }
		1131	}
		1132
		1133	sub find($) {
		1134	return $cf::PLAYER{$_[0]} || do {
		1135	my $login = $_[0];
		1136
		1137	my $guard = cf::lock_acquire "user_find:$login";
		1138
		1139	$cf::PLAYER{$_[0]} || do {
		1140	my $pl = load_pl path $login
		1141	or return;
		1142	$cf::PLAYER{$login} = $pl
		1143	}
		1144	}
		1145	}
		1146
		1147	sub save($) {
		1148	my ($pl) = @_;
		1149
		1150	return if $pl->{deny_save};
		1151
		1152	my $path = path $pl;
		1153	my $guard = cf::lock_acquire "user_save:$path";
		1154
		1155	return if $pl->{deny_save};
		1156
		1157	aio_mkdir playerdir $pl, 0770;
		1158	$pl->{last_save} = $cf::RUNTIME;
		1159
		1160	$pl->save_pl ($path);
		1161	Coro::cede;
		1162	}
		1163
		1164	sub new($) {
		1165	my ($login) = @_;
		1166
		1167	my $self = create;
		1168
		1169	$self->ob->name ($login);
		1170	$self->{deny_save} = 1;
		1171
		1172	$cf::PLAYER{$login} = $self;
		1173
		1174	$self
		1175	}
		1176
		1177	=item $pl->quit_character
		1178
		1179	Nukes the player without looking back. If logged in, the connection will
		1180	be destroyed. May block for a long time.
		1181
		1182	=cut
		1183
		1184	sub quit_character {
		1185	my ($pl) = @_;
		1186
		1187	$pl->{deny_save} = 1;
		1188	$pl->password ("*"); # this should lock out the player until we nuked the dir
		1189
		1190	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
		1191	$pl->deactivate;
		1192	$pl->invoke (cf::EVENT_PLAYER_QUIT);
		1193	$pl->ns->destroy if $pl->ns;
		1194
		1195	my $path = playerdir $pl;
		1196	my $temp = "$path~$cf::RUNTIME~deleting~";
		1197	aio_rename $path, $temp;
		1198	delete $cf::PLAYER{$pl->ob->name};
		1199	$pl->destroy;
		1200	IO::AIO::aio_rmtree $temp;
		1201	}
		1202
		1203	=item cf::player::list_logins
		1204
		1205	Returns am arrayref of all valid playernames in the system, can take a
		1206	while and may block, so not sync_job-capable, ever.
		1207
		1208	=cut
		1209
		1210	sub list_logins {
		1211	my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
		1212	or return [];
		1213
		1214	my @logins;
		1215
		1216	for my $login (@$dirs) {
		1217	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
		1218	aio_read $fh, 0, 512, my $buf, 0 or next;
		1219	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1220
		1221	utf8::decode $login;
		1222	push @logins, $login;
		1223	}
		1224
		1225	\@logins
		1226	}
		1227
		1228	=item $player->maps
		1229
		1230	Returns an arrayref of cf::path's of all maps that are private for this
		1231	player. May block.
		1232
		1233	=cut
		1234
		1235	sub maps($) {
		1236	my ($pl) = @_;
		1237
		1238	my $files = aio_readdir playerdir $pl
		1239	or return;
		1240
		1241	my @paths;
		1242
		1243	for (@$files) {
		1244	utf8::decode $_;
		1245	next if /\.(?:pl|pst)$/;
		1246	next unless /^$PATH_SEP/o;
		1247
		1248	push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
		1249	}
		1250
		1251	\@paths
1025	}	1252	}
1026		1253
1027	=item $player->ext_reply ($msgid, $msgtype, %msg)	1254	=item $player->ext_reply ($msgid, $msgtype, %msg)
1028		1255
1029	Sends an ext reply to the player.	1256	Sends an ext reply to the player.
1030		1257
1031	=cut	1258	=cut
1032		1259
1033	sub cf::player::ext_reply($$$%) {	1260	sub ext_reply($$$%) {
1034	my ($self, $id, %msg) = @_;	1261	my ($self, $id, %msg) = @_;
1035		1262
1036	$msg{msgid} = $id;	1263	$msg{msgid} = $id;
1037		1264
1038	$self->send ("ext " . to_json \%msg);	1265	$self->send ("ext " . cf::to_json \%msg);
1039	}	1266	}
		1267
		1268	package cf;
1040		1269
1041	=back	1270	=back
1042		1271
1043		1272
1044	=head3 cf::map	1273	=head3 cf::map
…		…
1050	package cf::map;	1279	package cf::map;
1051		1280
1052	use Fcntl;	1281	use Fcntl;
1053	use Coro::AIO;	1282	use Coro::AIO;
1054		1283
1055	our $MAX_RESET = 7200;	1284	our $MAX_RESET = 3600;
1056	our $DEFAULT_RESET = 3600;	1285	our $DEFAULT_RESET = 3000;
1057		1286
1058	sub generate_random_map {	1287	sub generate_random_map {
1059	my ($path, $rmp) = @_;	1288	my ($path, $rmp) = @_;
1060		1289
1061	# mit "rum" bekleckern, nicht	1290	# mit "rum" bekleckern, nicht
1062	cf::map::_create_random_map	1291	cf::map::_create_random_map (
1063	$path,	1292	$path,
1064	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1293	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1065	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1294	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1066	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1295	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1067	$rmp->{exit_on_final_map},	1296	$rmp->{exit_on_final_map},
…		…
1069	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1298	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1070	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1299	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1071	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},	1300	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1072	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},	1301	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1073	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},	1302	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1074	(cf::region::find $rmp->{region})	1303	(cf::region::find $rmp->{region}), $rmp->{custom}
		1304	)
1075	}	1305	}
1076		1306
1077	# and all this just because we cannot iterate over	1307	# and all this just because we cannot iterate over
1078	# all maps in C++...	1308	# all maps in C++...
1079	sub change_all_map_light {	1309	sub change_all_map_light {
1080	my ($change) = @_;	1310	my ($change) = @_;
1081		1311
1082	$_->change_map_light ($change) for values %cf::MAP;	1312	$_->change_map_light ($change)
		1313	for grep $_->outdoor, values %cf::MAP;
1083	}	1314	}
1084		1315
1085	sub try_load_header($) {	1316	sub load_map_header($) {
1086	my ($path) = @_;	1317	my ($path) = @_;
1087		1318
1088	utf8::encode $path;	1319	utf8::encode $path;
1089	aio_open $path, O_RDONLY, 0	1320	aio_open $path, O_RDONLY, 0
1090	or return;	1321	or return;
1091		1322
1092	my $map = cf::map::new	1323	my $map = cf::map::new
1093	or return;	1324	or return;
1094		1325
		1326	# for better error messages only, will be overwritten later
		1327	$map->path ($path);
		1328
1095	$map->load_header ($path)	1329	$map->load_header ($path)
1096	or return;	1330	or return;
1097		1331
1098	$map->{load_path} = $path;	1332	$map->{load_path} = $path;
1099		1333
1100	$map	1334	$map
1101	}	1335	}
1102		1336
		1337	sub find;
1103	sub find_map {	1338	sub find {
1104	my ($path, $origin) = @_;	1339	my ($path, $origin) = @_;
1105		1340
1106	#warn "find_map<$path,$origin>\n";#d#	1341	#warn "find<$path,$origin>\n";#d#
1107		1342
1108	$path = new cf::path $path, $origin && $origin->path;	1343	$path = new cf::path $path, $origin && $origin->path;
1109	my $key = $path->as_string;	1344	my $key = $path->as_string;
1110		1345
		1346	cf::lock_wait "map_find:$key";
		1347
1111	$cf::MAP{$key} || do {	1348	$cf::MAP{$key} || do {
		1349	my $guard = cf::lock_acquire "map_find:$key";
		1350
1112	# do it the slow way	1351	# do it the slow way
1113	my $map = try_load_header $path->save_path;	1352	my $map = $path->load_temp;
		1353
		1354	Coro::cede;
1114		1355
1115	if ($map) {	1356	if ($map) {
		1357	$map->last_access ((delete $map->{last_access})
		1358	|| $cf::RUNTIME); #d#
1116	# safety	1359	# safety
1117	$map->{instantiate_time} = $cf::RUNTIME	1360	$map->{instantiate_time} = $cf::RUNTIME
1118	if $map->{instantiate_time} > $cf::RUNTIME;	1361	if $map->{instantiate_time} > $cf::RUNTIME;
1119	} else {	1362	} else {
1120	if (my $rmp = $path->random_map_params) {	1363	$map = $path->load_orig
1121	$map = generate_random_map $key, $rmp;
1122	} else {
1123	$map = try_load_header $path->load_path;
1124	}
1125
1126	$map or return;	1364	or return;
1127		1365
1128	$map->{load_original} = 1;	1366	$map->{load_original} = 1;
1129	$map->{instantiate_time} = $cf::RUNTIME;	1367	$map->{instantiate_time} = $cf::RUNTIME;
		1368	$map->last_access ($cf::RUNTIME);
1130	$map->instantiate;	1369	$map->instantiate;
1131		1370
1132	# per-player maps become, after loading, normal maps	1371	# per-player maps become, after loading, normal maps
1133	$map->per_player (0) if $path->{user_rel};	1372	$map->per_player (0) if $path->{user_rel};
1134	}	1373	}
1135		1374
1136	$map->path ($key);	1375	$map->path ($key);
1137	$map->{path} = $path;	1376	$map->{path} = $path;
1138	$map->last_access ($cf::RUNTIME);	1377	$map->{last_save} = $cf::RUNTIME;
		1378
		1379	Coro::cede;
1139		1380
1140	if ($map->should_reset) {	1381	if ($map->should_reset) {
1141	$map->reset;	1382	$map->reset;
		1383	undef $guard;
1142	$map = find_map $path;	1384	$map = find $path
		1385	or return;
1143	}	1386	}
1144		1387
1145	$cf::MAP{$key} = $map	1388	$cf::MAP{$key} = $map
1146	}	1389	}
1147	}	1390	}
1148		1391
1149	sub load {	1392	sub load {
1150	my ($self) = @_;	1393	my ($self) = @_;
1151		1394
		1395	my $path = $self->{path};
		1396	my $guard = cf::lock_acquire "map_load:" . $path->as_string;
		1397
1152	return if $self->in_memory != cf::MAP_SWAPPED;	1398	return if $self->in_memory != cf::MAP_SWAPPED;
1153		1399
1154	$self->in_memory (cf::MAP_LOADING);	1400	$self->in_memory (cf::MAP_LOADING);
1155
1156	my $path = $self->{path};
1157		1401
1158	$self->alloc;	1402	$self->alloc;
1159	$self->load_objects ($self->{load_path}, 1)	1403	$self->load_objects ($self->{load_path}, 1)
1160	or return;	1404	or return;
1161		1405
…		…
1168	$self->clear_unique_items;	1412	$self->clear_unique_items;
1169	$self->load_objects ($uniq, 0);	1413	$self->load_objects ($uniq, 0);
1170	}	1414	}
1171	}	1415	}
1172		1416
		1417	Coro::cede;
		1418
1173	# now do the right thing for maps	1419	# now do the right thing for maps
1174	$self->link_multipart_objects;	1420	$self->link_multipart_objects;
1175		1421
1176	if ($self->{path}->is_style_map) {	1422	if ($self->{path}->is_style_map) {
1177	$self->{deny_save} = 1;	1423	$self->{deny_save} = 1;
1178	$self->{deny_reset} = 1;	1424	$self->{deny_reset} = 1;
1179	} else {	1425	} else {
		1426	$self->decay_objects;
1180	$self->fix_auto_apply;	1427	$self->fix_auto_apply;
1181	$self->decay_objects;
1182	$self->update_buttons;	1428	$self->update_buttons;
1183	$self->set_darkness_map;	1429	$self->set_darkness_map;
1184	$self->difficulty ($self->estimate_difficulty)	1430	$self->difficulty ($self->estimate_difficulty)
1185	unless $self->difficulty;	1431	unless $self->difficulty;
1186	$self->activate;	1432	$self->activate;
1187	}	1433	}
1188		1434
		1435	Coro::cede;
		1436
1189	$self->in_memory (cf::MAP_IN_MEMORY);	1437	$self->in_memory (cf::MAP_IN_MEMORY);
1190	}	1438	}
1191		1439
1192	sub load_map_sync {	1440	# find and load all maps in the 3x3 area around a map
		1441	sub load_diag {
		1442	my ($map) = @_;
		1443
		1444	my @diag; # diagonal neighbours
		1445
		1446	for (0 .. 3) {
		1447	my $neigh = $map->tile_path ($_)
		1448	or next;
		1449	$neigh = find $neigh, $map
		1450	or next;
		1451	$neigh->load;
		1452
		1453	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
		1454	[$neigh->tile_path (($_ + 1) % 4), $neigh];
		1455	}
		1456
		1457	for (@diag) {
		1458	my $neigh = find @$_
		1459	or next;
		1460	$neigh->load;
		1461	}
		1462	}
		1463
		1464	sub find_sync {
1193	my ($path, $origin) = @_;	1465	my ($path, $origin) = @_;
1194		1466
1195	#warn "load_map_sync<$path, $origin>\n";#d#	1467	cf::sync_job { find $path, $origin }
		1468	}
1196		1469
1197	cf::sync_job {	1470	sub do_load_sync {
1198	my $map = cf::map::find_map $path, $origin	1471	my ($map) = @_;
		1472
		1473	cf::sync_job { $map->load };
		1474	}
		1475
		1476	our %MAP_PREFETCH;
		1477	our $MAP_PREFETCHER = Coro::async {
		1478	while () {
		1479	while (%MAP_PREFETCH) {
		1480	my $key = each %MAP_PREFETCH
1199	or return;	1481	or next;
		1482	my $path = delete $MAP_PREFETCH{$key};
		1483
		1484	my $map = find $path
		1485	or next;
1200	$map->load;	1486	$map->load;
1201	$map	1487	}
		1488	Coro::schedule;
1202	}	1489	}
		1490	};
		1491
		1492	sub find_async {
		1493	my ($path, $origin) = @_;
		1494
		1495	$path = new cf::path $path, $origin && $origin->path;
		1496	my $key = $path->as_string;
		1497
		1498	if (my $map = $cf::MAP{$key}) {
		1499	return $map if $map->in_memory == cf::MAP_IN_MEMORY;
		1500	}
		1501
		1502	$MAP_PREFETCH{$key} = $path;
		1503	$MAP_PREFETCHER->ready;
		1504
		1505	()
1203	}	1506	}
1204		1507
1205	sub save {	1508	sub save {
1206	my ($self) = @_;	1509	my ($self) = @_;
1207		1510
		1511	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1512
		1513	$self->{last_save} = $cf::RUNTIME;
		1514
		1515	return unless $self->dirty;
		1516
1208	my $save = $self->{path}->save_path; utf8::encode $save;	1517	my $save = $self->{path}->save_path; utf8::encode $save;
1209	my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;	1518	my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1210		1519
1211	$self->{last_save} = $cf::RUNTIME;
1212
1213	return unless $self->dirty;
1214
1215	$self->{load_path} = $save;	1520	$self->{load_path} = $save;
1216		1521
1217	return if $self->{deny_save};	1522	return if $self->{deny_save};
		1523
		1524	local $self->{last_access} = $self->last_access;#d#
		1525
		1526	cf::async {
		1527	$_->contr->save for $self->players;
		1528	};
1218		1529
1219	if ($uniq) {	1530	if ($uniq) {
1220	$self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	1531	$self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1221	$self->save_objects ($uniq, cf::IO_UNIQUES);	1532	$self->save_objects ($uniq, cf::IO_UNIQUES);
1222	} else {	1533	} else {
…		…
1225	}	1536	}
1226		1537
1227	sub swap_out {	1538	sub swap_out {
1228	my ($self) = @_;	1539	my ($self) = @_;
1229		1540
		1541	# save first because save cedes
		1542	$self->save;
		1543
		1544	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1545
1230	return if $self->players;	1546	return if $self->players;
1231	return if $self->in_memory != cf::MAP_IN_MEMORY;	1547	return if $self->in_memory != cf::MAP_IN_MEMORY;
1232	return if $self->{deny_save};	1548	return if $self->{deny_save};
1233		1549
1234	$self->save;
1235	$self->clear;	1550	$self->clear;
1236	$self->in_memory (cf::MAP_SWAPPED);	1551	$self->in_memory (cf::MAP_SWAPPED);
1237	}	1552	}
1238		1553
1239	sub reset_at {	1554	sub reset_at {
1240	my ($self) = @_;	1555	my ($self) = @_;
1241		1556
1242	# TODO: safety, remove and allow resettable per-player maps	1557	# TODO: safety, remove and allow resettable per-player maps
1243	return 1e100 if $self->{path}{user_rel};	1558	return 1e99 if $self->{path}{user_rel};
1244	return 1e100 if $self->{deny_reset};	1559	return 1e99 if $self->{deny_reset};
1245		1560
1246	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;	1561	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1247	my $to = $self->reset_timeout || $DEFAULT_RESET;	1562	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1248	$to = $MAX_RESET if $to > $MAX_RESET;
1249		1563
1250	$time + $to	1564	$time + $to
1251	}	1565	}
1252		1566
1253	sub should_reset {	1567	sub should_reset {
1254	my ($self) = @_;	1568	my ($self) = @_;
1255		1569
1256	$self->reset_at <= $cf::RUNTIME	1570	$self->reset_at <= $cf::RUNTIME
1257	}	1571	}
1258		1572
1259	sub unlink_save {
1260	my ($self) = @_;
1261
1262	utf8::encode (my $save = $self->{path}->save_path);
1263	aioreq_pri 3; IO::AIO::aio_unlink $save;
1264	aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1265	}
1266
1267	sub rename {	1573	sub rename {
1268	my ($self, $new_path) = @_;	1574	my ($self, $new_path) = @_;
1269		1575
1270	$self->unlink_save;	1576	$self->{path}->unlink_save;
1271		1577
1272	delete $cf::MAP{$self->path};	1578	delete $cf::MAP{$self->path};
1273	$self->{path} = new cf::path $new_path;	1579	$self->{path} = new cf::path $new_path;
1274	$self->path ($self->{path}->path);	1580	$self->path ($self->{path}->as_string);
1275	$cf::MAP{$self->path} = $self;	1581	$cf::MAP{$self->path} = $self;
1276		1582
1277	$self->save;	1583	$self->save;
1278	}	1584	}
1279		1585
1280	sub reset {	1586	sub reset {
1281	my ($self) = @_;	1587	my ($self) = @_;
1282		1588
		1589	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1590
1283	return if $self->players;	1591	return if $self->players;
1284	return if $self->{path}{user_rel};#d#	1592	return if $self->{path}{user_rel};#d#
1285		1593
1286	warn "resetting map ", $self->path;#d#	1594	warn "resetting map ", $self->path;#d#
1287		1595
1288	delete $cf::MAP{$self->path};	1596	delete $cf::MAP{$self->path};
1289		1597
1290	$_->clear_links_to ($self) for values %cf::MAP;	1598	$_->clear_links_to ($self) for values %cf::MAP;
1291		1599
1292	$self->unlink_save;	1600	$self->{path}->unlink_save;
1293	$self->destroy;	1601	$self->destroy;
1294	}	1602	}
1295		1603
1296	sub customise_for {	1604	my $nuke_counter = "aaaa";
1297	my ($map, $ob) = @_;
1298		1605
1299	if ($map->per_player) {	1606	sub nuke {
1300	return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path};	1607	my ($self) = @_;
1301	}
1302		1608
1303	$map	1609	$self->{deny_save} = 1;
		1610	$self->reset_timeout (1);
		1611	$self->rename ("{nuke}/" . ($nuke_counter++));
		1612	$self->reset; # polite request, might not happen
1304	}	1613	}
1305		1614
1306	sub emergency_save {	1615	=item cf::map::unique_maps
1307	local $cf::FREEZE = 1;
1308		1616
1309	warn "enter emergency map save\n";	1617	Returns an arrayref of cf::path's of all shared maps that have
		1618	instantiated unique items. May block.
1310		1619
1311	cf::sync_job {	1620	=cut
1312	warn "begin emergency map save\n";	1621
1313	$_->save for values %cf::MAP;	1622	sub unique_maps() {
		1623	my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
		1624	or return;
		1625
		1626	my @paths;
		1627
		1628	for (@$files) {
		1629	utf8::decode $_;
		1630	next if /\.pst$/;
		1631	next unless /^$PATH_SEP/o;
		1632
		1633	push @paths, new cf::path $_;
1314	};	1634	}
1315		1635
1316	warn "end emergency map save\n";	1636	\@paths
1317	}	1637	}
1318		1638
1319	package cf;	1639	package cf;
1320		1640
1321	=back	1641	=back
1322		1642
		1643	=head3 cf::object
		1644
		1645	=cut
		1646
		1647	package cf::object;
		1648
		1649	=over 4
		1650
		1651	=item $ob->inv_recursive
		1652
		1653	Returns the inventory of the object _and_ their inventories, recursively.
		1654
		1655	=cut
		1656
		1657	sub inv_recursive_;
		1658	sub inv_recursive_ {
		1659	map { $_, inv_recursive_ $_->inv } @_
		1660	}
		1661
		1662	sub inv_recursive {
		1663	inv_recursive_ inv $_[0]
		1664	}
		1665
		1666	package cf;
		1667
		1668	=back
1323		1669
1324	=head3 cf::object::player	1670	=head3 cf::object::player
1325		1671
1326	=over 4	1672	=over 4
1327		1673
…		…
1363	(ref $cf::CFG{"may_$access"}	1709	(ref $cf::CFG{"may_$access"}
1364	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}	1710	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1365	: $cf::CFG{"may_$access"})	1711	: $cf::CFG{"may_$access"})
1366	}	1712	}
1367		1713
		1714	=item $player_object->enter_link
		1715
		1716	Freezes the player and moves him/her to a special map (C<{link}>).
		1717
		1718	The player should be reaosnably safe there for short amounts of time. You
		1719	I<MUST> call C<leave_link> as soon as possible, though.
		1720
		1721	=item $player_object->leave_link ($map, $x, $y)
		1722
		1723	Moves the player out of the specila link map onto the given map. If the
		1724	map is not valid (or omitted), the player will be moved back to the
		1725	location he/she was before the call to C<enter_link>, or, if that fails,
		1726	to the emergency map position.
		1727
		1728	Might block.
		1729
		1730	=cut
		1731
1368	sub cf::object::player::enter_link {	1732	sub cf::object::player::enter_link {
1369	my ($self) = @_;	1733	my ($self) = @_;
1370		1734
		1735	$self->deactivate_recursive;
		1736
1371	return if $self->map == $LINK_MAP;	1737	return if $self->map == $LINK_MAP;
1372		1738
1373	$self->{_link_pos} = [$self->map->{path}, $self->x, $self->y]	1739	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1374	if $self->map;	1740	if $self->map;
1375		1741
1376	$self->enter_map ($LINK_MAP, 20, 20);	1742	$self->enter_map ($LINK_MAP, 20, 20);
1377	$self->deactivate_recursive;
1378	}	1743	}
1379		1744
1380	sub cf::object::player::leave_link {	1745	sub cf::object::player::leave_link {
1381	my ($self, $map, $x, $y) = @_;	1746	my ($self, $map, $x, $y) = @_;
1382		1747
1383	my $link_pos = delete $self->{_link_pos};	1748	my $link_pos = delete $self->{_link_pos};
1384		1749
1385	unless ($map) {	1750	unless ($map) {
1386	$self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1387
1388	# restore original map position	1751	# restore original map position
1389	($map, $x, $y) = @{ $link_pos || [] };	1752	($map, $x, $y) = @{ $link_pos || [] };
1390	$map = cf::map::find_map $map;	1753	$map = cf::map::find $map;
1391		1754
1392	unless ($map) {	1755	unless ($map) {
1393	($map, $x, $y) = @$EMERGENCY_POSITION;	1756	($map, $x, $y) = @$EMERGENCY_POSITION;
1394	$map = cf::map::find_map $map	1757	$map = cf::map::find $map
1395	or die "FATAL: cannot load emergency map\n";	1758	or die "FATAL: cannot load emergency map\n";
1396	}	1759	}
1397	}	1760	}
1398		1761
1399	($x, $y) = (-1, -1)	1762	($x, $y) = (-1, -1)
…		…
1402	# use -1 or undef as default coordinates, not 0, 0	1765	# use -1 or undef as default coordinates, not 0, 0
1403	($x, $y) = ($map->enter_x, $map->enter_y)	1766	($x, $y) = ($map->enter_x, $map->enter_y)
1404	if $x <=0 && $y <= 0;	1767	if $x <=0 && $y <= 0;
1405		1768
1406	$map->load;	1769	$map->load;
		1770	$map->load_diag;
1407		1771
		1772	return unless $self->contr->active;
1408	$self->activate_recursive;	1773	$self->activate_recursive;
1409	$self->enter_map ($map, $x, $y);	1774	$self->enter_map ($map, $x, $y);
1410	}	1775	}
1411		1776
		1777	cf::player->attach (
		1778	on_logout => sub {
		1779	my ($pl) = @_;
		1780
		1781	# abort map switching before logout
		1782	if ($pl->ob->{_link_pos}) {
		1783	cf::sync_job {
		1784	$pl->ob->leave_link
		1785	};
		1786	}
		1787	},
		1788	on_login => sub {
		1789	my ($pl) = @_;
		1790
		1791	# try to abort aborted map switching on player login :)
		1792	# should happen only on crashes
		1793	if ($pl->ob->{_link_pos}) {
		1794	$pl->ob->enter_link;
		1795	(async {
		1796	# we need this sleep as the login has a concurrent enter_exit running
		1797	# and this sleep increases chances of the player not ending up in scorn
		1798	$pl->ob->reply (undef,
		1799	"There was an internal problem at your last logout, "
		1800	. "the server will try to bring you to your intended destination in a second.",
		1801	cf::NDI_RED);
		1802	Coro::Timer::sleep 1;
		1803	$pl->ob->leave_link;
		1804	})->prio (2);
		1805	}
		1806	},
		1807	);
		1808
1412	=item $player_object->goto_map ($map, $x, $y)	1809	=item $player_object->goto ($path, $x, $y)
1413		1810
1414	=cut	1811	=cut
1415		1812
1416	sub cf::object::player::goto_map {	1813	sub cf::object::player::goto {
1417	my ($self, $path, $x, $y) = @_;	1814	my ($self, $path, $x, $y) = @_;
1418		1815
		1816	$path = new cf::path $path;
		1817
1419	$self->enter_link;	1818	$self->enter_link;
1420		1819
1421	(Coro::async {	1820	(async {
1422	$path = new cf::path $path;
1423
1424	my $map = cf::map::find_map $path->as_string;	1821	my $map = cf::map::find $path->as_string;
1425	$map = $map->customise_for ($self) if $map;	1822	$map = $map->{path}->customise_for ($map, $self) if $map;
1426		1823
1427	warn "entering ", $map->path, " at ($x, $y)\n"	1824	# warn "entering ", $map->path, " at ($x, $y)\n"
1428	if $map;	1825	# if $map;
		1826
		1827	$map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1429		1828
1430	$self->leave_link ($map, $x, $y);	1829	$self->leave_link ($map, $x, $y);
1431	})->prio (1);	1830	})->prio (1);
1432	}	1831	}
1433		1832
…		…
1486		1885
1487	return unless $self->type == cf::PLAYER;	1886	return unless $self->type == cf::PLAYER;
1488		1887
1489	$self->enter_link;	1888	$self->enter_link;
1490		1889
1491	(Coro::async {	1890	(async {
		1891	$self->deactivate_recursive; # just to be sure
1492	unless (eval {	1892	unless (eval {
1493
1494	prepare_random_map $exit	1893	prepare_random_map $exit
1495	if $exit->slaying eq "/!";	1894	if $exit->slaying eq "/!";
1496		1895
1497	my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;	1896	my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1498	$self->goto_map ($path, $exit->stats->hp, $exit->stats->sp);	1897	$self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1499		1898
1500	1;	1899	1;
1501	}) {	1900	}) {
1502	$self->message ("Something went wrong deep within the crossfire server. "	1901	$self->message ("Something went wrong deep within the crossfire server. "
1503	. "I'll try to bring you back to the map you were before. "	1902	. "I'll try to bring you back to the map you were before. "
1504	. "Please report this to the dungeon master",	1903	. "Please report this to the dungeon master!",
1505	cf::NDI_UNIQUE | cf::NDI_RED);	1904	cf::NDI_UNIQUE | cf::NDI_RED);
1506		1905
1507	warn "ERROR in enter_exit: $@";	1906	warn "ERROR in enter_exit: $@";
1508	$self->leave_link;	1907	$self->leave_link;
1509	}	1908	}
…		…
1560	on_reply => sub {	1959	on_reply => sub {
1561	my ($ns, $msg) = @_;	1960	my ($ns, $msg) = @_;
1562		1961
1563	# this weird shuffling is so that direct followup queries	1962	# this weird shuffling is so that direct followup queries
1564	# get handled first	1963	# get handled first
1565	my $queue = delete $ns->{query_queue};	1964	my $queue = delete $ns->{query_queue}
		1965	or return; # be conservative, not sure how that can happen, but we saw a crash here
1566		1966
1567	(shift @$queue)->[1]->($msg);	1967	(shift @$queue)->[1]->($msg);
1568		1968
1569	push @{ $ns->{query_queue} }, @$queue;	1969	push @{ $ns->{query_queue} }, @$queue;
1570		1970
…		…
1576	}	1976	}
1577	}	1977	}
1578	},	1978	},
1579	);	1979	);
1580		1980
1581	=item $client->coro (\&cb)	1981	=item $client->async (\&cb)
1582		1982
1583	Create a new coroutine, running the specified callback. The coroutine will	1983	Create a new coroutine, running the specified callback. The coroutine will
1584	be automatically cancelled when the client gets destroyed (e.g. on logout,	1984	be automatically cancelled when the client gets destroyed (e.g. on logout,
1585	or loss of connection).	1985	or loss of connection).
1586		1986
1587	=cut	1987	=cut
1588		1988
1589	sub cf::client::coro {	1989	sub cf::client::async {
1590	my ($self, $cb) = @_;	1990	my ($self, $cb) = @_;
1591		1991
1592	my $coro; $coro = async {	1992	my $coro = &Coro::async ($cb);
1593	eval {
1594	$cb->();
1595	};
1596	warn $@ if $@;
1597	};
1598		1993
1599	$coro->on_destroy (sub {	1994	$coro->on_destroy (sub {
1600	delete $self->{_coro}{$coro+0};	1995	delete $self->{_coro}{$coro+0};
1601	});	1996	});
1602		1997
…		…
1774		2169
1775	{	2170	{
1776	my $path = cf::localdir . "/database.pst";	2171	my $path = cf::localdir . "/database.pst";
1777		2172
1778	sub db_load() {	2173	sub db_load() {
1779	warn "loading database $path\n";#d# remove later
1780	$DB = stat $path ? Storable::retrieve $path : { };	2174	$DB = stat $path ? Storable::retrieve $path : { };
1781	}	2175	}
1782		2176
1783	my $pid;	2177	my $pid;
1784		2178
1785	sub db_save() {	2179	sub db_save() {
1786	warn "saving database $path\n";#d# remove later
1787	waitpid $pid, 0 if $pid;	2180	waitpid $pid, 0 if $pid;
1788	if (0 == ($pid = fork)) {	2181	if (0 == ($pid = fork)) {
1789	$DB->{_meta}{version} = 1;	2182	$DB->{_meta}{version} = 1;
1790	Storable::nstore $DB, "$path~";	2183	Storable::nstore $DB, "$path~";
1791	rename "$path~", $path;	2184	rename "$path~", $path;
…		…
1839	open my $fh, "<:utf8", cf::confdir . "/config"	2232	open my $fh, "<:utf8", cf::confdir . "/config"
1840	or return;	2233	or return;
1841		2234
1842	local $/;	2235	local $/;
1843	*CFG = YAML::Syck::Load <$fh>;	2236	*CFG = YAML::Syck::Load <$fh>;
		2237
		2238	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
		2239
		2240	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
		2241	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
		2242
		2243	if (exists $CFG{mlockall}) {
		2244	eval {
		2245	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
		2246	and die "WARNING: m(un)lockall failed: $!\n";
		2247	};
		2248	warn $@ if $@;
		2249	}
1844	}	2250	}
1845		2251
1846	sub main {	2252	sub main {
1847	# we must not ever block the main coroutine	2253	# we must not ever block the main coroutine
1848	local $Coro::idle = sub {	2254	local $Coro::idle = sub {
1849	Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d#	2255	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1850	(Coro::unblock_sub {
1851	Event::one_event;	2256	async { Event::one_event };
1852	})->();
1853	};	2257	};
1854		2258
1855	cfg_load;	2259	cfg_load;
1856	db_load;	2260	db_load;
1857	load_extensions;	2261	load_extensions;
1858	Event::loop;	2262	Event::loop;
1859	}	2263	}
1860		2264
1861	#############################################################################	2265	#############################################################################
1862	# initialisation	2266	# initialisation and cleanup
		2267
		2268	# install some emergency cleanup handlers
		2269	BEGIN {
		2270	for my $signal (qw(INT HUP TERM)) {
		2271	Event->signal (
		2272	data => WF_AUTOCANCEL,
		2273	signal => $signal,
		2274	cb => sub {
		2275	cf::cleanup "SIG$signal";
		2276	},
		2277	);
		2278	}
		2279	}
		2280
		2281	sub emergency_save() {
		2282	my $freeze_guard = cf::freeze_mainloop;
		2283
		2284	warn "enter emergency perl save\n";
		2285
		2286	cf::sync_job {
		2287	# use a peculiar iteration method to avoid tripping on perl
		2288	# refcount bugs in for. also avoids problems with players
		2289	# and maps saved/Destroyed asynchronously.
		2290	warn "begin emergency player save\n";
		2291	for my $login (keys %cf::PLAYER) {
		2292	my $pl = $cf::PLAYER{$login} or next;
		2293	$pl->valid or next;
		2294	$pl->save;
		2295	}
		2296	warn "end emergency player save\n";
		2297
		2298	warn "begin emergency map save\n";
		2299	for my $path (keys %cf::MAP) {
		2300	my $map = $cf::MAP{$path} or next;
		2301	$map->valid or next;
		2302	$map->save;
		2303	}
		2304	warn "end emergency map save\n";
		2305	};
		2306
		2307	warn "leave emergency perl save\n";
		2308	}
1863		2309
1864	sub reload() {	2310	sub reload() {
1865	# can/must only be called in main	2311	# can/must only be called in main
1866	if ($Coro::current != $Coro::main) {	2312	if ($Coro::current != $Coro::main) {
1867	warn "can only reload from main coroutine\n";	2313	warn "can only reload from main coroutine\n";
1868	return;	2314	return;
1869	}	2315	}
1870		2316
1871	warn "reloading...";	2317	warn "reloading...";
1872		2318
1873	local $FREEZE = 1;	2319	warn "freezing server";
		2320	my $guard = freeze_mainloop;
1874	cf::emergency_save;	2321	cf::emergency_save;
		2322
		2323	warn "sync database to disk";
		2324	cf::db_sync;
		2325	IO::AIO::flush;
1875		2326
1876	eval {	2327	eval {
1877	# if anything goes wrong in here, we should simply crash as we already saved	2328	# if anything goes wrong in here, we should simply crash as we already saved
1878		2329
1879	# cancel all watchers	2330	warn "cancel all watchers";
1880	for (Event::all_watchers) {	2331	for (Event::all_watchers) {
1881	$_->cancel if $_->data & WF_AUTOCANCEL;	2332	$_->cancel if $_->data & WF_AUTOCANCEL;
1882	}	2333	}
1883		2334
1884	# cancel all extension coros	2335	warn "cancel all extension coros";
1885	$_->cancel for values %EXT_CORO;	2336	$_->cancel for values %EXT_CORO;
1886	%EXT_CORO = ();	2337	%EXT_CORO = ();
1887		2338
		2339	warn "remove commands";
		2340	%COMMAND = ();
		2341
		2342	warn "remove ext commands";
		2343	%EXTCMD = ();
		2344
1888	# unload all extensions	2345	warn "unload/nuke all extensions";
1889	for (@exts) {	2346	for my $pkg (@EXTS) {
1890	warn "unloading <$_>";	2347	warn "... unloading $pkg";
1891	unload_extension $_;	2348
		2349	if (my $cb = $pkg->can ("unload")) {
		2350	eval {
		2351	$cb->($pkg);
		2352	1
		2353	} or warn "$pkg unloaded, but with errors: $@";
1892	}	2354	}
1893		2355
		2356	warn "... nuking $pkg";
		2357	Symbol::delete_package $pkg;
		2358	}
		2359
1894	# unload all modules loaded from $LIBDIR	2360	warn "unload all perl modules loaded from $LIBDIR";
1895	while (my ($k, $v) = each %INC) {	2361	while (my ($k, $v) = each %INC) {
1896	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	2362	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
1897		2363
1898	warn "removing <$k>";	2364	warn "removing <$k>";
1899	delete $INC{$k};	2365	delete $INC{$k};
…		…
1906	}	2372	}
1907		2373
1908	Symbol::delete_package $k;	2374	Symbol::delete_package $k;
1909	}	2375	}
1910		2376
1911	# sync database to disk
1912	cf::db_sync;
1913	IO::AIO::flush;
1914
1915	# get rid of safe::, as good as possible	2377	warn "get rid of safe::, as good as possible";
1916	Symbol::delete_package "safe::$_"	2378	Symbol::delete_package "safe::$_"
1917	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	2379	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
1918		2380
1919	# remove register_script_function callbacks
1920	# TODO
1921
1922	# unload cf.pm "a bit"	2381	warn "unload cf.pm \"a bit\"";
1923	delete $INC{"cf.pm"};	2382	delete $INC{"cf.pm"};
1924		2383
1925	# don't, removes xs symbols, too,	2384	# don't, removes xs symbols, too,
1926	# and global variables created in xs	2385	# and global variables created in xs
1927	#Symbol::delete_package __PACKAGE__;	2386	#Symbol::delete_package __PACKAGE__;
1928		2387
1929	# reload cf.pm
1930	warn "reloading cf.pm";	2388	warn "reloading cf.pm";
1931	require cf;	2389	require cf;
1932	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	2390	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
1933		2391
1934	# load config and database again	2392	warn "load config and database again";
1935	cf::cfg_load;	2393	cf::cfg_load;
1936	cf::db_load;	2394	cf::db_load;
1937		2395
1938	# load extensions
1939	warn "load extensions";	2396	warn "load extensions";
1940	cf::load_extensions;	2397	cf::load_extensions;
1941		2398
1942	# reattach attachments to objects	2399	warn "reattach attachments to objects/players";
1943	warn "reattach";
1944	_global_reattach;	2400	_global_reattach;
		2401	warn "reattach attachments to maps";
		2402	reattach $_ for values %MAP;
1945	};	2403	};
1946		2404
1947	if ($@) {	2405	if ($@) {
1948	warn $@;	2406	warn $@;
1949	warn "error while reloading, exiting.";	2407	warn "error while reloading, exiting.";
1950	exit 1;	2408	exit 1;
1951	}	2409	}
1952		2410
1953	warn "reloaded successfully";	2411	warn "reloaded";
1954	};	2412	};
1955		2413
1956	#############################################################################	2414	#############################################################################
1957		2415
1958	unless ($LINK_MAP) {	2416	unless ($LINK_MAP) {
…		…
1965	$LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";	2423	$LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
1966	$LINK_MAP->in_memory (MAP_IN_MEMORY);	2424	$LINK_MAP->in_memory (MAP_IN_MEMORY);
1967		2425
1968	# dirty hack because... archetypes are not yet loaded	2426	# dirty hack because... archetypes are not yet loaded
1969	Event->timer (	2427	Event->timer (
1970	after => 2,	2428	after => 10,
1971	cb => sub {	2429	cb => sub {
1972	$_[0]->w->cancel;	2430	$_[0]->w->cancel;
1973		2431
1974	# provide some exits "home"	2432	# provide some exits "home"
1975	my $exit = cf::object::new "exit";	2433	my $exit = cf::object::new "exit";
…		…
1994	$LINK_MAP->{deny_reset} = 1;	2452	$LINK_MAP->{deny_reset} = 1;
1995		2453
1996	$cf::MAP{$LINK_MAP->path} = $LINK_MAP;	2454	$cf::MAP{$LINK_MAP->path} = $LINK_MAP;
1997	}	2455	}
1998		2456
1999	register "<global>", __PACKAGE__;
2000
2001	register_command "reload" => sub {	2457	register_command "reload" => sub {
2002	my ($who, $arg) = @_;	2458	my ($who, $arg) = @_;
2003		2459
2004	if ($who->flag (FLAG_WIZ)) {	2460	if ($who->flag (FLAG_WIZ)) {
2005	$who->message ("start of reload.");	2461	$who->message ("start of reload.");
…		…
2014	reentrant => 0,	2470	reentrant => 0,
2015	prio => 0,	2471	prio => 0,
2016	at => $NEXT_TICK || $TICK,	2472	at => $NEXT_TICK || $TICK,
2017	data => WF_AUTOCANCEL,	2473	data => WF_AUTOCANCEL,
2018	cb => sub {	2474	cb => sub {
2019	unless ($FREEZE) {	2475	$NOW = Event::time;
		2476
2020	cf::server_tick; # one server iteration	2477	cf::server_tick; # one server iteration
2021	$RUNTIME += $TICK;	2478	$RUNTIME += $TICK;
2022	}
2023
2024	$NEXT_TICK += $TICK;	2479	$NEXT_TICK += $TICK;
		2480
		2481	$WAIT_FOR_TICK->broadcast;
		2482	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2025		2483
2026	# if we are delayed by four ticks or more, skip them all	2484	# if we are delayed by four ticks or more, skip them all
2027	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2485	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2028		2486
2029	$TICK_WATCHER->at ($NEXT_TICK);	2487	$TICK_WATCHER->at ($NEXT_TICK);
…		…
2051	or warn "ERROR: unable to write runtime file: $!";	2509	or warn "ERROR: unable to write runtime file: $!";
2052	})->();	2510	})->();
2053	},	2511	},
2054	);	2512	);
2055		2513
		2514	END { cf::emergency_save }
		2515
2056	1	2516	1
2057		2517

Diff Legend

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