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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.267 by root, Sat May 19 00:08:11 2007 UTC vs.
Revision 1.276 by root, Sun Jun 10 04:05:47 2007 UTC

…		…
187	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	187	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	188	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	189	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	190	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
191	@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';
192	@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)
193		194
194	# 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
195	# within the Safe compartment.	196	# within the Safe compartment.
196	for my $pkg (qw(	197	for my $pkg (qw(
197	cf::global cf::attachable	198	cf::global cf::attachable
…		…
395	my $runtime = "$LOCALDIR/runtime";	396	my $runtime = "$LOCALDIR/runtime";
396		397
397	# first touch the runtime file to show we are still running:	398	# first touch the runtime file to show we are still running:
398	# the fsync below can take a very very long time.	399	# the fsync below can take a very very long time.
399		400
400	if (my $fh = aio_open $runtime, O_WRONLY, 0) {	401	IO::AIO::aio_utime $runtime, undef, undef;
401	utime undef, undef, $fh;
402	}
403		402
404	my $guard = cf::lock_acquire "write_runtime";	403	my $guard = cf::lock_acquire "write_runtime";
405		404
406	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644	405	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644
407	or return;	406	or return;
…		…
416	# always fsync - this file is important	415	# always fsync - this file is important
417	aio_fsync $fh	416	aio_fsync $fh
418	and return;	417	and return;
419		418
420	# touch it again to show we are up-to-date	419	# touch it again to show we are up-to-date
421	utime undef, undef, $fh;	420	aio_utime $fh, undef, undef;
422		421
423	close $fh	422	close $fh
424	or return;	423	or return;
425		424
426	aio_rename "$runtime~", $runtime	425	aio_rename "$runtime~", $runtime
427	and return;	426	and return;
428		427
429	warn "runtime file written.\n";#d#	428	warn "runtime file written.\n";
430		429
431	1	430	1
432	}	431	}
433		432
434	=item cf::datalog type => key => value, ...	433	=item cf::datalog type => key => value, ...
…		…
874	or return;	873	or return;
875	$av = eval { (Storable::thaw $av)->{objs} };	874	$av = eval { (Storable::thaw $av)->{objs} };
876	}	875	}
877		876
878	warn sprintf "loading %s (%d)\n",	877	warn sprintf "loading %s (%d)\n",
879	$filename, length $data, scalar @{$av \|\| []};#d#	878	$filename, length $data, scalar @{$av \|\| []};
880	return ($data, $av);	879	return ($data, $av);
881	}	880	}
882		881
883	#############################################################################	882	#############################################################################
884	# command handling &c	883	# command handling &c
…		…
1306	my ($self, $merge) = @_;	1305	my ($self, $merge) = @_;
1307		1306
1308	# we have to keep some variables in memory intact	1307	# we have to keep some variables in memory intact
1309	local $self->{path};	1308	local $self->{path};
1310	local $self->{load_path};	1309	local $self->{load_path};
1311	local $self->{deny_save};
1312	local $self->{deny_reset};
1313		1310
1314	$self->SUPER::thawer_merge ($merge);	1311	$self->SUPER::thawer_merge ($merge);
1315	}	1312	}
1316		1313
1317	sub normalise {	1314	sub normalise {
…		…
1417		1414
1418	$_->change_map_light ($change)	1415	$_->change_map_light ($change)
1419	for grep $_->outdoor, values %cf::MAP;	1416	for grep $_->outdoor, values %cf::MAP;
1420	}	1417	}
1421		1418
		1419	sub decay_objects {
		1420	my ($self) = @_;
		1421
		1422	return if $self->{deny_reset};
		1423
		1424	$self->do_decay_objects;
		1425	}
		1426
1422	sub unlink_save {	1427	sub unlink_save {
1423	my ($self) = @_;	1428	my ($self) = @_;
1424		1429
1425	utf8::encode (my $save = $self->save_path);	1430	utf8::encode (my $save = $self->save_path);
1426	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;	1431	IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
…		…
1482	$self->load_header_orig	1487	$self->load_header_orig
1483	or return;	1488	or return;
1484	$self->prepare_orig;	1489	$self->prepare_orig;
1485	}	1490	}
1486		1491
		1492	$self->{deny_reset} = 1
		1493	if $self->no_reset;
		1494
