[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.134 by root, Thu Jan 4 17:28:49 2007 UTC vs.
Revision 1.166 by root, Sat Jan 13 23:06:13 2007 UTC

…		…
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, which is always available
54	our $RANDOM_MAPS = cf::localdir . "/random";	60	our $RANDOM_MAPS = cf::localdir . "/random";
55	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;
		64
		65	# used to convert map paths into valid unix filenames by replacing / by ∕
		66	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
56		67
57	binmode STDOUT;	68	binmode STDOUT;
58	binmode STDERR;	69	binmode STDERR;
59		70
60	# read virtual server time, if available	71	# read virtual server time, if available
…		…
68	mkdir cf::localdir . "/" . cf::playerdir;	79	mkdir cf::localdir . "/" . cf::playerdir;
69	mkdir cf::localdir . "/" . cf::tmpdir;	80	mkdir cf::localdir . "/" . cf::tmpdir;
70	mkdir cf::localdir . "/" . cf::uniquedir;	81	mkdir cf::localdir . "/" . cf::uniquedir;
71	mkdir $RANDOM_MAPS;	82	mkdir $RANDOM_MAPS;
72		83
73	# a special map that is always available
74	our $LINK_MAP;
75	our $EMERGENCY_POSITION;	84	our $EMERGENCY_POSITION;
76		85
77	#############################################################################	86	#############################################################################
78		87
79	=head2 GLOBAL VARIABLES	88	=head2 GLOBAL VARIABLES
…		…
104		113
105	=item %cf::CFG	114	=item %cf::CFG
106		115
107	Configuration for the server, loaded from C</etc/crossfire/config>, or	116	Configuration for the server, loaded from C</etc/crossfire/config>, or
108	from wherever your confdir points to.	117	from wherever your confdir points to.
		118
		119	=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
		120
		121	These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
		122	or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
		123	processing has been done. Call C<< ->wait >> on them to maximise the
		124	window of cpu time available, or simply to synchronise to the server tick.
109		125
110	=back	126	=back
111		127
112	=cut	128	=cut
113		129
…		…
117	utf8::encode $msg;	133	utf8::encode $msg;
118		134
119	$msg .= "\n"	135	$msg .= "\n"
120	unless $msg =~ /\n$/;	136	unless $msg =~ /\n$/;
121		137
122	LOG llevError, "cfperl: $msg";	138	LOG llevError, $msg;
123	};	139	};
124	}	140	}
125		141
126	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	142	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
127	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	143	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
…		…
145		161
146	$Event::DIED = sub {	162	$Event::DIED = sub {
147	warn "error in event callback: @_";	163	warn "error in event callback: @_";
148	};	164	};
149		165
150	my %ext_pkg;
151	my @exts;
152	my @hook;
153
154	=head2 UTILITY FUNCTIONS	166	=head2 UTILITY FUNCTIONS
155		167
156	=over 4	168	=over 4
157		169
		170	=item dumpval $ref
		171
158	=cut	172	=cut
		173
		174	sub dumpval {
		175	eval {
		176	local $SIG{__DIE__};
		177	my $d;
		178	if (1) {
		179	$d = new Data::Dumper([$_[0]], ["*var"]);
		180	$d->Terse(1);
		181	$d->Indent(2);
		182	$d->Quotekeys(0);
		183	$d->Useqq(1);
		184	#$d->Bless(...);
		185	$d->Seen($_[1]) if @_ > 1;
		186	$d = $d->Dump();
		187	}
		188	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
		189	$d
		190	} \|\| "[unable to dump $_[0]: '$@']";
		191	}
159		192
160	use JSON::Syck (); # TODO# replace by JSON::PC once working	193	use JSON::Syck (); # TODO# replace by JSON::PC once working
161		194
162	=item $ref = cf::from_json $json	195	=item $ref = cf::from_json $json
163		196
…		…
179	sub to_json($) {	212	sub to_json($) {
180	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs	213	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
181	JSON::Syck::Dump $_[0]	214	JSON::Syck::Dump $_[0]
182	}	215	}
183		216
184	=item my $guard = cf::guard { BLOCK }
185
186	Run the given callback when the guard object gets destroyed (useful for
187	coroutine cancellations).
188
189	You can call C<< ->cancel >> on the guard object to stop the block from
190	being executed.
191
192	=cut
193
194	sub guard(&) {
195	bless \(my $cb = $_[0]), cf::guard::;
196	}
197
198	sub cf::guard::cancel {
199	${$_[0]} = sub { };
200	}
201
202	sub cf::guard::DESTROY {
203	${$_[0]}->();
204	}
205
206	=item cf::lock_wait $string	217	=item cf::lock_wait $string
207		218
208	Wait until the given lock is available. See cf::lock_acquire.	219	Wait until the given lock is available. See cf::lock_acquire.
209		220
210	=item my $lock = cf::lock_acquire $string	221	=item my $lock = cf::lock_acquire $string
211		222
212	Wait until the given lock is available and then acquires it and returns	223	Wait until the given lock is available and then acquires it and returns
213	a guard object. If the guard object gets destroyed (goes out of scope,	224	a Coro::guard object. If the guard object gets destroyed (goes out of scope,
214	for example when the coroutine gets canceled), the lock is automatically	225	for example when the coroutine gets canceled), the lock is automatically
215	returned.	226	returned.
216		227
217	Lock names should begin with a unique identifier (for example, cf::map::find	228	Lock names should begin with a unique identifier (for example, cf::map::find
218	uses map_find and cf::map::load uses map_load).	229	uses map_find and cf::map::load uses map_load).
…		…
237	# wait, to be sure we are not locked	248	# wait, to be sure we are not locked
238	lock_wait $key;	249	lock_wait $key;
239		250
240	$LOCK{$key} = [];	251	$LOCK{$key} = [];
241		252
242	cf::guard {	253	Coro::guard {
243	# wake up all waiters, to be on the safe side	254	# wake up all waiters, to be on the safe side
244	$_->ready for @{ delete $LOCK{$key} };	255	$_->ready for @{ delete $LOCK{$key} };
245	}	256	}
246	}	257	}
247		258
248	=item cf::async { BLOCK }
249
250	Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the
251	error instead of exiting the server in case of a problem.
252
253	=cut
254
255	sub async(&) {
256	my ($cb) = @_;
257
258	Coro::async {
259	eval { $cb->() };
260	warn $@ if $@;
261	}
262	}
263
264	sub freeze_mainloop {	259	sub freeze_mainloop {
265	return unless $TICK_WATCHER->is_active;	260	return unless $TICK_WATCHER->is_active;
266		261
267	my $guard = guard { $TICK_WATCHER->start };	262	my $guard = Coro::guard { $TICK_WATCHER->start };
268	$TICK_WATCHER->stop;	263	$TICK_WATCHER->stop;
269	$guard	264	$guard
270	}	265	}
		266
		267	=item cf::async { BLOCK }
		268
		269	Currently the same as Coro::async_pool, meaning you cannot use
		270	C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
		271	thing you are allowed to do is call C<prio> on it.
		272
		273	=cut
		274
		275	BEGIN { *async = \&Coro::async_pool }
