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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.263 by root, Sat May 5 05:40:27 2007 UTC vs.
Revision 1.285 by root, Sun Jun 24 04:21:42 2007 UTC

…		…
90	our $LINK_MAP; # the special {link} map, which is always available	90	our $LINK_MAP; # the special {link} map, which is always available
91		91
92	# used to convert map paths into valid unix filenames by replacing / by ∕	92	# used to convert map paths into valid unix filenames by replacing / by ∕
93	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	93	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94		94
		95	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
		96	our $LOADAVG; # same thing, but with alpha-smoothing
		97	our $tick_start; # for load detecting purposes
		98
95	binmode STDOUT;	99	binmode STDOUT;
96	binmode STDERR;	100	binmode STDERR;
97		101
98	# read virtual server time, if available	102	# read virtual server time, if available
99	unless ($RUNTIME \|\| !-e "$LOCALDIR/runtime") {	103	unless ($RUNTIME \|\| !-e "$LOCALDIR/runtime") {
…		…
139		143
140	=item $cf::TICK	144	=item $cf::TICK
141		145
142	The interval between server ticks, in seconds.	146	The interval between server ticks, in seconds.
143		147
		148	=item $cf::LOADAVG
		149
		150	The current CPU load on the server (alpha-smoothed), as a value between 0
		151	(none) and 1 (overloaded), indicating how much time is spent on processing
		152	objects per tick. Healthy values are < 0.5.
		153
		154	=item $cf::LOAD
		155
		156	The raw value load value from the last tick.
		157
144	=item %cf::CFG	158	=item %cf::CFG
145		159
146	Configuration for the server, loaded from C</etc/crossfire/config>, or	160	Configuration for the server, loaded from C</etc/crossfire/config>, or
147	from wherever your confdir points to.	161	from wherever your confdir points to.
148		162
…		…
173	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	187	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
174	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	188	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
175	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	189	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
176	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	190	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
177	@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';	191	@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
		192	@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
178	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';	193	@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
179		194
180	# we bless all objects into (empty) derived classes to force a method lookup	195	# we bless all objects into (empty) derived classes to force a method lookup
181	# within the Safe compartment.	196	# within the Safe compartment.
182	for my $pkg (qw(	197	for my $pkg (qw(
183	cf::global cf::attachable	198	cf::global cf::attachable
…		…
191	}	206	}
192		207
193	$Event::DIED = sub {	208	$Event::DIED = sub {
194	warn "error in event callback: @_";	209	warn "error in event callback: @_";
195	};	210	};
		211
		212	#############################################################################
196		213
197	=head2 UTILITY FUNCTIONS	214	=head2 UTILITY FUNCTIONS
198		215
199	=over 4	216	=over 4
200		217
…		…
303		320
304	BEGIN { *async = \&Coro::async_pool }	321	BEGIN { *async = \&Coro::async_pool }
305		322
306	=item cf::sync_job { BLOCK }	323	=item cf::sync_job { BLOCK }
307		324
308	The design of crossfire+ requires that the main coro ($Coro::main) is	325	The design of Crossfire TRT requires that the main coroutine ($Coro::main)
309	always able to handle events or runnable, as crossfire+ is only partly	326	is always able to handle events or runnable, as Crossfire TRT is only
310	reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.	327	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
		328	acceptable.
311		329
312	If it must be done, put the blocking parts into C<sync_job>. This will run	330	If it must be done, put the blocking parts into C<sync_job>. This will run
313	the given BLOCK in another coroutine while waiting for the result. The	331	the given BLOCK in another coroutine while waiting for the result. The
314	server will be frozen during this time, so the block should either finish	332	server will be frozen during this time, so the block should either finish
315	fast or be very important.	333	fast or be very important.
…		…
318		336
319	sub sync_job(&) {	337	sub sync_job(&) {
320	my ($job) = @_;	338	my ($job) = @_;
321		339
322	if ($Coro::current == $Coro::main) {	340	if ($Coro::current == $Coro::main) {
		341	my $time = Event::time;
		342
323	# this is the main coro, too bad, we have to block	343	# this is the main coro, too bad, we have to block
324	# till the operation succeeds, freezing the server :/	344	# till the operation succeeds, freezing the server :/
325		345
326	# TODO: use suspend/resume instead	346	# TODO: use suspend/resume instead
327	# (but this is cancel-safe)	347	# (but this is cancel-safe)
…		…
338		358
339	while ($busy) {	359	while ($busy) {
340	Coro::cede or Event::one_event;	360	Coro::cede or Event::one_event;
341	}	361	}
342		362
		363	$time = Event::time - $time;
		364
		365	LOG llevError \| logBacktrace, Carp::longmess "long sync job"
		366	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
		367
		368	$tick_start += $time; # do not account sync jobs to server load
		369
343	wantarray ? @res : $res[0]	370	wantarray ? @res : $res[0]
344	} else {	371	} else {
345	# we are in another coroutine, how wonderful, everything just works	372	# we are in another coroutine, how wonderful, everything just works
346		373
347	$job->()	374	$job->()
…		…
366	$EXT_CORO{$coro+0} = $coro;	393	$EXT_CORO{$coro+0} = $coro;
367		394
368	$coro	395	$coro
369	}	396	}
370		397
371	sub write_runtime {	398	=item fork_call { }, $args
372	my $guard = cf::lock_acquire "write_runtime";
373		399
374	my $runtime = "$LOCALDIR/runtime";	400	Executes the given code block with the given arguments in a seperate
		401	process, returning the results. Everything must be serialisable with
		402	Coro::Storable. May, of course, block. Note that the executed sub may
		403	never block itself or use any form of Event handling.
375		404
376	warn "starting to write runtime...\n";#d#	405	=cut
377	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644
378	or return;
379		406
380	my $value = $cf::RUNTIME + 90 + 10;	407	sub fork_call(&@) {
381	# 10 is the runtime save interval, for a monotonic clock	408	my ($cb, @args) = @_;
382	# 60 allows for the watchdog to kill the server.
383		409
384	(aio_write $fh, 0, (length $value), $value, 0) <= 0	410	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
385	and return;	411	# or die "socketpair: $!";
		412	pipe my $fh1, my $fh2
		413	or die "pipe: $!";
386		414
387	# always fsync - this file is important	415	if (my $pid = fork) {
388	aio_fsync $fh
389	and return;
390
391	close $fh	416	close $fh2;
392	or return;
393		417
394	aio_rename "$runtime~", $runtime	418	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
395	and return;	419	$res = Coro::Storable::thaw $res;
396		420
397	warn "... done writing runtime.\n";#d#	421	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
398		422
		423	die $$res unless "ARRAY" eq ref $res;
		424
		425	return wantarray ? @$res : $res->[-1];
		426	} else {
		427	reset_signals;
		428	local $SIG{__WARN__};
		429	local $SIG{__DIE__};
		430	eval {
		431	close $fh1;
		432
		433	my @res = eval { $cb->(@args) };
		434	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
		435	};
		436
		437	warn $@ if $@;
		438	_exit 0;
399	1	439	}
		440	}
		441
		442	=item $value = cf::db_get $family => $key
		443
		444	Returns a single value from the environment database.
		445
		446	=item cf::db_put $family => $key => $value
		447
		448	Stores the given C<$value> in the family. It can currently store binary
		449	data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
		450
		451	=cut
		452
		453	our $DB;
		454
		455	sub db_init {
		456	unless ($DB) {
		457	$DB = BDB::db_create $DB_ENV;
		458
		459	cf::sync_job {
		460	eval {
		461	$DB->set_flags (BDB::CHKSUM);
		462
		463	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
		464	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
		465	cf::cleanup "db_open(db): $!" if $!;
		466	};
		467	cf::cleanup "db_open(db): $@" if $@;
		468	};
		469	}
		470	}
		471
		472	sub db_get($$) {
		473	my $key = "$_[0]/$_[1]";
		474
		475	cf::sync_job {
		476	BDB::db_get $DB, undef, $key, my $data;
		477
		478	$! ? ()
		479	: $data
		480	}
		481	}
		482
		483	sub db_put($$$) {
		484	BDB::dbreq_pri 4;
		485	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
		486	}
		487
		488	=item cf::cache $id => [$paths...], $processversion => $process
		489
		490	Generic caching function that returns the value of the resource $id,
		491	caching and regenerating as required.
		492
		493	This function can block.
		494
		495	=cut
		496
		497	sub cache {
		498	my ($id, $src, $processversion, $process) = @_;
		499
		500	my $meta =
		501	join "\x00",
		502	$processversion,
		503	map {
		504	aio_stat $_
		505	and Carp::croak "$_: $!";
		506
		507	($_, (stat _)[7,9])
		508	} @$src;
		509
		510	my $dbmeta = db_get cache => "$id/meta";
		511	if ($dbmeta ne $meta) {
		512	# changed, we may need to process
		513
		514	my @data;
		515	my $md5;
		516
		517	for (0 .. $#$src) {
		518	0 <= aio_load $src->[$_], $data[$_]
		519	or Carp::croak "$src->[$_]: $!";
		520	}
		521
		522	# if processing is expensive, check
		523	# checksum first
		524	if (1) {
		525	$md5 =
		526	join "\x00",
		527	$processversion,
		528	map {
		529	Coro::cede;
		530	($src->[$_], Digest::MD5::md5_hex $data[$_])
		531	} 0.. $#$src;
		532
		533
		534	my $dbmd5 = db_get cache => "$id/md5";
		535	if ($dbmd5 eq $md5) {
		536	db_put cache => "$id/meta", $meta;
		537
		538	return db_get cache => "$id/data";
		539	}
		540	}
		541
		542	my $t1 = Time::HiRes::time;
		543	my $data = $process->(\@data);
		544	my $t2 = Time::HiRes::time;
		545
		546	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
		547
		548	db_put cache => "$id/data", $data;
		549	db_put cache => "$id/md5" , $md5;
		550	db_put cache => "$id/meta", $meta;
		551
		552	return $data;
		553	}
		554
		555	db_get cache => "$id/data"
400	}	556	}
401		557
402	=item cf::datalog type => key => value, ...	558	=item cf::datalog type => key => value, ...
403		559
404	Log a datalog packet of the given type with the given key-value pairs.	560	Log a datalog packet of the given type with the given key-value pairs.
…		…
422	attach callbacks/event handlers (a collection of which is called an "attachment")	578	attach callbacks/event handlers (a collection of which is called an "attachment")
423	to it. All such attachable objects support the following methods.	579	to it. All such attachable objects support the following methods.
424		580
425	In the following description, CLASS can be any of C<global>, C<object>	581	In the following description, CLASS can be any of C<global>, C<object>
426	C<player>, C<client> or C<map> (i.e. the attachable objects in	582	C<player>, C<client> or C<map> (i.e. the attachable objects in
427	crossfire+).	583	Crossfire TRT).
428		584
429	=over 4	585	=over 4
430		586
431	=item $attachable->attach ($attachment, key => $value...)	587	=item $attachable->attach ($attachment, key => $value...)
432		588
…		…
595	$registry = $CB_TYPE[$object_type] \|\|= [];	751	$registry = $CB_TYPE[$object_type] \|\|= [];
596		752
597	} elsif ($type eq "subtype") {	753	} elsif ($type eq "subtype") {
598	defined $object_type or Carp::croak "subtype specified without type";	754	defined $object_type or Carp::croak "subtype specified without type";
599	my $object_subtype = shift @arg;	755	my $object_subtype = shift @arg;
600	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] \|\|= [];	756	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] \|\|= [];
601		757
602	} elsif ($type eq "package") {	758	} elsif ($type eq "package") {
603	my $pkg = shift @arg;	759	my $pkg = shift @arg;
604		760
605	while (my ($name, $id) = each %cb_id) {	761	while (my ($name, $id) = each %cb_id) {
…		…
634	_attach $registry, $klass, @attach;	790	_attach $registry, $klass, @attach;
635	}	791	}
636		792
637	$obj->{$name} = \%arg;	793	$obj->{$name} = \%arg;
638	} else {	794	} else {
639	warn "object uses attachment '$name' that is not available, postponing.\n";	795	warn "object uses attachment '$name' which is not available, postponing.\n";
640	}	796	}
641		797
642	$obj->{_attachment}{$name} = undef;	798	$obj->{_attachment}{$name} = undef;
643	}	799	}
644		800
…		…
646	if (ref $_[0]) {	802	if (ref $_[0]) {
647	_object_attach @_;	803	_object_attach @_;
648	} else {	804	} else {
649	_attach shift->_attach_registry, @_;	805	_attach shift->_attach_registry, @_;
650	}	806	}
		807	_recalc_want;