1487	$self->default_region (cf::region::find_by_path $self->{path})	1495	$self->default_region (cf::region::find_by_path $self->{path})
1488	unless $self->default_region;	1496	unless $self->default_region;
1489		1497
1490	1	1498	1
1491	}	1499	}
…		…
1506	$map->{last_save} = $cf::RUNTIME;	1514	$map->{last_save} = $cf::RUNTIME;
1507		1515
1508	$map->load_header	1516	$map->load_header
1509	or return;	1517	or return;
1510		1518
1511	if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)	1519	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1512	# doing this can freeze the server in a sync job, obviously	1520	# doing this can freeze the server in a sync job, obviously
1513	#$cf::WAIT_FOR_TICK->wait;	1521	#$cf::WAIT_FOR_TICK->wait;
1514	$map->reset;	1522	$map->reset;
1515	undef $guard;	1523	undef $guard;
1516	return find $path;	1524	return find $path;
…		…
1583	my ($self, $ob) = @_;	1591	my ($self, $ob) = @_;
1584		1592
1585	return find "~" . $ob->name . "/" . $self->{path}	1593	return find "~" . $ob->name . "/" . $self->{path}
1586	if $self->per_player;	1594	if $self->per_player;
1587		1595
		1596	# return find "?party/" . $ob->name . "/" . $self->{path}
		1597	# if $self->per_party;
		1598