271		276
272	=item cf::sync_job { BLOCK }	277	=item cf::sync_job { BLOCK }
273		278
274	The design of crossfire+ requires that the main coro ($Coro::main) is	279	The design of crossfire+ requires that the main coro ($Coro::main) is
275	always able to handle events or runnable, as crossfire+ is only partly	280	always able to handle events or runnable, as crossfire+ is only partly
…		…
294	my $freeze_guard = freeze_mainloop;	299	my $freeze_guard = freeze_mainloop;
295		300
296	my $busy = 1;	301	my $busy = 1;
297	my @res;	302	my @res;
298		303
299	(Coro::async {	304	(async {
300	@res = eval { $job->() };	305	@res = eval { $job->() };
301	warn $@ if $@;	306	warn $@ if $@;
302	undef $busy;	307	undef $busy;
303	})->prio (Coro::PRIO_MAX);	308	})->prio (Coro::PRIO_MAX);
304		309
305	while ($busy) {	310	while ($busy) {
306	Coro::cede_notself;	311	Coro::cede or Event::one_event;
307	Event::one_event unless Coro::nready;
308	}	312	}
309		313
310	wantarray ? @res : $res[0]	314	wantarray ? @res : $res[0]
311	} else {	315	} else {
312	# we are in another coroutine, how wonderful, everything just works	316	# we are in another coroutine, how wonderful, everything just works
313		317
314	$job->()	318	$job->()
315	}	319	}
316	}	320	}
317		321
318	=item $coro = cf::coro { BLOCK }	322	=item $coro = cf::async_ext { BLOCK }
319		323
320	Creates and returns a new coro. This coro is automcatially being canceled	324	Like async, but this coro is automatically being canceled when the
321	when the extension calling this is being unloaded.	325	extension calling this is being unloaded.
322		326
323	=cut	327	=cut
324		328
325	sub coro(&) {	329	sub async_ext(&) {
326	my $cb = shift;	330	my $cb = shift;
327		331
328	my $coro = &cf::async ($cb);	332	my $coro = &Coro::async ($cb);
329		333
330	$coro->on_destroy (sub {	334	$coro->on_destroy (sub {
331	delete $EXT_CORO{$coro+0};	335	delete $EXT_CORO{$coro+0};
332	});	336	});
333	$EXT_CORO{$coro+0} = $coro;	337	$EXT_CORO{$coro+0} = $coro;
334		338
335	$coro	339	$coro
336	}	340	}
337		341
338	sub write_runtime {	342	sub write_runtime {
		343	return unless $TICK_WATCHER->is_active;
		344
339	my $runtime = cf::localdir . "/runtime";	345	my $runtime = cf::localdir . "/runtime";
340		346
341	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644	347	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644
342	or return;	348	or return;
343		349
…		…
358	}	364	}
359		365
360	=back	366	=back
361		367
362	=cut	368	=cut
363
364	#############################################################################
365
366	package cf::path;
367
368	sub new {
369	my ($class, $path, $base) = @_;
370
371	$path = $path->as_string if ref $path;
372
373	my $self = bless { }, $class;
374
375	# {... are special paths that are not touched
376	# ?xxx/... are special absolute paths
377	# ?random/... random maps
378	# /! non-realised random map exit
379	# /... normal maps
380	# ~/... per-player maps without a specific player (DO NOT USE)
381	# ~user/... per-player map of a specific user
382
383	if ($path =~ /^{/) {
384	# fine as it is
385	} elsif ($path =~ s{^\?random/}{}) {
386	Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
387	$self->{random} = cf::from_json $data;
388	} else {
389	if ($path =~ s{^~([^/]+)?}{}) {
390	$self->{user_rel} = 1;
391
392	if (defined $1) {
393	$self->{user} = $1;
394	} elsif ($base =~ m{^~([^/]+)/}) {
395	$self->{user} = $1;
396	} else {
397	warn "cannot resolve user-relative path without user <$path,$base>\n";
398	}
399	} elsif ($path =~ /^\//) {
400	# already absolute
401	} else {
402	$base =~ s{[^/]+/?$}{};
403	return $class->new ("$base/$path");
404	}
405
406	for ($path) {
407	redo if s{/\.?/}{/};
408	redo if s{/[^/]+/\.\./}{/};
409	}
410	}
411
412	$self->{path} = $path;
413
414	$self
415	}
416
417	# the name / primary key / in-game path
418	sub as_string {
419	my ($self) = @_;
420
421	$self->{user_rel} ? "~$self->{user}$self->{path}"
422	: $self->{random} ? "?random/$self->{path}"
423	: $self->{path}
424	}
425
426	# the displayed name, this is a one way mapping
427	sub visible_name {
428	my ($self) = @_;
429
430	# if (my $rmp = $self->{random}) {
431	# # todo: be more intelligent about this
432	# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
433	# } else {
434	$self->as_string
435	# }
436	}
437
438	# escape the /'s in the path
439	sub _escaped_path {
440	# ∕ is U+2215
441	(my $path = $_[0]{path}) =~ s/\//∕/g;
442	$path
443	}
444
445	# the original (read-only) location
446	sub load_path {
447	my ($self) = @_;
448
449	sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
450	}
451
452	# the temporary/swap location
453	sub save_path {
454	my ($self) = @_;
455
456	$self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
457	: $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
458	: sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
459	}
460
461	# the unique path, might be eq to save_path
462	sub uniq_path {
463	my ($self) = @_;
464
465	$self->{user_rel} \|\| $self->{random}
466	? undef
467	: sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
468	}
469
470	# return random map parameters, or undef
471	sub random_map_params {
472	my ($self) = @_;
473
474	$self->{random}
475	}
476
477	# this is somewhat ugly, but style maps do need special treatment
478	sub is_style_map {
479	$_[0]{path} =~ m{^/styles/}
480	}
481
482	package cf;
483		369
484	#############################################################################	370	#############################################################################
485		371
486	=head2 ATTACHABLE OBJECTS	372	=head2 ATTACHABLE OBJECTS
487		373
…		…
934	=cut	820	=cut
935		821
936	sub register_extcmd {	822	sub register_extcmd {
937	my ($name, $cb) = @_;	823	my ($name, $cb) = @_;
938		824
939	my $caller = caller;
940	#warn "registering extcmd '$name' to '$caller'";
941
942	$EXTCMD{$name} = [$cb, $caller];	825	$EXTCMD{$name} = $cb;
943	}	826	}
944		827
945	cf::player->attach (	828	cf::player->attach (
946	on_command => sub {	829	on_command => sub {
947	my ($pl, $name, $params) = @_;	830	my ($pl, $name, $params) = @_;
…		…
960		843
961	my $msg = eval { from_json $buf };	844	my $msg = eval { from_json $buf };
962		845
963	if (ref $msg) {	846	if (ref $msg) {
964	if (my $cb = $EXTCMD{$msg->{msgtype}}) {	847	if (my $cb = $EXTCMD{$msg->{msgtype}}) {
965	if (my %reply = $cb->[0]->($pl, $msg)) {	848	if (my %reply = $cb->($pl, $msg)) {
966	$pl->ext_reply ($msg->{msgid}, %reply);	849	$pl->ext_reply ($msg->{msgid}, %reply);
967	}	850	}
968	}	851	}
969	} else {	852	} else {
970	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	853	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
…		…
972		855
973	cf::override;	856	cf::override;
974	},	857	},
975	);	858	);
976		859
977	sub register {
978	my ($base, $pkg) = @_;
979
980	#TODO
981	}
982
983	sub load_extension {	860	sub load_extension {
984	my ($path) = @_;	861	my ($path) = @_;
985		862
986	$path =~ /([^\/\\]+)\.ext$/ or die "$path";	863	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
987	my $base = $1;	864	my $base = $1;
988	my $pkg = $1;	865	my $pkg = $1;
989	$pkg =~ s/[^[:word:]]/_/g;	866	$pkg =~ s/[^[:word:]]/_/g;
990	$pkg = "ext::$pkg";	867	$pkg = "ext::$pkg";
991		868
992	warn "loading '$path' into '$pkg'\n";	869	warn "... loading '$path' into '$pkg'\n";
993		870
994	open my $fh, "<:utf8", $path	871	open my $fh, "<:utf8", $path
995	or die "$path: $!";	872	or die "$path: $!";
996		873
997	my $source =	874	my $source =
998	"package $pkg; use strict; use utf8;\n"	875	"package $pkg; use strict; use utf8;\n"
999	. "#line 1 \"$path\"\n{\n"	876	. "#line 1 \"$path\"\n{\n"
1000	. (do { local $/; <$fh> })	877	. (do { local $/; <$fh> })
1001	. "\n};\n1";	878	. "\n};\n1";
1002		879
1003	eval $source	880	unless (eval $source) {
1004	or die $@ ? "$path: $@\n"	881	my $msg = $@ ? "$path: $@\n"
1005	: "extension disabled.\n";	882	: "extension disabled.\n";
1006		883	if ($source =~ /^#!.perl.#.*MANDATORY/m) { # ugly match
1007	push @exts, $pkg;	884	warn $@;
1008	$ext_pkg{$base} = $pkg;	885	warn "mandatory extension failed to load, exiting.\n";
1009		886	exit 1;
1010	# no strict 'refs';	887	}
1011	# @{"$pkg\::ISA"} = ext::;	888	die $@;
1012
1013	register $base, $pkg;
1014	}
1015
1016	sub unload_extension {
1017	my ($pkg) = @_;
1018
1019	warn "removing extension $pkg\n";
1020
1021	# remove hooks
1022	#TODO
1023	# for my $idx (0 .. $#PLUGIN_EVENT) {
1024	# delete $hook[$idx]{$pkg};
1025	# }	889	}
1026		890
1027	# remove commands	891	push @EXTS, $pkg;
1028	for my $name (keys %COMMAND) {
1029	my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1030
1031	if (@cb) {
1032	$COMMAND{$name} = \@cb;
1033	} else {
1034	delete $COMMAND{$name};
1035	}
1036	}
1037
1038	# remove extcmds
1039	for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1040	delete $EXTCMD{$name};
1041	}
1042
1043	if (my $cb = $pkg->can ("unload")) {
1044	eval {
1045	$cb->($pkg);
1046	1
1047	} or warn "$pkg unloaded, but with errors: $@";
1048	}
1049
1050	Symbol::delete_package $pkg;
1051	}	892	}
1052		893
1053	sub load_extensions {	894	sub load_extensions {
1054	for my $ext (<$LIBDIR/*.ext>) {	895	for my $ext (<$LIBDIR/*.ext>) {
1055	next unless -r $ext;	896	next unless -r $ext;
…		…
1073	};	914	};
1074		915
1075	cf::map->attach (prio => -10000, package => cf::mapsupport::);	916	cf::map->attach (prio => -10000, package => cf::mapsupport::);
1076		917
1077	#############################################################################	918	#############################################################################
1078	# load/save perl data associated with player->ob objects
1079
1080	sub all_objects(@) {
1081	@_, map all_objects ($_->inv), @_
1082	}
1083
1084	# TODO: compatibility cruft, remove when no longer needed
1085	cf::player->attach (
1086	on_load => sub {
1087	my ($pl, $path) = @_;
1088
1089	for my $o (all_objects $pl->ob) {
1090	if (my $value = $o->get_ob_key_value ("_perl_data")) {
1091	$o->set_ob_key_value ("_perl_data");
1092
1093	%$o = %{ Storable::thaw pack "H*", $value };
1094	}
1095	}
1096	},
1097	);
1098
1099	#############################################################################
1100		919
1101	=head2 CORE EXTENSIONS	920	=head2 CORE EXTENSIONS
1102		921
1103	Functions and methods that extend core crossfire objects.	922	Functions and methods that extend core crossfire objects.
1104		923
		924	=cut
		925
		926	package cf::player;
		927
		928	use Coro::AIO;
		929
1105	=head3 cf::player	930	=head3 cf::player
1106		931
1107	=over 4	932	=over 4
1108		933
1109	=item cf::player::exists $login	934	=item cf::player::find $login
1110		935
1111	Returns true when the given account exists.	936	Returns the given player object, loading it if necessary (might block).
1112		937
1113	=cut	938	=cut
1114		939
1115	sub cf::player::exists($) {	940	sub playerdir($) {
1116	cf::player::find $_[0]	941	cf::localdir
1117	or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2;	942	. "/"
		943	. cf::playerdir
		944	. "/"
		945	. (ref $_[0] ? $_[0]->ob->name : $_[0])
		946	}
		947
		948	sub path($) {
		949	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
		950
		951	(playerdir $login) . "/$login.pl"
		952	}
		953
		954	sub find_active($) {
		955	$cf::PLAYER{$_[0]}
		956	and $cf::PLAYER{$_[0]}->active
		957	and $cf::PLAYER{$_[0]}
		958	}
		959
		960	sub exists($) {
		961	my ($login) = @_;
		962
		963	$cf::PLAYER{$login}
		964	or cf::sync_job { !aio_stat $login }
		965	}
		966
		967	sub find($) {
		968	return $cf::PLAYER{$_[0]} \|\| do {
		969	my $login = $_[0];
		970
		971	my $guard = cf::lock_acquire "user_find:$login";
		972
		973	$cf::PLAYER{$_[0]} \|\| do {
		974	my $pl = load_pl path $login
		975	or return;
		976	$cf::PLAYER{$login} = $pl
		977	}
		978	}
		979	}
		980
		981	sub save($) {
		982	my ($pl) = @_;
		983
		984	return if $pl->{deny_save};
		985
		986	my $path = path $pl;
		987	my $guard = cf::lock_acquire "user_save:$path";
		988
		989	return if $pl->{deny_save};
		990
		991	aio_mkdir playerdir $pl, 0770;
		992	$pl->{last_save} = $cf::RUNTIME;
		993
		994	$pl->save_pl ($path);
		995	Coro::cede;
		996	}
		997
		998	sub new($) {
		999	my ($login) = @_;
		1000
		1001	my $self = create;
		1002
		1003	$self->ob->name ($login);
		1004	$self->{deny_save} = 1;
		1005
		1006	$cf::PLAYER{$login} = $self;
		1007
		1008	$self
		1009	}
		1010
		1011	=item $pl->quit_character
		1012
		1013	Nukes the player without looking back. If logged in, the connection will
		1014	be destroyed. May block for a long time.
		1015
		1016	=cut
		1017
		1018	sub quit_character {
		1019	my ($pl) = @_;
		1020
		1021	$pl->{deny_save} = 1;
		1022	$pl->password ("*"); # this should lock out the player until we nuked the dir
		1023
		1024	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
		1025	$pl->deactivate;
		1026	$pl->invoke (cf::EVENT_PLAYER_QUIT);
		1027	$pl->ns->destroy if $pl->ns;
		1028
		1029	my $path = playerdir $pl;
		1030	my $temp = "$path~$cf::RUNTIME~deleting~";
		1031	aio_rename $path, $temp;
		1032	delete $cf::PLAYER{$pl->ob->name};
		1033	$pl->destroy;
		1034	IO::AIO::aio_rmtree $temp;
		1035	}
		1036
		1037	=item cf::player::list_logins
		1038
		1039	Returns am arrayref of all valid playernames in the system, can take a
		1040	while and may block, so not sync_job-capable, ever.
		1041
		1042	=cut
		1043
		1044	sub list_logins {
		1045	my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
		1046	or return [];
		1047
		1048	my @logins;
		1049
		1050	for my $login (@$dirs) {
		1051	my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
		1052	aio_read $fh, 0, 512, my $buf, 0 or next;
		1053	$buf !~ /^password -------------$/m or next; # official not-valid tag
		1054
		1055	utf8::decode $login;
		1056	push @logins, $login;
		1057	}
		1058
		1059	\@logins
		1060	}
		1061
		1062	=item $player->maps
		1063
		1064	Returns an arrayref of map paths that are private for this
		1065	player. May block.
		1066
		1067	=cut
		1068
		1069	sub maps($) {
		1070	my ($pl) = @_;
		1071
		1072	my $files = aio_readdir playerdir $pl
		1073	or return;
		1074
		1075	my @paths;
		1076
		1077	for (@$files) {
		1078	utf8::decode $_;
		1079	next if /\.(?:pl\|pst)$/;
		1080	next unless /^$PATH_SEP/o;
		1081
		1082	push @paths, "~" . $pl->ob->name . "/" . $_;
		1083	}
		1084
		1085	\@paths
1118	}	1086	}
1119		1087
1120	=item $player->ext_reply ($msgid, $msgtype, %msg)	1088	=item $player->ext_reply ($msgid, $msgtype, %msg)
1121		1089
1122	Sends an ext reply to the player.	1090	Sends an ext reply to the player.
1123		1091
1124	=cut	1092	=cut
1125		1093
1126	sub cf::player::ext_reply($$$%) {	1094	sub ext_reply($$$%) {
1127	my ($self, $id, %msg) = @_;	1095	my ($self, $id, %msg) = @_;
1128		1096
1129	$msg{msgid} = $id;	1097	$msg{msgid} = $id;
1130		1098
1131	$self->send ("ext " . to_json \%msg);	1099	$self->send ("ext " . cf::to_json \%msg);
1132	}	1100	}
		1101
		1102	package cf;
1133		1103
1134	=back	1104	=back
1135		1105
1136		1106
1137	=head3 cf::map	1107	=head3 cf::map
…		…
1143	package cf::map;	1113	package cf::map;
1144		1114
1145	use Fcntl;	1115	use Fcntl;
1146	use Coro::AIO;	1116	use Coro::AIO;
1147		1117
		1118	use overload
		1119	'""' => \&as_string;
		1120
1148	our $MAX_RESET = 3600;	1121	our $MAX_RESET = 3600;
1149	our $DEFAULT_RESET = 3000;	1122	our $DEFAULT_RESET = 3000;
1150		1123
1151	sub generate_random_map {	1124	sub generate_random_map {
1152	my ($path, $rmp) = @_;	1125	my ($self, $rmp) = @_;
1153		1126
1154	# mit "rum" bekleckern, nicht	1127	# mit "rum" bekleckern, nicht
1155	cf::map::_create_random_map	1128	$self->_create_random_map (
1156	$path,
1157	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},	1129	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1158	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},	1130	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1159	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},	1131	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1160	$rmp->{exit_on_final_map},	1132	$rmp->{exit_on_final_map},
1161	$rmp->{xsize}, $rmp->{ysize},	1133	$rmp->{xsize}, $rmp->{ysize},
1162	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},	1134	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1163	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},	1135	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1164	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},	1136	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1165	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},	1137	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1166	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},	1138	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1167	(cf::region::find $rmp->{region})	1139	(cf::region::find $rmp->{region}), $rmp->{custom}
		1140	)
		1141	}
		1142
		1143	sub register {
		1144	my (undef, $regex) = @_;
		1145	my $pkg = caller;
		1146
		1147	no strict;
		1148	push @{"$pkg\::ISA"}, __PACKAGE__;
		1149
		1150	$EXT_MAP{$pkg} = qr<$regex>;
		1151	}
		1152
		1153	# also paths starting with '/'
		1154	$EXT_MAP{"cf::map"} = qr{^(?=/)};
		1155
		1156	sub normalise {
		1157	my ($path, $base) = @_;
		1158
		1159	# map plan:
		1160	#
		1161	# /! non-realised random map exit (special hack!)
		1162	# {... are special paths that are not being touched
		1163	# ?xxx/... are special absolute paths
		1164	# ?random/... random maps
		1165	# /... normal maps
		1166	# ~user/... per-player map of a specific user
		1167
		1168	$path =~ s/$PATH_SEP/\//go;
		1169
		1170	# treat it as relative path if it starts with
		1171	# something that looks reasonable
		1172	if ($path =~ m{^(?:\./\|\.\./\|\w)}) {
		1173	$base or Carp::carp "normalise called with relative path and no base: '$path'";
		1174
		1175	$base =~ s{[^/]+/?$}{};
		1176	$path = "$base/$path";
		1177	}
		1178
		1179	for ($path) {
		1180	redo if s{//}{/};
		1181	redo if s{/\.?/}{/};
		1182	redo if s{/[^/]+/\.\./}{/};
		1183	}
		1184
		1185	$path
		1186	}
		1187
		1188	sub new_from_path {
		1189	my (undef, $path, $base) = @_;
		1190
		1191	return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
		1192
		1193	$path = normalise $path, $base;
		1194
		1195	for my $pkg (keys %EXT_MAP) {
		1196	if ($path =~ $EXT_MAP{$pkg}) {
		1197	my $self = bless cf::map::new, $pkg;
		1198	$self->{path} = $path; $self->path ($path);
		1199	$self->init; # pass $1 etc.
		1200	return $self;
		1201	}
		1202	}
		1203
		1204	Carp::carp "unable to resolve path '$path'.";
		1205	()
		1206	}
		1207
		1208	sub init {
		1209	my ($self) = @_;
		1210
		1211	$self
		1212	}
		1213
		1214	sub as_string {
		1215	my ($self) = @_;
		1216
		1217	"$self->{path}"
		1218	}
		1219
		1220	# the displayed name, this is a one way mapping
		1221	sub visible_name {
		1222	&as_string
		1223	}
		1224
		1225	# escape the /'s in the path
		1226	sub _escaped_path {
		1227	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
		1228
		1229	$path
		1230	}
		1231
		1232	# the original (read-only) location
		1233	sub load_path {
		1234	my ($self) = @_;
		1235
		1236	sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
		1237	}
		1238
		1239	# the temporary/swap location
		1240	sub save_path {
		1241	my ($self) = @_;
		1242
		1243	sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $self->_escaped_path
		1244	}
		1245
		1246	# the unique path, undef == no special unique path
		1247	sub uniq_path {
		1248	my ($self) = @_;
		1249
		1250	sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
1168	}	1251	}
1169		1252
1170	# and all this just because we cannot iterate over	1253	# and all this just because we cannot iterate over
1171	# all maps in C++...	1254	# all maps in C++...
1172	sub change_all_map_light {	1255	sub change_all_map_light {
…		…
1174		1257
1175	$_->change_map_light ($change)	1258	$_->change_map_light ($change)
1176	for grep $_->outdoor, values %cf::MAP;	1259	for grep $_->outdoor, values %cf::MAP;
1177	}	1260	}
1178		1261
		1262	sub unlink_save {
		1263	my ($self) = @_;
		1264
		1265	utf8::encode (my $save = $self->save_path);
		1266	IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
		1267	IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
		1268	}
		1269
1179	sub try_load_header($) {	1270	sub load_header_from($) {
1180	my ($path) = @_;	1271	my ($self, $path) = @_;
1181		1272
1182	utf8::encode $path;	1273	utf8::encode $path;
1183	aio_open $path, O_RDONLY, 0	1274	aio_open $path, O_RDONLY, 0
1184	or return;	1275	or return;
1185		1276
1186	my $map = cf::map::new	1277	$self->_load_header ($path)
1187	or return;	1278	or return;
1188		1279
1189	$map->load_header ($path)	1280	$self->{load_path} = $path;
		1281
		1282	1
		1283	}
		1284
		1285	sub load_orig {
		1286	my ($self) = @_;
		1287
		1288	$self->load_header_from ($self->load_path)
		1289	}
		1290
		1291	sub load_temp {
		1292	my ($self) = @_;
		1293
		1294	$self->load_header_from ($self->save_path)
		1295	}
		1296
		1297	sub load_header {
		1298	my ($self) = @_;
		1299
		1300	if ($self->load_temp) {
		1301	$self->last_access ((delete $self->{last_access})
		1302	\|\| $cf::RUNTIME); #d#
		1303	# safety
		1304	$self->{instantiate_time} = $cf::RUNTIME
		1305	if $self->{instantiate_time} > $cf::RUNTIME;
		1306	} else {
		1307	$self->load_orig
1190	or return;	1308	or return;
1191		1309
1192	$map->{load_path} = $path;	1310	$self->{load_original} = 1;
		1311	$self->{instantiate_time} = $cf::RUNTIME;
		1312	$self->last_access ($cf::RUNTIME);
		1313	$self->instantiate;
		1314	}
1193		1315
1194	$map	1316	1
1195	}	1317	}
1196		1318
1197	sub find;	1319	sub find;
1198	sub find {	1320	sub find {
1199	my ($path, $origin) = @_;	1321	my ($path, $origin) = @_;
1200		1322
1201	#warn "find<$path,$origin>\n";#d#
1202
1203	$path = new cf::path $path, $origin && $origin->path;	1323	$path = normalise $path, $origin && $origin->path;
1204	my $key = $path->as_string;
1205		1324
1206	cf::lock_wait "map_find:$key";	1325	cf::lock_wait "map_find:$path";
1207		1326
1208	$cf::MAP{$key} \|\| do {	1327	$cf::MAP{$path} \|\| do {
1209	my $guard = cf::lock_acquire "map_find:$key";	1328	my $guard = cf::lock_acquire "map_find:$path";
1210		1329	my $map = new_from_path cf::map $path
1211	# do it the slow way
1212	my $map = try_load_header $path->save_path;
1213
1214	Coro::cede;
1215
1216	if ($map) {
1217	$map->last_access ((delete $map->{last_access})
1218	\|\| $cf::RUNTIME); #d#
1219	# safety
1220	$map->{instantiate_time} = $cf::RUNTIME
1221	if $map->{instantiate_time} > $cf::RUNTIME;
1222	} else {
1223	if (my $rmp = $path->random_map_params) {
1224	$map = generate_random_map $key, $rmp;
1225	} else {
1226	$map = try_load_header $path->load_path;
1227	}
1228
1229	$map or return;	1330	or return;
1230		1331
1231	$map->{load_original} = 1;
1232	$map->{instantiate_time} = $cf::RUNTIME;
1233	$map->last_access ($cf::RUNTIME);
1234	$map->instantiate;
1235
1236	# per-player maps become, after loading, normal maps
1237	$map->per_player (0) if $path->{user_rel};
1238	}
1239
1240	$map->path ($key);
1241	$map->{path} = $path;
1242	$map->{last_save} = $cf::RUNTIME;	1332	$map->{last_save} = $cf::RUNTIME;
1243		1333
1244	Coro::cede;	1334	$map->load_header
		1335	or return;
1245		1336
1246	if ($map->should_reset) {	1337	if ($map->should_reset) {
1247	$map->reset;	1338	$map->reset;
1248	undef $guard;	1339	undef $guard;
1249	$map = find $path	1340	$map = find $path
1250	or return;	1341	or return;
1251	}	1342	}
1252		1343
1253	$cf::MAP{$key} = $map	1344	$cf::MAP{$path} = $map
1254	}	1345	}
1255	}	1346	}
1256		1347
1257	sub load {	1348	sub load {
1258	my ($self) = @_;	1349	my ($self) = @_;
1259		1350
1260	my $path = $self->{path};	1351	my $path = $self->{path};
1261	my $guard = cf::lock_acquire "map_load:" . $path->as_string;	1352	my $guard = cf::lock_acquire "map_load:$path";
1262		1353
1263	return if $self->in_memory != cf::MAP_SWAPPED;	1354	return if $self->in_memory != cf::MAP_SWAPPED;
1264		1355
1265	$self->in_memory (cf::MAP_LOADING);	1356	$self->in_memory (cf::MAP_LOADING);
1266		1357
1267	$self->alloc;	1358	$self->alloc;
1268	$self->load_objects ($self->{load_path}, 1)	1359	$self->_load_objects ($self->{load_path}, 1)
1269	or return;	1360	or return;
1270		1361
1271	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1362	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1272	if delete $self->{load_original};	1363	if delete $self->{load_original};
1273		1364
1274	if (my $uniq = $path->uniq_path) {	1365	if (my $uniq = $self->uniq_path) {
1275	utf8::encode $uniq;	1366	utf8::encode $uniq;
1276	if (aio_open $uniq, O_RDONLY, 0) {	1367	if (aio_open $uniq, O_RDONLY, 0) {
1277	$self->clear_unique_items;	1368	$self->clear_unique_items;
1278	$self->load_objects ($uniq, 0);	1369	$self->_load_objects ($uniq, 0);
1279	}	1370	}
1280	}	1371	}
1281		1372
1282	Coro::cede;	1373	Coro::cede;
1283		1374
1284	# now do the right thing for maps	1375	# now do the right thing for maps
1285	$self->link_multipart_objects;	1376	$self->link_multipart_objects;
1286		1377
1287	if ($self->{path}->is_style_map) {	1378	unless ($self->{deny_activate}) {
1288	$self->{deny_save} = 1;	1379	$self->decay_objects;
1289	$self->{deny_reset} = 1;
1290	} else {
1291	$self->fix_auto_apply;	1380	$self->fix_auto_apply;
1292	$self->decay_objects;
1293	$self->update_buttons;	1381	$self->update_buttons;
		1382	Coro::cede;
1294	$self->set_darkness_map;	1383	$self->set_darkness_map;
1295	$self->difficulty ($self->estimate_difficulty)	1384	$self->difficulty ($self->estimate_difficulty)
1296	unless $self->difficulty;	1385	unless $self->difficulty;
		1386	Coro::cede;
1297	$self->activate;	1387	$self->activate;
1298	}	1388	}
1299		1389
1300	Coro::cede;
1301
1302	$self->in_memory (cf::MAP_IN_MEMORY);	1390	$self->in_memory (cf::MAP_IN_MEMORY);
		1391	}
		1392
		1393	sub customise_for {
		1394	my ($self, $ob) = @_;
		1395
		1396	return find "~" . $ob->name . "/" . $self->{path}
		1397	if $self->per_player;
		1398
		1399	$self
		1400	}
		1401
		1402	# find and load all maps in the 3x3 area around a map
		1403	sub load_diag {
		1404	my ($map) = @_;
		1405
		1406	my @diag; # diagonal neighbours
		1407
		1408	for (0 .. 3) {
		1409	my $neigh = $map->tile_path ($_)
		1410	or next;
		1411	$neigh = find $neigh, $map
		1412	or next;
		1413	$neigh->load;
		1414
		1415	push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
		1416	[$neigh->tile_path (($_ + 1) % 4), $neigh];
		1417	}
		1418
		1419	for (@diag) {
		1420	my $neigh = find @$_
		1421	or next;
		1422	$neigh->load;
		1423	}
1303	}	1424	}
1304		1425
1305	sub find_sync {	1426	sub find_sync {
1306	my ($path, $origin) = @_;	1427	my ($path, $origin) = @_;
1307		1428
1308	cf::sync_job { cf::map::find $path, $origin }	1429	cf::sync_job { find $path, $origin }
1309	}	1430	}
1310		1431
1311	sub do_load_sync {	1432	sub do_load_sync {
1312	my ($map) = @_;	1433	my ($map) = @_;
1313		1434
1314	cf::sync_job { $map->load };	1435	cf::sync_job { $map->load };
1315	}	1436	}
1316		1437
		1438	our %MAP_PREFETCH;
		1439	our $MAP_PREFETCHER = Coro::async {
		1440	while () {
		1441	for my $path (keys %MAP_PREFETCH) {
		1442	my $map = find $path
		1443	or next;
		1444	$map->load;
		1445
		1446	delete $MAP_PREFETCH{$path};
		1447	}
		1448	Coro::schedule;
		1449	}
		1450	};
		1451
		1452	sub find_async {
		1453	my ($path, $origin) = @_;
		1454
		1455	$path = normalise $path, $origin && $origin->{path};
		1456
		1457	if (my $map = $cf::MAP{$path}) {
		1458	return $map if $map->in_memory == cf::MAP_IN_MEMORY;
		1459	}
		1460
		1461	$MAP_PREFETCH{$path} = 0;
		1462	$MAP_PREFETCHER->ready;
		1463
		1464	()
		1465	}
		1466
1317	sub save {	1467	sub save {
1318	my ($self) = @_;	1468	my ($self) = @_;
1319		1469
		1470	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1471
1320	$self->{last_save} = $cf::RUNTIME;	1472	$self->{last_save} = $cf::RUNTIME;
1321		1473
1322	return unless $self->dirty;	1474	return unless $self->dirty;
1323		1475
1324	my $save = $self->{path}->save_path; utf8::encode $save;	1476	my $save = $self->save_path; utf8::encode $save;
1325	my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;	1477	my $uniq = $self->uniq_path; utf8::encode $uniq;
1326		1478
1327	$self->{load_path} = $save;	1479	$self->{load_path} = $save;
1328		1480
1329	return if $self->{deny_save};	1481	return if $self->{deny_save};
1330		1482
1331	local $self->{last_access} = $self->last_access;#d#	1483	local $self->{last_access} = $self->last_access;#d#
1332		1484
		1485	cf::async {
		1486	$_->contr->save for $self->players;
		1487	};
		1488
1333	if ($uniq) {	1489	if ($uniq) {
1334	$self->save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);	1490	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS);
1335	$self->save_objects ($uniq, cf::IO_UNIQUES);	1491	$self->_save_objects ($uniq, cf::IO_UNIQUES);
1336	} else {	1492	} else {
1337	$self->save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS \| cf::IO_UNIQUES);	1493	$self->_save_objects ($save, cf::IO_HEADER \| cf::IO_OBJECTS \| cf::IO_UNIQUES);
1338	}	1494	}
1339	}	1495	}
1340		1496
1341	sub swap_out {	1497	sub swap_out {
1342	my ($self) = @_;	1498	my ($self) = @_;
1343		1499
1344	# save first because save cedes	1500	# save first because save cedes
1345	$self->save;	1501	$self->save;
		1502
		1503	my $lock = cf::lock_acquire "map_data:" . $self->path;
1346		1504
1347	return if $self->players;	1505	return if $self->players;
1348	return if $self->in_memory != cf::MAP_IN_MEMORY;	1506	return if $self->in_memory != cf::MAP_IN_MEMORY;
1349	return if $self->{deny_save};	1507	return if $self->{deny_save};
1350		1508
…		…
1354		1512
1355	sub reset_at {	1513	sub reset_at {
1356	my ($self) = @_;	1514	my ($self) = @_;
1357		1515
1358	# TODO: safety, remove and allow resettable per-player maps	1516	# TODO: safety, remove and allow resettable per-player maps
1359	return 1e99 if $self->{path}{user_rel};	1517	return 1e99 if $self->isa ("ext::map_per_player");
1360	return 1e99 if $self->{deny_reset};	1518	return 1e99 if $self->{deny_reset};
1361		1519
1362	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;	1520	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1363	my $to = List::Util::min $MAX_RESET, $self->reset_timeout \|\| $DEFAULT_RESET;	1521	my $to = List::Util::min $MAX_RESET, $self->reset_timeout \|\| $DEFAULT_RESET;
1364		1522
…		…
1369	my ($self) = @_;	1527	my ($self) = @_;
1370		1528
1371	$self->reset_at <= $cf::RUNTIME	1529	$self->reset_at <= $cf::RUNTIME
1372	}	1530	}
1373		1531
1374	sub unlink_save {
1375	my ($self) = @_;
1376
1377	utf8::encode (my $save = $self->{path}->save_path);
1378	aioreq_pri 3; IO::AIO::aio_unlink $save;
1379	aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1380	}
1381
1382	sub rename {	1532	sub rename {
1383	my ($self, $new_path) = @_;	1533	my ($self, $new_path) = @_;
1384		1534
		1535	normalise $new_path;
		1536
1385	$self->unlink_save;	1537	$self->unlink_save;
1386		1538
1387	delete $cf::MAP{$self->path};	1539	delete $cf::MAP{$self->path};
1388	$self->{path} = new cf::path $new_path;	1540	$self->{path} = $new_path; $self->path ($self->{path});
1389	$self->path ($self->{path}->as_string);
1390	$cf::MAP{$self->path} = $self;	1541	$cf::MAP{$self->path} = $self;
1391		1542
1392	$self->save;	1543	$self->save;
1393	}	1544	}
1394		1545
1395	sub reset {	1546	sub reset {
1396	my ($self) = @_;	1547	my ($self) = @_;
1397		1548
		1549	my $lock = cf::lock_acquire "map_data:" . $self->path;
		1550
1398	return if $self->players;	1551	return if $self->players;
1399	return if $self->{path}{user_rel};#d#	1552	return if $self->isa ("ext::map_per_player");#d#
1400		1553
1401	warn "resetting map ", $self->path;#d#	1554	warn "resetting map ", $self->path;#d#
1402		1555
1403	delete $cf::MAP{$self->path};	1556	delete $cf::MAP{$self->path};
1404		1557
…		…
1417	$self->reset_timeout (1);	1570	$self->reset_timeout (1);
1418	$self->rename ("{nuke}/" . ($nuke_counter++));	1571	$self->rename ("{nuke}/" . ($nuke_counter++));
1419	$self->reset; # polite request, might not happen	1572	$self->reset; # polite request, might not happen
1420	}	1573	}
1421		1574
1422	sub customise_for {	1575	=item cf::map::unique_maps
1423	my ($map, $ob) = @_;
1424		1576
1425	if ($map->per_player) {	1577	Returns an arrayref of paths of all shared maps that have
1426	return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};	1578	instantiated unique items. May block.
1427	}
1428		1579
1429	$map	1580	=cut
1430	}
1431		1581
1432	sub emergency_save {	1582	sub unique_maps() {
1433	my $freeze_guard = cf::freeze_mainloop;	1583	my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
		1584	or return;
1434		1585
1435	warn "enter emergency map save\n";	1586	my @paths;
1436		1587
1437	cf::sync_job {	1588	for (@$files) {
1438	warn "begin emergency map save\n";	1589	utf8::decode $_;
1439	$_->save for values %cf::MAP;	1590	next if /\.pst$/;
		1591	next unless /^$PATH_SEP/o;
		1592
		1593	push @paths, $_;
1440	};	1594	}
1441		1595
1442	warn "end emergency map save\n";	1596	\@paths
1443	}	1597	}
1444		1598
1445	package cf;	1599	package cf;
1446		1600
1447	=back	1601	=back
1448		1602
		1603	=head3 cf::object
		1604
		1605	=cut
		1606
		1607	package cf::object;
		1608
		1609	=over 4
		1610
		1611	=item $ob->inv_recursive
		1612
		1613	Returns the inventory of the object _and_ their inventories, recursively.
		1614
		1615	=cut
		1616
		1617	sub inv_recursive_;
		1618	sub inv_recursive_ {
		1619	map { $_, inv_recursive_ $_->inv } @_
		1620	}
		1621
		1622	sub inv_recursive {
		1623	inv_recursive_ inv $_[0]
		1624	}
		1625
		1626	package cf;
		1627
		1628	=back
1449		1629
1450	=head3 cf::object::player	1630	=head3 cf::object::player
1451		1631
1452	=over 4	1632	=over 4
1453		1633
…		…
1493		1673
1494	=item $player_object->enter_link	1674	=item $player_object->enter_link
1495		1675
1496	Freezes the player and moves him/her to a special map (C<{link}>).	1676	Freezes the player and moves him/her to a special map (C<{link}>).
1497		1677
1498	The player should be reaosnably safe there for short amounts of time. You	1678	The player should be reasonably safe there for short amounts of time. You
1499	I<MUST> call C<leave_link> as soon as possible, though.	1679	I<MUST> call C<leave_link> as soon as possible, though.
1500		1680
		1681	Will never block.
		1682
1501	=item $player_object->leave_link ($map, $x, $y)	1683	=item $player_object->leave_link ($map, $x, $y)
1502		1684
1503	Moves the player out of the specila link map onto the given map. If the	1685	Moves the player out of the special C<{link}> map onto the specified
1504	map is not valid (or omitted), the player will be moved back to the	1686	map. If the map is not valid (or omitted), the player will be moved back
1505	location he/she was before the call to C<enter_link>, or, if that fails,	1687	to the location he/she was before the call to C<enter_link>, or, if that
1506	to the emergency map position.	1688	fails, to the emergency map position.
1507		1689
1508	Might block.	1690	Might block.
1509		1691
1510	=cut	1692	=cut
		1693
		1694	sub link_map {
		1695	unless ($LINK_MAP) {
		1696	$LINK_MAP = cf::map::find "{link}"
		1697	or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
		1698	$LINK_MAP->load;
		1699	}
		1700
		1701	$LINK_MAP
		1702	}
1511		1703
1512	sub cf::object::player::enter_link {	1704	sub cf::object::player::enter_link {
1513	my ($self) = @_;	1705	my ($self) = @_;
1514		1706
1515	$self->deactivate_recursive;	1707	$self->deactivate_recursive;
1516		1708
1517	return if $self->map == $LINK_MAP;	1709	return if UNIVERSAL::isa $self->map, "ext::map_link";
1518		1710
1519	$self->{_link_pos} \|\|= [$self->map->{path}, $self->x, $self->y]	1711	$self->{_link_pos} \|\|= [$self->map->{path}, $self->x, $self->y]
1520	if $self->map;	1712	if $self->map;
1521		1713
1522	$self->enter_map ($LINK_MAP, 20, 20);	1714	$self->enter_map ($LINK_MAP \|\| link_map, 20, 20);
1523	}	1715	}
1524		1716
1525	sub cf::object::player::leave_link {	1717	sub cf::object::player::leave_link {
1526	my ($self, $map, $x, $y) = @_;	1718	my ($self, $map, $x, $y) = @_;
1527		1719
…		…
1545	# use -1 or undef as default coordinates, not 0, 0	1737	# use -1 or undef as default coordinates, not 0, 0
1546	($x, $y) = ($map->enter_x, $map->enter_y)	1738	($x, $y) = ($map->enter_x, $map->enter_y)
1547	if $x <=0 && $y <= 0;	1739	if $x <=0 && $y <= 0;
1548		1740
1549	$map->load;	1741	$map->load;
		1742	$map->load_diag;
1550		1743
		1744	return unless $self->contr->active;
1551	$self->activate_recursive;	1745	$self->activate_recursive;
1552	$self->enter_map ($map, $x, $y);	1746	$self->enter_map ($map, $x, $y);
1553	}	1747	}
1554		1748
1555	cf::player->attach (	1749	cf::player->attach (
…		…
1568		1762
1569	# try to abort aborted map switching on player login :)	1763	# try to abort aborted map switching on player login :)
1570	# should happen only on crashes	1764	# should happen only on crashes
1571	if ($pl->ob->{_link_pos}) {	1765	if ($pl->ob->{_link_pos}) {
1572	$pl->ob->enter_link;	1766	$pl->ob->enter_link;
1573	cf::async {	1767	(async {
1574	# we need this sleep as the login has a concurrent enter_exit running	1768	# we need this sleep as the login has a concurrent enter_exit running
1575	# and this sleep increases chances of the player not ending up in scorn	1769	# and this sleep increases chances of the player not ending up in scorn
		1770	$pl->ob->reply (undef,
		1771	"There was an internal problem at your last logout, "
		1772	. "the server will try to bring you to your intended destination in a second.",
		1773	cf::NDI_RED);
1576	Coro::Timer::sleep 1;	1774	Coro::Timer::sleep 1;
1577	$pl->ob->leave_link;	1775	$pl->ob->leave_link;
1578	};	1776	})->prio (2);
1579	}	1777	}
1580	},	1778	},
1581	);	1779	);
1582		1780
1583	=item $player_object->goto_map ($path, $x, $y)	1781	=item $player_object->goto ($path, $x, $y)
1584		1782
1585	=cut	1783	=cut
1586		1784
1587	sub cf::object::player::goto_map {	1785	sub cf::object::player::goto {
1588	my ($self, $path, $x, $y) = @_;	1786	my ($self, $path, $x, $y) = @_;
1589		1787
1590	$self->enter_link;	1788	$self->enter_link;
1591		1789
1592	(cf::async {	1790	(async {
1593	$path = new cf::path $path;
1594
1595	my $map = cf::map::find $path->as_string;	1791	my $map = cf::map::find $path;
1596	$map = $map->customise_for ($self) if $map;	1792	$map = $map->customise_for ($self) if $map;
1597		1793
1598	# warn "entering ", $map->path, " at ($x, $y)\n"	1794	# warn "entering ", $map->path, " at ($x, $y)\n"
1599	# if $map;	1795	# if $map;
1600		1796
1601	$map or $self->message ("The exit is closed", cf::NDI_UNIQUE \| cf::NDI_RED);	1797	$map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);
1602		1798
1603	$self->leave_link ($map, $x, $y);	1799	$self->leave_link ($map, $x, $y);
1604	})->prio (1);	1800	})->prio (1);
1605	}	1801	}
1606		1802
…		…
1659		1855
1660	return unless $self->type == cf::PLAYER;	1856	return unless $self->type == cf::PLAYER;
1661		1857
1662	$self->enter_link;	1858	$self->enter_link;
1663		1859
1664	(cf::async {	1860	(async {
1665	$self->deactivate_recursive; # just to be sure	1861	$self->deactivate_recursive; # just to be sure
1666	unless (eval {	1862	unless (eval {
1667	prepare_random_map $exit	1863	prepare_random_map $exit
1668	if $exit->slaying eq "/!";	1864	if $exit->slaying eq "/!";
1669		1865
1670	my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;	1866	my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1671	$self->goto_map ($path, $exit->stats->hp, $exit->stats->sp);	1867	$self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1672		1868
1673	1;	1869	1;
1674	}) {	1870	}) {
1675	$self->message ("Something went wrong deep within the crossfire server. "	1871	$self->message ("Something went wrong deep within the crossfire server. "
1676	. "I'll try to bring you back to the map you were before. "	1872	. "I'll try to bring you back to the map you were before. "
1677	. "Please report this to the dungeon master",	1873	. "Please report this to the dungeon master!",
1678	cf::NDI_UNIQUE \| cf::NDI_RED);	1874	cf::NDI_UNIQUE \| cf::NDI_RED);
1679		1875
1680	warn "ERROR in enter_exit: $@";	1876	warn "ERROR in enter_exit: $@";
1681	$self->leave_link;	1877	$self->leave_link;
1682	}	1878	}
…		…
1750	}	1946	}
1751	}	1947	}
1752	},	1948	},
1753	);	1949	);
1754		1950
1755	=item $client->coro (\&cb)	1951	=item $client->async (\&cb)
1756		1952
1757	Create a new coroutine, running the specified callback. The coroutine will	1953	Create a new coroutine, running the specified callback. The coroutine will
1758	be automatically cancelled when the client gets destroyed (e.g. on logout,	1954	be automatically cancelled when the client gets destroyed (e.g. on logout,
1759	or loss of connection).	1955	or loss of connection).
1760		1956
1761	=cut	1957	=cut
1762		1958
1763	sub cf::client::coro {	1959	sub cf::client::async {
1764	my ($self, $cb) = @_;	1960	my ($self, $cb) = @_;
1765		1961
1766	my $coro = &cf::async ($cb);	1962	my $coro = &Coro::async ($cb);
1767		1963
1768	$coro->on_destroy (sub {	1964	$coro->on_destroy (sub {
1769	delete $self->{_coro}{$coro+0};	1965	delete $self->{_coro}{$coro+0};
1770	});	1966	});
1771		1967
…		…
2009	local $/;	2205	local $/;
2010	*CFG = YAML::Syck::Load <$fh>;	2206	*CFG = YAML::Syck::Load <$fh>;
2011		2207
2012	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];	2208	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_105_115", 5, 37];
2013		2209
		2210	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
		2211	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
		2212
2014	if (exists $CFG{mlockall}) {	2213	if (exists $CFG{mlockall}) {
2015	eval {	2214	eval {
2016	$CFG{mlockall} ? &mlockall : &munlockall	2215	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2017	and die "WARNING: m(un)lockall failed: $!\n";	2216	and die "WARNING: m(un)lockall failed: $!\n";
2018	};	2217	};
2019	warn $@ if $@;	2218	warn $@ if $@;
2020	}	2219	}
2021	}	2220	}
2022		2221
2023	sub main {	2222	sub main {
2024	# we must not ever block the main coroutine	2223	# we must not ever block the main coroutine
2025	local $Coro::idle = sub {	2224	local $Coro::idle = sub {
2026	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	2225	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2027	(Coro::unblock_sub {
2028	Event::one_event;	2226	async { Event::one_event };
2029	})->();
2030	};	2227	};
2031		2228
2032	cfg_load;	2229	cfg_load;
2033	db_load;	2230	db_load;
2034	load_extensions;	2231	load_extensions;
2035	Event::loop;	2232	Event::loop;
2036	}	2233	}
2037		2234
2038	#############################################################################	2235	#############################################################################
2039	# initialisation	2236	# initialisation and cleanup
		2237
		2238	# install some emergency cleanup handlers
		2239	BEGIN {
		2240	for my $signal (qw(INT HUP TERM)) {
		2241	Event->signal (
		2242	data => WF_AUTOCANCEL,
		2243	signal => $signal,
		2244	cb => sub {
		2245	cf::cleanup "SIG$signal";
		2246	},
		2247	);
		2248	}
		2249	}
		2250
		2251	sub emergency_save() {
		2252	my $freeze_guard = cf::freeze_mainloop;
		2253
		2254	warn "enter emergency perl save\n";
		2255
		2256	cf::sync_job {
		2257	# use a peculiar iteration method to avoid tripping on perl
		2258	# refcount bugs in for. also avoids problems with players
		2259	# and maps saved/Destroyed asynchronously.
		2260	warn "begin emergency player save\n";
		2261	for my $login (keys %cf::PLAYER) {
		2262	my $pl = $cf::PLAYER{$login} or next;
		2263	$pl->valid or next;
		2264	$pl->save;
		2265	}
		2266	warn "end emergency player save\n";
		2267
		2268	warn "begin emergency map save\n";
		2269	for my $path (keys %cf::MAP) {
		2270	my $map = $cf::MAP{$path} or next;
		2271	$map->valid or next;
		2272	$map->save;
		2273	}
		2274	warn "end emergency map save\n";
		2275	};
		2276
		2277	warn "leave emergency perl save\n";
		2278	}
2040		2279
2041	sub reload() {	2280	sub reload() {
2042	# can/must only be called in main	2281	# can/must only be called in main
2043	if ($Coro::current != $Coro::main) {	2282	if ($Coro::current != $Coro::main) {
2044	warn "can only reload from main coroutine\n";	2283	warn "can only reload from main coroutine\n";
2045	return;	2284	return;
2046	}	2285	}
2047		2286
2048	warn "reloading...";	2287	warn "reloading...";
2049		2288
		2289	warn "freezing server";
2050	my $guard = freeze_mainloop;	2290	my $guard = freeze_mainloop;
2051	cf::emergency_save;	2291	cf::emergency_save;
2052		2292
		2293	warn "sync database to disk";
		2294	cf::db_sync;
		2295	IO::AIO::flush;
		2296
2053	eval {	2297	eval {
2054	# if anything goes wrong in here, we should simply crash as we already saved	2298	# if anything goes wrong in here, we should simply crash as we already saved
2055		2299
2056	# cancel all watchers	2300	warn "cancel all watchers";
2057	for (Event::all_watchers) {	2301	for (Event::all_watchers) {
2058	$_->cancel if $_->data & WF_AUTOCANCEL;	2302	$_->cancel if $_->data & WF_AUTOCANCEL;
2059	}	2303	}
2060		2304
2061	# cancel all extension coros	2305	warn "cancel all extension coros";
2062	$_->cancel for values %EXT_CORO;	2306	$_->cancel for values %EXT_CORO;
2063	%EXT_CORO = ();	2307	%EXT_CORO = ();
2064		2308
		2309	warn "remove commands";
		2310	%COMMAND = ();
		2311
		2312	warn "remove ext commands";
		2313	%EXTCMD = ();
		2314
2065	# unload all extensions	2315	warn "unload/nuke all extensions";
2066	for (@exts) {	2316	for my $pkg (@EXTS) {
2067	warn "unloading <$_>";	2317	warn "... unloading $pkg";
2068	unload_extension $_;	2318
		2319	if (my $cb = $pkg->can ("unload")) {
		2320	eval {
		2321	$cb->($pkg);
		2322	1
		2323	} or warn "$pkg unloaded, but with errors: $@";
2069	}	2324	}
2070		2325
		2326	warn "... nuking $pkg";
		2327	Symbol::delete_package $pkg;
		2328	}
		2329
2071	# unload all modules loaded from $LIBDIR	2330	warn "unload all perl modules loaded from $LIBDIR";
2072	while (my ($k, $v) = each %INC) {	2331	while (my ($k, $v) = each %INC) {
2073	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	2332	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2074		2333
2075	warn "removing <$k>";	2334	warn "removing <$k>";
2076	delete $INC{$k};	2335	delete $INC{$k};
…		…
2083	}	2342	}
2084		2343
2085	Symbol::delete_package $k;	2344	Symbol::delete_package $k;
2086	}	2345	}
2087		2346
2088	# sync database to disk
2089	cf::db_sync;
2090	IO::AIO::flush;
2091
2092	# get rid of safe::, as good as possible	2347	warn "get rid of safe::, as good as possible";
2093	Symbol::delete_package "safe::$_"	2348	Symbol::delete_package "safe::$_"
2094	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	2349	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2095		2350
2096	# remove register_script_function callbacks
2097	# TODO
2098
2099	# unload cf.pm "a bit"	2351	warn "unload cf.pm \"a bit\"";
2100	delete $INC{"cf.pm"};	2352	delete $INC{"cf.pm"};
2101		2353
2102	# don't, removes xs symbols, too,	2354	# don't, removes xs symbols, too,
2103	# and global variables created in xs	2355	# and global variables created in xs
2104	#Symbol::delete_package __PACKAGE__;	2356	#Symbol::delete_package __PACKAGE__;
2105		2357
2106	# reload cf.pm
2107	warn "reloading cf.pm";	2358	warn "reloading cf.pm";
2108	require cf;	2359	require cf;
2109	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	2360	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2110		2361
2111	# load config and database again	2362	warn "load config and database again";
2112	cf::cfg_load;	2363	cf::cfg_load;
2113	cf::db_load;	2364	cf::db_load;
2114		2365
2115	# load extensions
2116	warn "load extensions";	2366	warn "load extensions";
2117	cf::load_extensions;	2367	cf::load_extensions;
2118		2368
2119	# reattach attachments to objects	2369	warn "reattach attachments to objects/players";
2120	warn "reattach";
2121	_global_reattach;	2370	_global_reattach;
		2371	warn "reattach attachments to maps";
		2372	reattach $_ for values %MAP;
2122	};	2373	};
2123		2374
2124	if ($@) {	2375	if ($@) {
2125	warn $@;	2376	warn $@;
2126	warn "error while reloading, exiting.";	2377	warn "error while reloading, exiting.";
2127	exit 1;	2378	exit 1;
2128	}	2379	}
2129		2380
2130	warn "reloaded successfully";	2381	warn "reloaded";
2131	};	2382	};
2132
2133	#############################################################################
2134
2135	unless ($LINK_MAP) {
2136	$LINK_MAP = cf::map::new;
2137
2138	$LINK_MAP->width (41);
2139	$LINK_MAP->height (41);
2140	$LINK_MAP->alloc;
2141	$LINK_MAP->path ("{link}");
2142	$LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2143	$LINK_MAP->in_memory (MAP_IN_MEMORY);
2144
2145	# dirty hack because... archetypes are not yet loaded
2146	Event->timer (
2147	after => 2,
2148	cb => sub {
2149	$_[0]->w->cancel;
2150
2151	# provide some exits "home"
2152	my $exit = cf::object::new "exit";
2153
2154	$exit->slaying ($EMERGENCY_POSITION->[0]);
2155	$exit->stats->hp ($EMERGENCY_POSITION->[1]);
2156	$exit->stats->sp ($EMERGENCY_POSITION->[2]);
2157
2158	$LINK_MAP->insert ($exit->clone, 19, 19);
2159	$LINK_MAP->insert ($exit->clone, 19, 20);
2160	$LINK_MAP->insert ($exit->clone, 19, 21);
2161	$LINK_MAP->insert ($exit->clone, 20, 19);
2162	$LINK_MAP->insert ($exit->clone, 20, 21);
2163	$LINK_MAP->insert ($exit->clone, 21, 19);
2164	$LINK_MAP->insert ($exit->clone, 21, 20);
2165	$LINK_MAP->insert ($exit->clone, 21, 21);
2166
2167	$exit->destroy;
2168	});
2169
2170	$LINK_MAP->{deny_save} = 1;
2171	$LINK_MAP->{deny_reset} = 1;
2172
2173	$cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2174	}
2175
2176	register "<global>", __PACKAGE__;
2177		2383
2178	register_command "reload" => sub {	2384	register_command "reload" => sub {
2179	my ($who, $arg) = @_;	2385	my ($who, $arg) = @_;
2180		2386
2181	if ($who->flag (FLAG_WIZ)) {	2387	if ($who->flag (FLAG_WIZ)) {
…		…
2191	reentrant => 0,	2397	reentrant => 0,
2192	prio => 0,	2398	prio => 0,
2193	at => $NEXT_TICK \|\| $TICK,	2399	at => $NEXT_TICK \|\| $TICK,
2194	data => WF_AUTOCANCEL,	2400	data => WF_AUTOCANCEL,
2195	cb => sub {	2401	cb => sub {
		2402	$NOW = Event::time;
		2403
2196	cf::server_tick; # one server iteration	2404	cf::server_tick; # one server iteration
2197	$RUNTIME += $TICK;	2405	$RUNTIME += $TICK;
2198	$NEXT_TICK += $TICK;	2406	$NEXT_TICK += $TICK;
		2407
		2408	$WAIT_FOR_TICK->broadcast;
		2409	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2199		2410
2200	# if we are delayed by four ticks or more, skip them all	2411	# if we are delayed by four ticks or more, skip them all
2201	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2412	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2202		2413
2203	$TICK_WATCHER->at ($NEXT_TICK);	2414	$TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.134 by root, Thu Jan 4 17:28:49 2007 UTC vs. Revision 1.166 by root, Sat Jan 13 23:06:13 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.134 by root, Thu Jan 4 17:28:49 2007 UTC vs.
Revision 1.166 by root, Sat Jan 13 23:06:13 2007 UTC