651	};	808	};
652		809
653	# all those should be optimised	810	# all those should be optimised
654	sub cf::attachable::detach {	811	sub cf::attachable::detach {
655	my ($obj, $name) = @_;	812	my ($obj, $name) = @_;
…		…
658	delete $obj->{_attachment}{$name};	815	delete $obj->{_attachment}{$name};
659	reattach ($obj);	816	reattach ($obj);
660	} else {	817	} else {
661	Carp::croak "cannot, currently, detach class attachments";	818	Carp::croak "cannot, currently, detach class attachments";
662	}	819	}
		820	_recalc_want;
663	};	821	};
664		822
665	sub cf::attachable::attached {	823	sub cf::attachable::attached {
666	my ($obj, $name) = @_;	824	my ($obj, $name) = @_;
667		825
…		…
840	or return;	998	or return;
841	$av = eval { (Storable::thaw $av)->{objs} };	999	$av = eval { (Storable::thaw $av)->{objs} };
842	}	1000	}
843		1001
844	warn sprintf "loading %s (%d)\n",	1002	warn sprintf "loading %s (%d)\n",
845	$filename, length $data, scalar @{$av \|\| []};#d#	1003	$filename, length $data, scalar @{$av \|\| []};
846	return ($data, $av);	1004	return ($data, $av);
847	}	1005	}
		1006
		1007	=head2 COMMAND CALLBACKS
		1008
		1009	=over 4
		1010
		1011	=cut