1588	$self	1599	$self
1589	}	1600	}
1590		1601
1591	# find and load all maps in the 3x3 area around a map	1602	# find and load all maps in the 3x3 area around a map
1592	sub load_diag {	1603	sub load_diag {
…		…
1702		1713
1703	sub reset_at {	1714	sub reset_at {
1704	my ($self) = @_;	1715	my ($self) = @_;
1705		1716
1706	# TODO: safety, remove and allow resettable per-player maps	1717	# TODO: safety, remove and allow resettable per-player maps
1707	return 1e99 if $self->isa ("ext::map_per_player");#d#
1708	return 1e99 if $self->{deny_reset};	1718	return 1e99 if $self->{deny_reset};
1709		1719
1710	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;	1720	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1711	my $to = List::Util::min $MAX_RESET, $self->reset_timeout \|\| $DEFAULT_RESET;	1721	my $to = List::Util::min $MAX_RESET, $self->reset_timeout \|\| $DEFAULT_RESET;
1712		1722
…		…
1723	my ($self) = @_;	1733	my ($self) = @_;
1724		1734
1725	my $lock = cf::lock_acquire "map_data:$self->{path}";	1735	my $lock = cf::lock_acquire "map_data:$self->{path}";
1726		1736
1727	return if $self->players;	1737	return if $self->players;
1728	return if $self->isa ("ext::map_per_player");#d#
1729		1738
1730	warn "resetting map ", $self->path;#d#	1739	warn "resetting map ", $self->path;
1731		1740
1732	$self->in_memory (cf::MAP_SWAPPED);	1741	$self->in_memory (cf::MAP_SWAPPED);
1733		1742
1734	# need to save uniques path	1743	# need to save uniques path
1735	unless ($self->{deny_save}) {	1744	unless ($self->{deny_save}) {
…		…
1767	$cf::MAP{$self->path} = $self;	1776	$cf::MAP{$self->path} = $self;
1768		1777
1769	$self->reset; # polite request, might not happen	1778	$self->reset; # polite request, might not happen
1770	}	1779	}
1771		1780
		1781	=item $maps = cf::map::tmp_maps
		1782
		1783	Returns an arrayref with all map paths of currently instantiated and saved
		1784	maps.
		1785
		1786	=cut
		1787
		1788	sub tmp_maps() {
		1789	[
		1790	map {
		1791	utf8::decode $_;
		1792	!/\.(?:pst\|meta)$/ && /^$PATH_SEP/o
		1793	? normalise $_
		1794	: ()
		1795	} @{ aio_readdir $TMPDIR or [] }
		1796	]
		1797	}
		1798
1772	=item cf::map::unique_maps	1799	=item cf::map::unique_maps
1773		1800
1774	Returns an arrayref of paths of all shared maps that have	1801	Returns an arrayref of paths of all shared maps that have
1775	instantiated unique items. May block.	1802	instantiated unique items. May block.
1776		1803
1777	=cut	1804	=cut
1778		1805
1779	sub unique_maps() {	1806	sub unique_maps() {
1780	my $files = aio_readdir $UNIQUEDIR	1807	[
1781	or return;	1808	map {
1782
1783	my @paths;
1784
1785	for (@$files) {
1786	utf8::decode $_;	1809	utf8::decode $_;
1787	next if /\.pst$/;	1810	!/\.(?:pst\|meta)$/ && /^$PATH_SEP/o
1788	next unless /^$PATH_SEP/o;	1811	? normalise $_
1789		1812	: ()
1790	push @paths, cf::map::normalise $_;	1813	} @{ aio_readdir $UNIQUEDIR or [] }
1791	}	1814	]
1792
1793	\@paths
1794	}	1815	}
1795		1816
1796	package cf;	1817	package cf;
1797		1818
1798	=back	1819	=back
…		…
1904	$self->deactivate_recursive;	1925	$self->deactivate_recursive;
1905		1926
1906	return if UNIVERSAL::isa $self->map, "ext::map_link";	1927	return if UNIVERSAL::isa $self->map, "ext::map_link";
1907		1928
1908	$self->{_link_pos} \|\|= [$self->map->{path}, $self->x, $self->y]	1929	$self->{_link_pos} \|\|= [$self->map->{path}, $self->x, $self->y]
1909	if $self->map;	1930	if $self->map && $self->map->{path} ne "{link}";
1910		1931
1911	$self->enter_map ($LINK_MAP \|\| link_map, 10, 10);	1932	$self->enter_map ($LINK_MAP \|\| link_map, 10, 10);
1912	}	1933	}
1913		1934
1914	sub cf::object::player::leave_link {	1935	sub cf::object::player::leave_link {
1915	my ($self, $map, $x, $y) = @_;	1936	my ($self, $map, $x, $y) = @_;
		1937
		1938	return unless $self->contr->active;
1916		1939
1917	my $link_pos = delete $self->{_link_pos};	1940	my $link_pos = delete $self->{_link_pos};
1918		1941
1919	unless ($map) {	1942	unless ($map) {
1920	# restore original map position	1943	# restore original map position
…		…
1943		1966
1944	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	1967	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1945	$self->enter_map ($map, $x, $y);	1968	$self->enter_map ($map, $x, $y);
1946	}	1969	}
1947		1970
1948	cf::player->attach (
1949	on_logout => sub {
1950	my ($pl) = @_;
1951
1952	# abort map switching before logout
1953	if ($pl->ob->{_link_pos}) {
1954	cf::sync_job {
1955	$pl->ob->leave_link
1956	};
1957	}
1958	},
1959	on_login => sub {
1960	my ($pl) = @_;
1961
1962	# try to abort aborted map switching on player login :)
1963	# should happen only on crashes
1964	if ($pl->ob->{_link_pos}) {
1965	$pl->ob->enter_link;
1966	(async {
1967	$pl->ob->reply (undef,
1968	"There was an internal problem at your last logout, "
1969	. "the server will try to bring you to your intended destination in a second.",
1970	cf::NDI_RED);
1971	# we need this sleep as the login has a concurrent enter_exit running
1972	# and this sleep increases chances of the player not ending up in scorn
1973	Coro::Timer::sleep 1;
1974	$pl->ob->leave_link;
1975	})->prio (2);
1976	}
1977	},
1978	);
1979
1980	=item $player_object->goto ($path, $x, $y)	1971	=item $player_object->goto ($path, $x, $y[, $check->($map)])
1981		1972
		1973	Moves the player to the given map-path and coordinates by first freezing
		1974	her, loading and preparing them map, calling the provided $check callback
		1975	that has to return the map if sucecssful, and then unfreezes the player on
		1976	the new (success) or old (failed) map position.
		1977
1982	=cut	1978	=cut
		1979
		1980	our $GOTOGEN;
1983		1981
1984	sub cf::object::player::goto {	1982	sub cf::object::player::goto {
1985	my ($self, $path, $x, $y) = @_;	1983	my ($self, $path, $x, $y, $check) = @_;
		1984
		1985	# do generation counting so two concurrent goto's will be executed in-order
		1986	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1986		1987
1987	$self->enter_link;	1988	$self->enter_link;
1988		1989
1989	(async {	1990	(async {
1990	my $map = eval {	1991	my $map = eval {
1991	my $map = cf::map::find $path;	1992	my $map = cf::map::find $path;
		1993
		1994	if ($map) {
1992	$map = $map->customise_for ($self) if $map;	1995	$map = $map->customise_for ($self);
		1996	$map = $check->($map) if $check && $map;
		1997	} else {
		1998	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);
		1999	}
		2000
1993	$map	2001	$map
		2002	};
		2003
		2004	if ($@) {
		2005	$self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE \| cf::NDI_RED);
		2006	LOG llevError \| logBacktrace, Carp::longmess $@;
1994	} or	2007	}
1995	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);
1996		2008
		2009	if ($gen == $self->{_goto_generation}) {
		2010	delete $self->{_goto_generation};
1997	$self->leave_link ($map, $x, $y);	2011	$self->leave_link ($map, $x, $y);
		2012	}
1998	})->prio (1);	2013	})->prio (1);
1999	}	2014	}
2000		2015
2001	=item $player_object->enter_exit ($exit_object)	2016	=item $player_object->enter_exit ($exit_object)
2002		2017
…		…
2487	warn $@ if $@;	2502	warn $@ if $@;
2488	_exit 0;	2503	_exit 0;
2489	}	2504	}
2490	}	2505	}
2491		2506
2492
2493
2494	#############################################################################	2507	#############################################################################
2495	# the server's init and main functions	2508	# the server's init and main functions
2496		2509
2497	sub load_facedata($) {	2510	sub load_facedata($) {
2498	my ($path) = @_;	2511	my ($path) = @_;
…		…
2569	sub reload_resources {	2582	sub reload_resources {
2570	warn "reloading resource files...\n";	2583	warn "reloading resource files...\n";
2571		2584
2572	reload_regions;	2585	reload_regions;
2573	reload_facedata;	2586	reload_facedata;
		2587	#reload_archetypes;#d#
2574	reload_archetypes;	2588	reload_archetypes;
2575	reload_treasures;	2589	reload_treasures;
2576		2590
2577	warn "finished reloading resource files\n";	2591	warn "finished reloading resource files\n";
2578	}	2592	}
…		…
2848	my $signal = new Coro::Signal;	2862	my $signal = new Coro::Signal;
2849	push @WAIT_FOR_TICK_BEGIN, $signal;	2863	push @WAIT_FOR_TICK_BEGIN, $signal;
2850	$signal->wait;	2864	$signal->wait;
2851	}	2865	}
2852		2866
		2867	my $min = 1e6;#d#
		2868	my $avg = 10;
2853	$TICK_WATCHER = Event->timer (	2869	$TICK_WATCHER = Event->timer (
2854	reentrant => 0,	2870	reentrant => 0,
2855	parked => 1,	2871	parked => 1,
2856	prio => 0,	2872	prio => 0,
2857	at => $NEXT_TICK \|\| $TICK,	2873	at => $NEXT_TICK \|\| $TICK,
…		…
2864	}	2880	}
2865		2881
2866	$NOW = $tick_start = Event::time;	2882	$NOW = $tick_start = Event::time;
2867		2883
2868	cf::server_tick; # one server iteration	2884	cf::server_tick; # one server iteration
		2885
		2886	0 && sync_job {#d#
		2887	for(1..10) {
		2888	my $t = Event::time;
		2889	my $map = my $map = new_from_path cf::map "/tmp/x.map"
		2890	or die;
		2891
		2892	$map->width (50);
		2893	$map->height (50);
		2894	$map->alloc;
		2895	$map->_load_objects ("/tmp/x.map", 1);
		2896	my $t = Event::time - $t;
		2897
		2898	#next unless $t < 0.0013;#d#
		2899	if ($t < $min) {
		2900	$min = $t;
		2901	}
		2902	$avg = $avg * 0.99 + $t * 0.01;
		2903	}
		2904	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
		2905	exit 0;
		2906	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
		2907	};
2869		2908
2870	$RUNTIME += $TICK;	2909	$RUNTIME += $TICK;
2871	$NEXT_TICK += $TICK;	2910	$NEXT_TICK += $TICK;
2872		2911
2873	if ($NOW >= $NEXT_RUNTIME_WRITE) {	2912	if ($NOW >= $NEXT_RUNTIME_WRITE) {

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.267 by root, Sat May 19 00:08:11 2007 UTC vs. Revision 1.276 by root, Sun Jun 10 04:05:47 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.267 by root, Sat May 19 00:08:11 2007 UTC vs.
Revision 1.276 by root, Sun Jun 10 04:05:47 2007 UTC