848		1012
849	#############################################################################	1013	#############################################################################
850	# command handling &c	1014	# command handling &c
851		1015
852	=item cf::register_command $name => \&callback($ob,$args);	1016	=item cf::register_command $name => \&callback($ob,$args);
…		…
865	push @{ $COMMAND{$name} }, [$caller, $cb];	1029	push @{ $COMMAND{$name} }, [$caller, $cb];
866	}	1030	}
867		1031
868	=item cf::register_extcmd $name => \&callback($pl,$packet);	1032	=item cf::register_extcmd $name => \&callback($pl,$packet);
869		1033
870	Register a callbackf ro execution when the client sends an extcmd packet.	1034	Register a callback fro execution when the client sends an extcmd packet.
871		1035
872	If the callback returns something, it is sent back as if reply was being	1036	If the callback returns something, it is sent back as if reply was being
873	called.	1037	called.
874		1038
875	=cut	1039	=cut
…		…
910		1074
911	cf::override;	1075	cf::override;
912	},	1076	},
913	);	1077	);
914		1078
915	sub load_extension {
916	my ($path) = @_;
917
918	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
919	my $base = $1;
920	my $pkg = $1;
921	$pkg =~ s/[^[:word:]]/_/g;
922	$pkg = "ext::$pkg";
923
924	warn "... loading '$path' into '$pkg'\n";
925
926	open my $fh, "<:utf8", $path
927	or die "$path: $!";
928
929	my $source =
930	"package $pkg; use strict; use utf8;\n"
931	. "#line 1 \"$path\"\n{\n"
932	. (do { local $/; <$fh> })
933	. "\n};\n1";
934
935	unless (eval $source) {
936	my $msg = $@ ? "$path: $@\n"
937	: "extension disabled.\n";
938	if ($source =~ /^#!.perl.#.*MANDATORY/m) { # ugly match
939	warn $@;
940	warn "mandatory extension failed to load, exiting.\n";
941	exit 1;
942	}
943	die $@;
944	}
945
946	push @EXTS, $pkg;
947	}
948
949	sub load_extensions {	1079	sub load_extensions {
		1080	cf::sync_job {
		1081	my %todo;
		1082
950	for my $ext (<$LIBDIR/*.ext>) {	1083	for my $path (<$LIBDIR/*.ext>) {
951	next unless -r $ext;	1084	next unless -r $path;
952	eval {	1085
953	load_extension $ext;	1086	$path =~ /([^\/\\]+)\.ext$/ or die "$path";
		1087	my $base = $1;
		1088	my $pkg = $1;
		1089	$pkg =~ s/[^[:word:]]/_/g;
		1090	$pkg = "ext::$pkg";
		1091
		1092	open my $fh, "<:utf8", $path
		1093	or die "$path: $!";
		1094
		1095	my $source = do { local $/; <$fh> };
		1096
		1097	my %ext = (
		1098	path => $path,
		1099	base => $base,
		1100	pkg => $pkg,
		1101	);
		1102
		1103	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
		1104	if $source =~ /\A#!.?perl.?#\s(.)$/m;
		1105
		1106	$ext{source} =
		1107	"package $pkg; use strict; use utf8;\n"
		1108	. "#line 1 \"$path\"\n{\n"
		1109	. $source
		1110	. "\n};\n1";
		1111
		1112	$todo{$base} = \%ext;
		1113	}
		1114
		1115	my %done;
		1116	while (%todo) {
		1117	my $progress;
		1118
		1119	while (my ($k, $v) = each %todo) {
		1120	for (split /,\s*/, $v->{meta}{depends}) {
		1121	goto skip
		1122	unless exists $done{$_};
		1123	}
		1124
		1125	warn "... loading '$k' into '$v->{pkg}'\n";
		1126
		1127	unless (eval $v->{source}) {
		1128	my $msg = $@ ? "$v->{path}: $@\n"
		1129	: "$v->{base}: extension inactive.\n";
		1130
		1131	if (exists $v->{meta}{mandatory}) {
		1132	warn $msg;
		1133	warn "mandatory extension failed to load, exiting.\n";
		1134	exit 1;
		1135	}
		1136
		1137	warn $msg;
		1138	}
		1139
		1140	$done{$k} = delete $todo{$k};
		1141	push @EXTS, $v->{pkg};
		1142	$progress = 1;
954	1	1143	}
955	} or warn "$ext not loaded: $@";	1144
		1145	skip:
		1146	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
		1147	unless $progress;
		1148	}
956	}	1149	};
957	}	1150	}
958		1151
959	#############################################################################	1152	#############################################################################
		1153
		1154	=back
960		1155
961	=head2 CORE EXTENSIONS	1156	=head2 CORE EXTENSIONS
962		1157
963	Functions and methods that extend core crossfire objects.	1158	Functions and methods that extend core crossfire objects.
964		1159
…		…
1152	}	1347	}
1153		1348
1154	\@paths	1349	\@paths
1155	}	1350	}
1156		1351
		1352	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
		1353
		1354	Expand crossfire pod fragments into protocol xml.
		1355
		1356	=cut
		1357
		1358	sub expand_cfpod {
		1359	((my $self), (local $_)) = @_;
		1360
		1361	# escape & and <
		1362	s/&/&/g;
		1363	s/(?<![BIUGH])</</g;
		1364
		1365	# this is buggy, it needs to properly take care of nested <'s
		1366
		1367	1 while
		1368	# replace B<>, I<>, U<> etc.
		1369	s/B<([^\>]*)>/<b>$1<\/b>/
		1370	\|\| s/I<([^\>]*)>/<i>$1<\/i>/
		1371	\|\| s/U<([^\>]*)>/<u>$1<\/u>/
		1372	# replace G<male\|female> tags
		1373	\|\| s{G<([^>\|])\\|([^>])>}{
		1374	$self->gender ? $2 : $1
		1375	}ge
		1376	# replace H<hint text>
		1377	\|\| s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
		1378
		1379	# create single paragraphs (very hackish)
		1380	s/(?<=\S)\n(?=\w)/ /g;
		1381
		1382	$_
		1383	}
		1384
1157	=item $player->ext_reply ($msgid, %msg)	1385	=item $player->ext_reply ($msgid, %msg)
1158		1386
1159	Sends an ext reply to the player.	1387	Sends an ext reply to the player.
1160		1388
1161	=cut	1389	=cut
…		…
1188		1416
1189	package cf::region;	1417	package cf::region;
1190		1418
1191	=item cf::region::find_by_path $path	1419	=item cf::region::find_by_path $path
1192		1420
1193	Tries to decuce the probable region for a map knowing only its path.	1421	Tries to decuce the likely region for a map knowing only its path.
1194		1422
1195	=cut	1423	=cut
1196		1424
1197	sub find_by_path($) {	1425	sub find_by_path($) {
1198	my ($path) = @_;	1426	my ($path) = @_;
…		…
1272	my ($self, $merge) = @_;	1500	my ($self, $merge) = @_;
1273		1501
1274	# we have to keep some variables in memory intact	1502	# we have to keep some variables in memory intact
1275	local $self->{path};	1503	local $self->{path};
1276	local $self->{load_path};	1504	local $self->{load_path};
1277	local $self->{deny_save};
1278	local $self->{deny_reset};
1279		1505
1280	$self->SUPER::thawer_merge ($merge);	1506	$self->SUPER::thawer_merge ($merge);
1281	}	1507	}
1282		1508
1283	sub normalise {	1509	sub normalise {
…		…
1383		1609
1384	$_->change_map_light ($change)	1610	$_->change_map_light ($change)
1385	for grep $_->outdoor, values %cf::MAP;	1611	for grep $_->outdoor, values %cf::MAP;
1386	}	1612	}
1387		1613
		1614	sub decay_objects {
		1615	my ($self) = @_;
		1616
		1617	return if $self->{deny_reset};
		1618
		1619	$self->do_decay_objects;
		1620	}
		1621
1388	sub unlink_save {	1622	sub unlink_save {
1389	my ($self) = @_;	1623	my ($self) = @_;
1390		1624
1391	utf8::encode (my $save = $self->save_path);	1625	utf8::encode (my $save = $self->save_path);
1392	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;	1626	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
…		…
1448	$self->load_header_orig	1682	$self->load_header_orig
1449	or return;	1683	or return;
1450	$self->prepare_orig;	1684	$self->prepare_orig;
1451	}	1685	}
1452		1686
		1687	$self->{deny_reset} = 1
		1688	if $self->no_reset;
		1689
1453	$self->default_region (cf::region::find_by_path $self->{path})	1690	$self->default_region (cf::region::find_by_path $self->{path})
1454	unless $self->default_region;	1691	unless $self->default_region;
1455		1692
1456	1	1693	1
1457	}	1694	}
…		…
1472	$map->{last_save} = $cf::RUNTIME;	1709	$map->{last_save} = $cf::RUNTIME;
1473		1710
1474	$map->load_header	1711	$map->load_header
1475	or return;	1712	or return;
1476		1713
1477	if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)	1714	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1478	# doing this can freeze the server in a sync job, obviously	1715	# doing this can freeze the server in a sync job, obviously
1479	#$cf::WAIT_FOR_TICK->wait;	1716	#$cf::WAIT_FOR_TICK->wait;
1480	$map->reset;	1717	$map->reset;
1481	undef $guard;	1718	undef $guard;
1482	return find $path;	1719	return find $path;
…		…
1549	my ($self, $ob) = @_;	1786	my ($self, $ob) = @_;
1550		1787
1551	return find "~" . $ob->name . "/" . $self->{path}	1788	return find "~" . $ob->name . "/" . $self->{path}
1552	if $self->per_player;	1789	if $self->per_player;
1553		1790
		1791	# return find "?party/" . $ob->name . "/" . $self->{path}
		1792	# if $self->per_party;
		1793
1554	$self	1794	$self
1555	}	1795	}
1556		1796
1557	# find and load all maps in the 3x3 area around a map	1797	# find and load all maps in the 3x3 area around a map
1558	sub load_diag {	1798	sub load_diag {
…		…
1668		1908
1669	sub reset_at {	1909	sub reset_at {
1670	my ($self) = @_;	1910	my ($self) = @_;
1671		1911
1672	# TODO: safety, remove and allow resettable per-player maps	1912	# TODO: safety, remove and allow resettable per-player maps
1673	return 1e99 if $self->isa ("ext::map_per_player");#d#
1674	return 1e99 if $self->{deny_reset};	1913	return 1e99 if $self->{deny_reset};
1675		1914
1676	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;	1915	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1677	my $to = List::Util::min $MAX_RESET, $self->reset_timeout \|\| $DEFAULT_RESET;	1916	my $to = List::Util::min $MAX_RESET, $self->reset_timeout \|\| $DEFAULT_RESET;
1678		1917
…		…
1689	my ($self) = @_;	1928	my ($self) = @_;
1690		1929
1691	my $lock = cf::lock_acquire "map_data:$self->{path}";	1930	my $lock = cf::lock_acquire "map_data:$self->{path}";
1692		1931
1693	return if $self->players;	1932	return if $self->players;
1694	return if $self->isa ("ext::map_per_player");#d#
1695		1933
1696	warn "resetting map ", $self->path;#d#	1934	warn "resetting map ", $self->path;
1697		1935
1698	$self->in_memory (cf::MAP_SWAPPED);	1936	$self->in_memory (cf::MAP_SWAPPED);
1699		1937
1700	# need to save uniques path	1938	# need to save uniques path
1701	unless ($self->{deny_save}) {	1939	unless ($self->{deny_save}) {
…		…
1733	$cf::MAP{$self->path} = $self;	1971	$cf::MAP{$self->path} = $self;
1734		1972
1735	$self->reset; # polite request, might not happen	1973	$self->reset; # polite request, might not happen
1736	}	1974	}
1737		1975
		1976	=item $maps = cf::map::tmp_maps
		1977
		1978	Returns an arrayref with all map paths of currently instantiated and saved
		1979	maps. May block.
		1980
		1981	=cut
		1982
		1983	sub tmp_maps() {
		1984	[
		1985	map {
		1986	utf8::decode $_;
		1987	/\.map$/
		1988	? normalise $_
		1989	: ()
		1990	} @{ aio_readdir $TMPDIR or [] }
		1991	]
		1992	}
		1993
		1994	=item $maps = cf::map::random_maps
		1995
		1996	Returns an arrayref with all map paths of currently instantiated and saved
		1997	random maps. May block.
		1998
		1999	=cut
		2000
		2001	sub random_maps() {
		2002	[
		2003	map {
		2004	utf8::decode $_;
		2005	/\.map$/
		2006	? normalise "?random/$_"
		2007	: ()
		2008	} @{ aio_readdir $RANDOMDIR or [] }
		2009	]
		2010	}
		2011
1738	=item cf::map::unique_maps	2012	=item cf::map::unique_maps
1739		2013
1740	Returns an arrayref of paths of all shared maps that have	2014	Returns an arrayref of paths of all shared maps that have
1741	instantiated unique items. May block.	2015	instantiated unique items. May block.
1742		2016
1743	=cut	2017	=cut
1744		2018
1745	sub unique_maps() {	2019	sub unique_maps() {
1746	my $files = aio_readdir $UNIQUEDIR	2020	[
1747	or return;	2021	map {
1748
1749	my @paths;
1750
1751	for (@$files) {
1752	utf8::decode $_;	2022	utf8::decode $_;
1753	next if /\.pst$/;	2023	/\.map$/
1754	next unless /^$PATH_SEP/o;	2024	? normalise $_
1755		2025	: ()
1756	push @paths, cf::map::normalise $_;	2026	} @{ aio_readdir $UNIQUEDIR or [] }
1757	}	2027	]
1758
1759	\@paths
1760	}	2028	}
1761		2029
1762	package cf;	2030	package cf;
1763		2031
1764	=back	2032	=back
…		…
1810		2078
1811	$flags = cf::NDI_BROWN \| cf::NDI_UNIQUE unless @_ >= 4;	2079	$flags = cf::NDI_BROWN \| cf::NDI_UNIQUE unless @_ >= 4;
1812		2080
1813	if ($self->{record_replies}) {	2081	if ($self->{record_replies}) {
1814	push @{ $self->{record_replies} }, [$npc, $msg, $flags];	2082	push @{ $self->{record_replies} }, [$npc, $msg, $flags];
		2083
1815	} else {	2084	} else {
		2085	my $pl = $self->contr;
		2086
		2087	if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
		2088	my $diag = $pl->{npc_dialog};
		2089	$diag->{pl}->ext_reply (
		2090	$diag->{id},
		2091	msgtype => "reply",
		2092	msg => $diag->{pl}->expand_cfpod ($msg),
		2093	add_topics => []
		2094	);
		2095
		2096	} else {
1816	$msg = $npc->name . " says: $msg" if $npc;	2097	$msg = $npc->name . " says: $msg" if $npc;
1817	$self->message ($msg, $flags);	2098	$self->message ($msg, $flags);
		2099	}
1818	}	2100	}
1819	}	2101	}
1820		2102
1821	=item $player_object->may ("access")	2103	=item $player_object->may ("access")
1822		2104
…		…
1870	$self->deactivate_recursive;	2152	$self->deactivate_recursive;
1871		2153
1872	return if UNIVERSAL::isa $self->map, "ext::map_link";	2154	return if UNIVERSAL::isa $self->map, "ext::map_link";
1873		2155
1874	$self->{_link_pos} \|\|= [$self->map->{path}, $self->x, $self->y]	2156	$self->{_link_pos} \|\|= [$self->map->{path}, $self->x, $self->y]
1875	if $self->map;	2157	if $self->map && $self->map->{path} ne "{link}";
1876		2158
1877	$self->enter_map ($LINK_MAP \|\| link_map, 10, 10);	2159	$self->enter_map ($LINK_MAP \|\| link_map, 10, 10);
1878	}	2160	}
1879		2161
1880	sub cf::object::player::leave_link {	2162	sub cf::object::player::leave_link {
1881	my ($self, $map, $x, $y) = @_;	2163	my ($self, $map, $x, $y) = @_;
		2164
		2165	return unless $self->contr->active;
1882		2166
1883	my $link_pos = delete $self->{_link_pos};	2167	my $link_pos = delete $self->{_link_pos};
1884		2168
1885	unless ($map) {	2169	unless ($map) {
1886	# restore original map position	2170	# restore original map position
…		…
1909		2193
1910	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2194	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1911	$self->enter_map ($map, $x, $y);	2195	$self->enter_map ($map, $x, $y);
1912	}	2196	}
1913		2197
1914	cf::player->attach (
1915	on_logout => sub {
1916	my ($pl) = @_;
1917
1918	# abort map switching before logout
1919	if ($pl->ob->{_link_pos}) {
1920	cf::sync_job {
1921	$pl->ob->leave_link
1922	};
1923	}
1924	},
1925	on_login => sub {
1926	my ($pl) = @_;
1927
1928	# try to abort aborted map switching on player login :)
1929	# should happen only on crashes
1930	if ($pl->ob->{_link_pos}) {
1931	$pl->ob->enter_link;
1932	(async {
1933	$pl->ob->reply (undef,
1934	"There was an internal problem at your last logout, "
1935	. "the server will try to bring you to your intended destination in a second.",
1936	cf::NDI_RED);
1937	# we need this sleep as the login has a concurrent enter_exit running
1938	# and this sleep increases chances of the player not ending up in scorn
1939	Coro::Timer::sleep 1;
1940	$pl->ob->leave_link;
1941	})->prio (2);
1942	}
1943	},
1944	);
1945
1946	=item $player_object->goto ($path, $x, $y)	2198	=item $player_object->goto ($path, $x, $y[, $check->($map)])
1947		2199
		2200	Moves the player to the given map-path and coordinates by first freezing
		2201	her, loading and preparing them map, calling the provided $check callback
		2202	that has to return the map if sucecssful, and then unfreezes the player on
		2203	the new (success) or old (failed) map position.
		2204
1948	=cut	2205	=cut
		2206
		2207	our $GOTOGEN;
1949		2208
1950	sub cf::object::player::goto {	2209	sub cf::object::player::goto {
1951	my ($self, $path, $x, $y) = @_;	2210	my ($self, $path, $x, $y, $check) = @_;
		2211
		2212	# do generation counting so two concurrent goto's will be executed in-order
		2213	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1952		2214
1953	$self->enter_link;	2215	$self->enter_link;
1954		2216
1955	(async {	2217	(async {
1956	my $map = eval {	2218	my $map = eval {
1957	my $map = cf::map::find $path;	2219	my $map = cf::map::find $path;
		2220
		2221	if ($map) {
1958	$map = $map->customise_for ($self) if $map;	2222	$map = $map->customise_for ($self);
		2223	$map = $check->($map) if $check && $map;
		2224	} else {
		2225	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);
		2226	}
		2227
1959	$map	2228	$map
		2229	};
		2230
		2231	if ($@) {
		2232	$self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE \| cf::NDI_RED);
		2233	LOG llevError \| logBacktrace, Carp::longmess $@;
1960	} or	2234	}
1961	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);
1962		2235
		2236	if ($gen == $self->{_goto_generation}) {
		2237	delete $self->{_goto_generation};
1963	$self->leave_link ($map, $x, $y);	2238	$self->leave_link ($map, $x, $y);
		2239	}
1964	})->prio (1);	2240	})->prio (1);
1965	}	2241	}
1966		2242
1967	=item $player_object->enter_exit ($exit_object)	2243	=item $player_object->enter_exit ($exit_object)
1968		2244
…		…
2071	sub cf::client::send_drawinfo {	2347	sub cf::client::send_drawinfo {
2072	my ($self, $text, $flags) = @_;	2348	my ($self, $text, $flags) = @_;
2073		2349
2074	utf8::encode $text;	2350	utf8::encode $text;
2075	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2351	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
		2352	}
		2353
		2354	=item $client->send_msg ($color, $type, $msg, [extra...])
		2355
		2356	Send a drawinfo or msg packet to the client, formatting the msg for the
		2357	client if neccessary. C<$type> should be a string identifying the type of
		2358	the message, with C<log> being the default. If C<$color> is negative, suppress
		2359	the message unless the client supports the msg packet.
		2360
		2361	=cut
		2362
		2363	sub cf::client::send_msg {
		2364	my ($self, $color, $type, $msg, @extra) = @_;
		2365
		2366	$msg = $self->pl->expand_cfpod ($msg);
		2367
		2368	if ($self->can_msg) {
		2369	$self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);
		2370	} else {
		2371	# replace some tags by gcfclient-compatible ones
		2372	for ($msg) {
		2373	1 while
		2374	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
		2375	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
		2376	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
		2377	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
		2378	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
		2379	}
		2380
		2381	if ($color >= 0) {
		2382	if (0 && $msg =~ /\[/) {
		2383	$self->send_packet ("drawextinfo $color 4 0 $msg")
		2384	} else {
		2385	s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
		2386	$self->send_packet ("drawinfo $color $msg")
		2387	}
		2388	}
		2389	}
2076	}	2390	}
2077		2391
2078	=item $client->ext_event ($type, %msg)	2392	=item $client->ext_event ($type, %msg)
2079		2393
2080	Sends an exti event to the client.	2394	Sends an exti event to the client.
…		…
2282	=back	2596	=back
2283		2597
2284	=cut	2598	=cut
2285		2599
2286	#############################################################################	2600	#############################################################################
2287
2288	=head2 EXTENSION DATABASE SUPPORT
2289
2290	Crossfire maintains a very simple database for extension use. It can
2291	currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2292	convert to/from binary).
2293
2294	The parameter C<$family> should best start with the name of the extension
2295	using it, it should be unique.
2296
2297	=over 4
2298
2299	=item $value = cf::db_get $family => $key
2300
2301	Returns a single value from the database.
2302
2303	=item cf::db_put $family => $key => $value
2304
2305	Stores the given C<$value> in the family.
2306
2307	=cut
2308
2309	our $DB;
2310
2311	sub db_init {
2312	unless ($DB) {
2313	$DB = BDB::db_create $DB_ENV;
2314
2315	cf::sync_job {
2316	eval {
2317	$DB->set_flags (BDB::CHKSUM);
2318
2319	BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2320	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
2321	cf::cleanup "db_open(db): $!" if $!;
2322	};
2323	cf::cleanup "db_open(db): $@" if $@;
2324	};
2325	}
2326	}
2327
2328	sub db_get($$) {
2329	my $key = "$_[0]/$_[1]";
2330
2331	cf::sync_job {
2332	BDB::db_get $DB, undef, $key, my $data;
2333
2334	$! ? ()
2335	: $data
2336	}
2337	}
2338
2339	sub db_put($$$) {
2340	BDB::dbreq_pri 4;
2341	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2342	}
2343
2344	=item cf::cache $id => [$paths...], $processversion => $process
2345
2346	Generic caching function that returns the value of the resource $id,
2347	caching and regenerating as required.
2348
2349	This function can block.
2350
2351	=cut
2352
2353	sub cache {
2354	my ($id, $src, $processversion, $process) = @_;
2355
2356	my $meta =
2357	join "\x00",
2358	$processversion,
2359	map {
2360	aio_stat $_
2361	and Carp::croak "$_: $!";
2362
2363	($_, (stat _)[7,9])
2364	} @$src;
2365
2366	my $dbmeta = db_get cache => "$id/meta";
2367	if ($dbmeta ne $meta) {
2368	# changed, we may need to process
2369
2370	my @data;
2371	my $md5;
2372
2373	for (0 .. $#$src) {
2374	0 <= aio_load $src->[$_], $data[$_]
2375	or Carp::croak "$src->[$_]: $!";
2376	}
2377
2378	# if processing is expensive, check
2379	# checksum first
2380	if (1) {
2381	$md5 =
2382	join "\x00",
2383	$processversion,
2384	map {
2385	Coro::cede;
2386	($src->[$_], Digest::MD5::md5_hex $data[$_])
2387	} 0.. $#$src;
2388
2389
2390	my $dbmd5 = db_get cache => "$id/md5";
2391	if ($dbmd5 eq $md5) {
2392	db_put cache => "$id/meta", $meta;
2393
2394	return db_get cache => "$id/data";
2395	}
2396	}
2397
2398	my $t1 = Time::HiRes::time;
2399	my $data = $process->(\@data);
2400	my $t2 = Time::HiRes::time;
2401
2402	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2403
2404	db_put cache => "$id/data", $data;
2405	db_put cache => "$id/md5" , $md5;
2406	db_put cache => "$id/meta", $meta;
2407
2408	return $data;
2409	}
2410
2411	db_get cache => "$id/data"
2412	}
2413
2414	=item fork_call { }, $args
2415
2416	Executes the given code block with the given arguments in a seperate
2417	process, returning the results. Everything must be serialisable with
2418	Coro::Storable. May, of course, block. Note that the executed sub may
2419	never block itself or use any form of Event handling.
2420
2421	=cut
2422
2423	sub fork_call(&@) {
2424	my ($cb, @args) = @_;
2425
2426	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2427	# or die "socketpair: $!";
2428	pipe my $fh1, my $fh2
2429	or die "pipe: $!";
2430
2431	if (my $pid = fork) {
2432	close $fh2;
2433
2434	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2435	$res = Coro::Storable::thaw $res;
2436
2437	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2438
2439	die $$res unless "ARRAY" eq ref $res;
2440
2441	return wantarray ? @$res : $res->[-1];
2442	} else {
2443	reset_signals;
2444	local $SIG{__WARN__};
2445	local $SIG{__DIE__};
2446	eval {
2447	close $fh1;
2448
2449	my @res = eval { $cb->(@args) };
2450	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2451	};
2452
2453	warn $@ if $@;
2454	_exit 0;
2455	}
2456	}
2457
2458
2459
2460	#############################################################################
2461	# the server's init and main functions	2601	# the server's init and main functions
2462		2602
2463	sub load_facedata($) {	2603	sub load_facedata($) {
2464	my ($path) = @_;	2604	my ($path) = @_;
2465		2605
…		…
2535	sub reload_resources {	2675	sub reload_resources {
2536	warn "reloading resource files...\n";	2676	warn "reloading resource files...\n";
2537		2677
2538	reload_regions;	2678	reload_regions;
2539	reload_facedata;	2679	reload_facedata;
		2680	#reload_archetypes;#d#
2540	reload_archetypes;	2681	reload_archetypes;
2541	reload_treasures;	2682	reload_treasures;
2542		2683
2543	warn "finished reloading resource files\n";	2684	warn "finished reloading resource files\n";
2544	}	2685	}
…		…
2601	},	2742	},
2602	);	2743	);
2603	}	2744	}
2604	}	2745	}
2605		2746
		2747	sub write_runtime {
		2748	my $runtime = "$LOCALDIR/runtime";
		2749
		2750	# first touch the runtime file to show we are still running:
		2751	# the fsync below can take a very very long time.
		2752
		2753	IO::AIO::aio_utime $runtime, undef, undef;
		2754
		2755	my $guard = cf::lock_acquire "write_runtime";
		2756
		2757	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644
		2758	or return;
		2759
		2760	my $value = $cf::RUNTIME + 90 + 10;
		2761	# 10 is the runtime save interval, for a monotonic clock
		2762	# 60 allows for the watchdog to kill the server.
		2763
		2764	(aio_write $fh, 0, (length $value), $value, 0) <= 0
		2765	and return;
		2766
		2767	# always fsync - this file is important
		2768	aio_fsync $fh
		2769	and return;
		2770
		2771	# touch it again to show we are up-to-date
		2772	aio_utime $fh, undef, undef;
		2773
		2774	close $fh
		2775	or return;
		2776
		2777	aio_rename "$runtime~", $runtime
		2778	and return;
		2779
		2780	warn "runtime file written.\n";
		2781
		2782	1
		2783	}
		2784
2606	sub emergency_save() {	2785	sub emergency_save() {
2607	my $freeze_guard = cf::freeze_mainloop;	2786	my $freeze_guard = cf::freeze_mainloop;
2608		2787
2609	warn "enter emergency perl save\n";	2788	warn "enter emergency perl save\n";
2610		2789
…		…
2814	my $signal = new Coro::Signal;	2993	my $signal = new Coro::Signal;
2815	push @WAIT_FOR_TICK_BEGIN, $signal;	2994	push @WAIT_FOR_TICK_BEGIN, $signal;
2816	$signal->wait;	2995	$signal->wait;
2817	}	2996	}
2818		2997
		2998	my $min = 1e6;#d#
		2999	my $avg = 10;
2819	$TICK_WATCHER = Event->timer (	3000	$TICK_WATCHER = Event->timer (
2820	reentrant => 0,	3001	reentrant => 0,
2821	parked => 1,	3002	parked => 1,
2822	prio => 0,	3003	prio => 0,
2823	at => $NEXT_TICK \|\| $TICK,	3004	at => $NEXT_TICK \|\| $TICK,
…		…
2827	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	3008	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2828	unless ++$bug_warning > 10;	3009	unless ++$bug_warning > 10;
2829	return;	3010	return;
2830	}	3011	}
2831		3012
2832	$NOW = Event::time;	3013	$NOW = $tick_start = Event::time;
2833		3014
2834	cf::server_tick; # one server iteration	3015	cf::server_tick; # one server iteration
		3016
		3017	0 && sync_job {#d#
		3018	for(1..10) {
		3019	my $t = Event::time;
		3020	my $map = my $map = new_from_path cf::map "/tmp/x.map"
		3021	or die;
		3022
		3023	$map->width (50);
		3024	$map->height (50);
		3025	$map->alloc;
		3026	$map->_load_objects ("/tmp/x.map", 1);
		3027	my $t = Event::time - $t;
		3028
		3029	#next unless $t < 0.0013;#d#
		3030	if ($t < $min) {
		3031	$min = $t;
		3032	}
		3033	$avg = $avg * 0.99 + $t * 0.01;
		3034	}
		3035	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
		3036	exit 0;
		3037	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
		3038	};
2835		3039
2836	$RUNTIME += $TICK;	3040	$RUNTIME += $TICK;
2837	$NEXT_TICK += $TICK;	3041	$NEXT_TICK += $TICK;
2838		3042
2839	if ($NOW >= $NEXT_RUNTIME_WRITE) {	3043	if ($NOW >= $NEXT_RUNTIME_WRITE) {
…		…
2845	}	3049	}
2846		3050
2847	# my $AFTER = Event::time;	3051	# my $AFTER = Event::time;
2848	# warn $AFTER - $NOW;#d#	3052	# warn $AFTER - $NOW;#d#
2849		3053
		3054	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
		3055	$sig->send;
		3056	}
		3057	while (my $sig = shift @WAIT_FOR_TICK) {
		3058	$sig->send;
		3059	}
		3060
		3061	$NOW = Event::time;
		3062
2850	# if we are delayed by four ticks or more, skip them all	3063	# if we are delayed by four ticks or more, skip them all
2851	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	3064	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2852		3065
2853	$TICK_WATCHER->at ($NEXT_TICK);	3066	$TICK_WATCHER->at ($NEXT_TICK);
2854	$TICK_WATCHER->start;	3067	$TICK_WATCHER->start;
2855		3068
2856	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	3069	$LOAD = ($NOW - $tick_start) / $TICK;
2857	$sig->send;	3070	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2858	}
2859	while (my $sig = shift @WAIT_FOR_TICK) {
2860	$sig->send;
2861	}
2862		3071
2863	_post_tick;	3072	_post_tick;
		3073
		3074
2864	},	3075	},
2865	);	3076	);
2866		3077
2867	{	3078	{
2868	BDB::max_poll_time $TICK * 0.1;	3079	BDB::max_poll_time $TICK * 0.1;

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.263 by root, Sat May 5 05:40:27 2007 UTC vs. Revision 1.285 by root, Sun Jun 24 04:21:42 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.263 by root, Sat May 5 05:40:27 2007 UTC vs.
Revision 1.285 by root, Sun Jun 24 04:21:42 2007 UTC