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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.250 by root, Wed Apr 18 14:24:10 2007 UTC vs.
Revision 1.274 by root, Tue Jun 5 13:05:02 2007 UTC

…		…
54	our %EXT_CORO = (); # coroutines bound to extensions	54	our %EXT_CORO = (); # coroutines bound to extensions
55	our %EXT_MAP = (); # pluggable maps	55	our %EXT_MAP = (); # pluggable maps
56		56
57	our $RELOAD; # number of reloads so far	57	our $RELOAD; # number of reloads so far
58	our @EVENT;	58	our @EVENT;
59	our $LIBDIR = datadir . "/ext";	59
		60	our $CONFDIR = confdir;
		61	our $DATADIR = datadir;
		62	our $LIBDIR = "$DATADIR/ext";
		63	our $PODDIR = "$DATADIR/pod";
		64	our $MAPDIR = "$DATADIR/" . mapdir;
		65	our $LOCALDIR = localdir;
		66	our $TMPDIR = "$LOCALDIR/" . tmpdir;
		67	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
		68	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
		69	our $RANDOMDIR = "$LOCALDIR/random";
		70	our $BDBDIR = "$LOCALDIR/db";
60		71
61	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	72	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
62	our $TICK_WATCHER;	73	our $TICK_WATCHER;
63	our $AIO_POLL_WATCHER;	74	our $AIO_POLL_WATCHER;
64	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	75	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
…		…
75	our $RUNTIME;	86	our $RUNTIME;
76		87
77	our %PLAYER; # all users	88	our %PLAYER; # all users
78	our %MAP; # all maps	89	our %MAP; # all maps
79	our $LINK_MAP; # the special {link} map, which is always available	90	our $LINK_MAP; # the special {link} map, which is always available
80	our $RANDOM_MAPS = cf::localdir . "/random";
81	our $BDB_ENV_DIR = cf::localdir . "/db";
82		91
83	# 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 ∕
84	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	93	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
85		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
86	binmode STDOUT;	99	binmode STDOUT;
87	binmode STDERR;	100	binmode STDERR;
88		101
89	# read virtual server time, if available	102	# read virtual server time, if available
90	unless ($RUNTIME \|\| !-e cf::localdir . "/runtime") {	103	unless ($RUNTIME \|\| !-e "$LOCALDIR/runtime") {
91	open my $fh, "<", cf::localdir . "/runtime"	104	open my $fh, "<", "$LOCALDIR/runtime"
92	or die "unable to read runtime file: $!";	105	or die "unable to read runtime file: $!";
93	$RUNTIME = <$fh> + 0.;	106	$RUNTIME = <$fh> + 0.;
94	}	107	}
95		108
96	mkdir cf::localdir;	109	mkdir $_
97	mkdir cf::localdir . "/" . cf::playerdir;	110	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
98	mkdir cf::localdir . "/" . cf::tmpdir;
99	mkdir cf::localdir . "/" . cf::uniquedir;
100	mkdir $RANDOM_MAPS;
101	mkdir $BDB_ENV_DIR;
102		111
103	our $EMERGENCY_POSITION;	112	our $EMERGENCY_POSITION;
104		113
105	sub cf::map::normalise;	114	sub cf::map::normalise;
106		115
…		…
117	=item $cf::RUNTIME	126	=item $cf::RUNTIME
118		127
119	The time this server has run, starts at 0 and is increased by $cf::TICK on	128	The time this server has run, starts at 0 and is increased by $cf::TICK on
120	every server tick.	129	every server tick.
121		130
122	=item $cf::LIBDIR	131	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
		132	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
		133	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
123		134
124	The perl library directory, where extensions and cf-specific modules can	135	Various directories - "/etc", read-only install directory, perl-library
125	be found. It will be added to C<@INC> automatically.	136	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
		137	unique-items directory, player file directory, random maps directory and
		138	database environment.
126		139
127	=item $cf::NOW	140	=item $cf::NOW
128		141
129	The time of the last (current) server tick.	142	The time of the last (current) server tick.
130		143
131	=item $cf::TICK	144	=item $cf::TICK
132		145
133	The interval between server ticks, in seconds.	146	The interval between server ticks, in seconds.
		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.
134		157
135	=item %cf::CFG	158	=item %cf::CFG
136		159
137	Configuration for the server, loaded from C</etc/crossfire/config>, or	160	Configuration for the server, loaded from C</etc/crossfire/config>, or
138	from wherever your confdir points to.	161	from wherever your confdir points to.
…		…
152	my $msg = join "", @_;	175	my $msg = join "", @_;
153		176
154	$msg .= "\n"	177	$msg .= "\n"
155	unless $msg =~ /\n$/;	178	unless $msg =~ /\n$/;
156		179
157	$msg =~ s/([\x00-\x09\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	180	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
158		181
159	utf8::encode $msg;	182	utf8::encode $msg;
160	LOG llevError, $msg;	183	LOG llevError, $msg;
161	};	184	};
162	}	185	}
…		…
164	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	187	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
165	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';	188	@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
166	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';	189	@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
167	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';	190	@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
168	@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';
169	@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)
170		194
171	# 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
172	# within the Safe compartment.	196	# within the Safe compartment.
173	for my $pkg (qw(	197	for my $pkg (qw(
174	cf::global cf::attachable	198	cf::global cf::attachable
…		…
234	returned.	258	returned.
235		259
236	Lock names should begin with a unique identifier (for example, cf::map::find	260	Lock names should begin with a unique identifier (for example, cf::map::find
237	uses map_find and cf::map::load uses map_load).	261	uses map_find and cf::map::load uses map_load).
238		262
		263	=item $locked = cf::lock_active $string
		264
		265	Return true if the lock is currently active, i.e. somebody has locked it.
		266
239	=cut	267	=cut
240		268
241	our %LOCK;	269	our %LOCK;
242		270
243	sub lock_wait($) {	271	sub lock_wait($) {
…		…
260		288
261	Coro::guard {	289	Coro::guard {
262	# wake up all waiters, to be on the safe side	290	# wake up all waiters, to be on the safe side
263	$_->ready for @{ delete $LOCK{$key} };	291	$_->ready for @{ delete $LOCK{$key} };
264	}	292	}
		293	}
		294
		295	sub lock_active($) {
		296	my ($key) = @_;
		297
		298	! ! $LOCK{$key}
265	}	299	}
266		300
267	sub freeze_mainloop {	301	sub freeze_mainloop {
268	return unless $TICK_WATCHER->is_active;	302	return unless $TICK_WATCHER->is_active;
269		303
…		…
299		333
300	sub sync_job(&) {	334	sub sync_job(&) {
301	my ($job) = @_;	335	my ($job) = @_;
302		336
303	if ($Coro::current == $Coro::main) {	337	if ($Coro::current == $Coro::main) {
		338	my $time = Event::time;
		339
304	# this is the main coro, too bad, we have to block	340	# this is the main coro, too bad, we have to block
305	# till the operation succeeds, freezing the server :/	341	# till the operation succeeds, freezing the server :/
306		342
307	# TODO: use suspend/resume instead	343	# TODO: use suspend/resume instead
308	# (but this is cancel-safe)	344	# (but this is cancel-safe)
…		…
319		355
320	while ($busy) {	356	while ($busy) {
321	Coro::cede or Event::one_event;	357	Coro::cede or Event::one_event;
322	}	358	}
323		359
		360	$time = Event::time - $time;
		361
		362	LOG llevError \| logBacktrace, Carp::longmess "long sync job"
		363	if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
		364
		365	$tick_start += $time; # do not account sync jobs to server load
		366
324	wantarray ? @res : $res[0]	367	wantarray ? @res : $res[0]
325	} else {	368	} else {
326	# we are in another coroutine, how wonderful, everything just works	369	# we are in another coroutine, how wonderful, everything just works
327		370
328	$job->()	371	$job->()
…		…
348		391
349	$coro	392	$coro
350	}	393	}
351		394
352	sub write_runtime {	395	sub write_runtime {
		396	my $runtime = "$LOCALDIR/runtime";
		397
		398	# first touch the runtime file to show we are still running:
		399	# the fsync below can take a very very long time.
		400
		401	IO::AIO::aio_utime $runtime, undef, undef;
		402
353	my $guard = cf::lock_acquire "write_runtime";	403	my $guard = cf::lock_acquire "write_runtime";
354
355	my $runtime = cf::localdir . "/runtime";
356		404
357	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644	405	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644
358	or return;	406	or return;
359		407
360	my $value = $cf::RUNTIME + 90 + 10;	408	my $value = $cf::RUNTIME + 90 + 10;
…		…
366		414
367	# always fsync - this file is important	415	# always fsync - this file is important
368	aio_fsync $fh	416	aio_fsync $fh
369	and return;	417	and return;
370		418
		419	# touch it again to show we are up-to-date
		420	aio_utime $fh, undef, undef;
		421
371	close $fh	422	close $fh
372	or return;	423	or return;
373		424
374	aio_rename "$runtime~", $runtime	425	aio_rename "$runtime~", $runtime
375	and return;	426	and return;
		427
		428	warn "runtime file written.\n";
376		429
377	1	430	1
378	}	431	}
379		432
380	=item cf::datalog type => key => value, ...	433	=item cf::datalog type => key => value, ...
…		…
573	$registry = $CB_TYPE[$object_type] \|\|= [];	626	$registry = $CB_TYPE[$object_type] \|\|= [];
574		627
575	} elsif ($type eq "subtype") {	628	} elsif ($type eq "subtype") {
576	defined $object_type or Carp::croak "subtype specified without type";	629	defined $object_type or Carp::croak "subtype specified without type";
577	my $object_subtype = shift @arg;	630	my $object_subtype = shift @arg;
578	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] \|\|= [];	631	$registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] \|\|= [];
579		632
580	} elsif ($type eq "package") {	633	} elsif ($type eq "package") {
581	my $pkg = shift @arg;	634	my $pkg = shift @arg;
582		635
583	while (my ($name, $id) = each %cb_id) {	636	while (my ($name, $id) = each %cb_id) {
…		…
624	if (ref $_[0]) {	677	if (ref $_[0]) {
625	_object_attach @_;	678	_object_attach @_;
626	} else {	679	} else {
627	_attach shift->_attach_registry, @_;	680	_attach shift->_attach_registry, @_;
628	}	681	}
		682	_recalc_want;
629	};	683	};
630		684
631	# all those should be optimised	685	# all those should be optimised
632	sub cf::attachable::detach {	686	sub cf::attachable::detach {
633	my ($obj, $name) = @_;	687	my ($obj, $name) = @_;
…		…
636	delete $obj->{_attachment}{$name};	690	delete $obj->{_attachment}{$name};
637	reattach ($obj);	691	reattach ($obj);
638	} else {	692	} else {
639	Carp::croak "cannot, currently, detach class attachments";	693	Carp::croak "cannot, currently, detach class attachments";
640	}	694	}
		695	_recalc_want;
641	};	696	};
642		697
643	sub cf::attachable::attached {	698	sub cf::attachable::attached {
644	my ($obj, $name) = @_;	699	my ($obj, $name) = @_;
645		700
…		…
818	or return;	873	or return;
819	$av = eval { (Storable::thaw $av)->{objs} };	874	$av = eval { (Storable::thaw $av)->{objs} };
820	}	875	}
821		876
822	warn sprintf "loading %s (%d)\n",	877	warn sprintf "loading %s (%d)\n",
823	$filename, length $data, scalar @{$av \|\| []};#d#	878	$filename, length $data, scalar @{$av \|\| []};
824	return ($data, $av);	879	return ($data, $av);
825	}	880	}
826		881
827	#############################################################################	882	#############################################################################
828	# command handling &c	883	# command handling &c
…		…
955	Returns the given player object, loading it if necessary (might block).	1010	Returns the given player object, loading it if necessary (might block).
956		1011
957	=cut	1012	=cut
958		1013
959	sub playerdir($) {	1014	sub playerdir($) {
960	cf::localdir	1015	"$PLAYERDIR/"
961	. "/"
962	. cf::playerdir
963	. "/"
964	. (ref $_[0] ? $_[0]->ob->name : $_[0])	1016	. (ref $_[0] ? $_[0]->ob->name : $_[0])
965	}	1017	}
966		1018
967	sub path($) {	1019	sub path($) {
968	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];	1020	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
…		…
1088	while and may block, so not sync_job-capable, ever.	1140	while and may block, so not sync_job-capable, ever.
1089		1141
1090	=cut	1142	=cut
1091		1143
1092	sub list_logins {	1144	sub list_logins {
1093	my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir	1145	my $dirs = aio_readdir $PLAYERDIR
1094	or return [];	1146	or return [];
1095		1147
1096	my @logins;	1148	my @logins;
1097		1149
1098	for my $login (@$dirs) {	1150	for my $login (@$dirs) {
…		…
1336		1388
1337	# the original (read-only) location	1389	# the original (read-only) location
1338	sub load_path {	1390	sub load_path {
1339	my ($self) = @_;	1391	my ($self) = @_;
1340		1392
1341	sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}	1393	"$MAPDIR/$self->{path}.map"
1342	}	1394	}
1343		1395
1344	# the temporary/swap location	1396	# the temporary/swap location
1345	sub save_path {	1397	sub save_path {
1346	my ($self) = @_;	1398	my ($self) = @_;
1347		1399
1348	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1400	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1349	sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path	1401	"$TMPDIR/$path.map"
1350	}	1402	}
1351		1403
1352	# the unique path, undef == no special unique path	1404	# the unique path, undef == no special unique path
1353	sub uniq_path {	1405	sub uniq_path {
1354	my ($self) = @_;	1406	my ($self) = @_;
1355		1407
1356	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1408	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1357	sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path	1409	"$UNIQUEDIR/$path"
1358	}	1410	}
1359		1411
1360	# and all this just because we cannot iterate over	1412	# and all this just because we cannot iterate over
1361	# all maps in C++...	1413	# all maps in C++...
1362	sub change_all_map_light {	1414	sub change_all_map_light {
…		…
1474	my ($self) = @_;	1526	my ($self) = @_;
1475		1527
1476	local $self->{deny_reset} = 1; # loading can take a long time	1528	local $self->{deny_reset} = 1; # loading can take a long time
1477		1529
1478	my $path = $self->{path};	1530	my $path = $self->{path};
		1531
		1532	{
1479	my $guard = cf::lock_acquire "map_load:$path";	1533	my $guard = cf::lock_acquire "map_load:$path";
1480		1534
1481	return if $self->in_memory != cf::MAP_SWAPPED;	1535	return if $self->in_memory != cf::MAP_SWAPPED;
1482		1536
1483	$self->in_memory (cf::MAP_LOADING);	1537	$self->in_memory (cf::MAP_LOADING);
1484		1538
1485	$self->alloc;	1539	$self->alloc;
1486		1540
1487	$self->pre_load;	1541	$self->pre_load;
1488	Coro::cede;
1489
1490	$self->_load_objects ($self->{load_path}, 1)
1491	or return;
1492
1493	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1494	if delete $self->{load_original};
1495
1496	if (my $uniq = $self->uniq_path) {
1497	utf8::encode $uniq;
1498	if (aio_open $uniq, O_RDONLY, 0) {
1499	$self->clear_unique_items;
1500	$self->_load_objects ($uniq, 0);
1501	}
1502	}
1503
1504	Coro::cede;
1505	# now do the right thing for maps
1506	$self->link_multipart_objects;
1507	Coro::cede;
1508
1509	unless ($self->{deny_activate}) {
1510	$self->decay_objects;
1511	$self->fix_auto_apply;
1512	$self->update_buttons;
1513	Coro::cede;	1542	Coro::cede;
1514	$self->set_darkness_map;	1543
		1544	$self->_load_objects ($self->{load_path}, 1)
		1545	or return;
		1546
		1547	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
		1548	if delete $self->{load_original};
		1549
		1550	if (my $uniq = $self->uniq_path) {
		1551	utf8::encode $uniq;
		1552	if (aio_open $uniq, O_RDONLY, 0) {
		1553	$self->clear_unique_items;
		1554	$self->_load_objects ($uniq, 0);
		1555	}
		1556	}
		1557
		1558	Coro::cede;
		1559	# now do the right thing for maps
		1560	$self->link_multipart_objects;
1515	$self->difficulty ($self->estimate_difficulty)	1561	$self->difficulty ($self->estimate_difficulty)
1516	unless $self->difficulty;	1562	unless $self->difficulty;
1517	Coro::cede;	1563	Coro::cede;
		1564
		1565	unless ($self->{deny_activate}) {
		1566	$self->decay_objects;
		1567	$self->fix_auto_apply;
		1568	$self->update_buttons;
		1569	Coro::cede;
		1570	$self->set_darkness_map;
		1571	Coro::cede;
1518	$self->activate;	1572	$self->activate;
1519	Coro::cede;	1573	}
		1574
		1575	$self->in_memory (cf::MAP_IN_MEMORY);
1520	}	1576	}
1521		1577
1522	$self->post_load;	1578	$self->post_load;
1523	Coro::cede;
1524
1525	$self->in_memory (cf::MAP_IN_MEMORY);
1526	}	1579	}
1527		1580
1528	sub customise_for {	1581	sub customise_for {
1529	my ($self, $ob) = @_;	1582	my ($self, $ob) = @_;
1530		1583
…		…
1671	my $lock = cf::lock_acquire "map_data:$self->{path}";	1724	my $lock = cf::lock_acquire "map_data:$self->{path}";
1672		1725
1673	return if $self->players;	1726	return if $self->players;
1674	return if $self->isa ("ext::map_per_player");#d#	1727	return if $self->isa ("ext::map_per_player");#d#
1675		1728
1676	warn "resetting map ", $self->path;#d#	1729	warn "resetting map ", $self->path;
1677		1730
1678	$self->in_memory (cf::MAP_SWAPPED);	1731	$self->in_memory (cf::MAP_SWAPPED);
1679		1732
1680	# need to save uniques path	1733	# need to save uniques path
1681	unless ($self->{deny_save}) {	1734	unless ($self->{deny_save}) {
…		…
1721	instantiated unique items. May block.	1774	instantiated unique items. May block.
1722		1775
1723	=cut	1776	=cut
1724		1777
1725	sub unique_maps() {	1778	sub unique_maps() {
1726	my $files = aio_readdir cf::localdir . "/" . cf::uniquedir	1779	my $files = aio_readdir $UNIQUEDIR
1727	or return;	1780	or return;
1728		1781
1729	my @paths;	1782	my @paths;
1730		1783
1731	for (@$files) {	1784	for (@$files) {
…		…
1850	$self->deactivate_recursive;	1903	$self->deactivate_recursive;
1851		1904
1852	return if UNIVERSAL::isa $self->map, "ext::map_link";	1905	return if UNIVERSAL::isa $self->map, "ext::map_link";
1853		1906
1854	$self->{_link_pos} \|\|= [$self->map->{path}, $self->x, $self->y]	1907	$self->{_link_pos} \|\|= [$self->map->{path}, $self->x, $self->y]
1855	if $self->map;	1908	if $self->map && $self->map->{path} ne "{link}";
1856		1909
1857	$self->enter_map ($LINK_MAP \|\| link_map, 10, 10);	1910	$self->enter_map ($LINK_MAP \|\| link_map, 10, 10);
1858	}	1911	}
1859		1912
1860	sub cf::object::player::leave_link {	1913	sub cf::object::player::leave_link {
1861	my ($self, $map, $x, $y) = @_;	1914	my ($self, $map, $x, $y) = @_;
		1915
		1916	return unless $self->contr->active;
1862		1917
1863	my $link_pos = delete $self->{_link_pos};	1918	my $link_pos = delete $self->{_link_pos};
1864		1919
1865	unless ($map) {	1920	unless ($map) {
1866	# restore original map position	1921	# restore original map position
…		…
1889		1944
1890	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	1945	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1891	$self->enter_map ($map, $x, $y);	1946	$self->enter_map ($map, $x, $y);
1892	}	1947	}
1893		1948
1894	cf::player->attach (
1895	on_logout => sub {
1896	my ($pl) = @_;
1897
1898	# abort map switching before logout
1899	if ($pl->ob->{_link_pos}) {
1900	cf::sync_job {
1901	$pl->ob->leave_link
1902	};
1903	}
1904	},
1905	on_login => sub {
1906	my ($pl) = @_;
1907
1908	# try to abort aborted map switching on player login :)
1909	# should happen only on crashes
1910	if ($pl->ob->{_link_pos}) {
1911	$pl->ob->enter_link;
1912	(async {
1913	$pl->ob->reply (undef,
1914	"There was an internal problem at your last logout, "
1915	. "the server will try to bring you to your intended destination in a second.",
1916	cf::NDI_RED);
1917	# we need this sleep as the login has a concurrent enter_exit running
1918	# and this sleep increases chances of the player not ending up in scorn
1919	Coro::Timer::sleep 1;
1920	$pl->ob->leave_link;
1921	})->prio (2);
1922	}
1923	},
1924	);
1925
1926	=item $player_object->goto ($path, $x, $y)	1949	=item $player_object->goto ($path, $x, $y[, $check->($map)])
1927		1950
		1951	Moves the player to the given map-path and coordinates by first freezing
		1952	her, loading and preparing them map, calling the provided $check callback
		1953	that has to return the map if sucecssful, and then unfreezes the player on
		1954	the new (success) or old (failed) map position.
		1955
1928	=cut	1956	=cut
		1957
		1958	our $GOTOGEN;
1929		1959
1930	sub cf::object::player::goto {	1960	sub cf::object::player::goto {
1931	my ($self, $path, $x, $y) = @_;	1961	my ($self, $path, $x, $y, $check) = @_;
		1962
		1963	# do generation counting so two concurrent goto's will be executed in-order
		1964	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1932		1965
1933	$self->enter_link;	1966	$self->enter_link;
1934		1967
1935	(async {	1968	(async {
1936	my $map = eval {	1969	my $map = eval {
1937	my $map = cf::map::find $path;	1970	my $map = cf::map::find $path;
		1971
		1972	if ($map) {
1938	$map = $map->customise_for ($self) if $map;	1973	$map = $map->customise_for ($self);
		1974	$map = $check->($map) if $check && $map;
		1975	} else {
		1976	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);
		1977	}
		1978
1939	$map	1979	$map
		1980	};
		1981
		1982	if ($@) {
		1983	$self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE \| cf::NDI_RED);
		1984	LOG llevError \| logBacktrace, Carp::longmess $@;
1940	} or	1985	}
1941	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);
1942		1986
		1987	if ($gen == $self->{_goto_generation}) {
		1988	delete $self->{_goto_generation};
1943	$self->leave_link ($map, $x, $y);	1989	$self->leave_link ($map, $x, $y);
		1990	}
1944	})->prio (1);	1991	})->prio (1);
1945	}	1992	}
1946		1993
1947	=item $player_object->enter_exit ($exit_object)	1994	=item $player_object->enter_exit ($exit_object)
1948		1995
…		…
1987		2034
1988	$rmp->{random_seed} \|\|= $exit->random_seed;	2035	$rmp->{random_seed} \|\|= $exit->random_seed;
1989		2036
1990	my $data = cf::to_json $rmp;	2037	my $data = cf::to_json $rmp;
1991	my $md5 = Digest::MD5::md5_hex $data;	2038	my $md5 = Digest::MD5::md5_hex $data;
1992	my $meta = "$cf::RANDOM_MAPS/$md5.meta";	2039	my $meta = "$RANDOMDIR/$md5.meta";
1993		2040
1994	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {	2041	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {
1995	aio_write $fh, 0, (length $data), $data, 0;	2042	aio_write $fh, 0, (length $data), $data, 0;
1996	undef $fh;	2043	undef $fh;
1997	aio_rename "$meta~", $meta;	2044	aio_rename "$meta~", $meta;
…		…
2373		2420
2374	return db_get cache => "$id/data";	2421	return db_get cache => "$id/data";
2375	}	2422	}
2376	}	2423	}
2377		2424
		2425	my $t1 = Time::HiRes::time;
2378	my $data = $process->(\@data);	2426	my $data = $process->(\@data);
		2427	my $t2 = Time::HiRes::time;
		2428
		2429	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2379		2430
2380	db_put cache => "$id/data", $data;	2431	db_put cache => "$id/data", $data;
2381	db_put cache => "$id/md5" , $md5;	2432	db_put cache => "$id/md5" , $md5;
2382	db_put cache => "$id/meta", $meta;	2433	db_put cache => "$id/meta", $meta;
2383		2434
…		…
2414		2465
2415	die $$res unless "ARRAY" eq ref $res;	2466	die $$res unless "ARRAY" eq ref $res;
2416		2467
2417	return wantarray ? @$res : $res->[-1];	2468	return wantarray ? @$res : $res->[-1];
2418	} else {	2469	} else {
		2470	reset_signals;
		2471	local $SIG{__WARN__};
		2472	local $SIG{__DIE__};
2419	eval {	2473	eval {
2420	local $SIG{__DIE__};
2421	local $SIG{__WARN__};
2422	close $fh1;	2474	close $fh1;
2423		2475
2424	my @res = eval { $cb->(@args) };	2476	my @res = eval { $cb->(@args) };
2425	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);	2477	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2426	};	2478	};
2427		2479
		2480	warn $@ if $@;
2428	_exit 0;	2481	_exit 0;
2429	}	2482	}
2430	}	2483	}
2431
2432
2433		2484
2434	#############################################################################	2485	#############################################################################
2435	# the server's init and main functions	2486	# the server's init and main functions
2436		2487
2437	sub load_facedata($) {	2488	sub load_facedata($) {
…		…
2484	}	2535	}
2485		2536
2486	1	2537	1
2487	}	2538	}
2488		2539
		2540	sub reload_regions {
		2541	load_resource_file "$MAPDIR/regions"
		2542	or die "unable to load regions file\n";
		2543	}
		2544
2489	sub reload_facedata {	2545	sub reload_facedata {
2490	load_facedata sprintf "%s/facedata", cf::datadir	2546	load_facedata "$DATADIR/facedata"
2491	or die "unable to load facedata\n";	2547	or die "unable to load facedata\n";
2492	}	2548	}
2493		2549
2494	sub reload_regions {
2495	load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2496	or die "unable to load regions file\n";
2497	}
2498
2499	sub reload_archetypes {	2550	sub reload_archetypes {
2500	load_resource_file sprintf "%s/archetypes", cf::datadir	2551	load_resource_file "$DATADIR/archetypes"
2501	or die "unable to load archetypes\n";	2552	or die "unable to load archetypes\n";
2502	}	2553	}
2503		2554
2504	sub reload_treasures {	2555	sub reload_treasures {
2505	load_resource_file sprintf "%s/treasures", cf::datadir	2556	load_resource_file "$DATADIR/treasures"
2506	or die "unable to load treasurelists\n";	2557	or die "unable to load treasurelists\n";
2507	}	2558	}
2508		2559
2509	sub reload_resources {	2560	sub reload_resources {
2510	warn "reloading resource files...\n";	2561	warn "reloading resource files...\n";
2511		2562
2512	reload_regions;	2563	reload_regions;
2513	reload_facedata;	2564	reload_facedata;
		2565	#reload_archetypes;#d#
2514	reload_archetypes;	2566	reload_archetypes;
2515	reload_treasures;	2567	reload_treasures;
2516		2568
2517	warn "finished reloading resource files\n";	2569	warn "finished reloading resource files\n";
2518	}	2570	}
…		…
2520	sub init {	2572	sub init {
2521	reload_resources;	2573	reload_resources;
2522	}	2574	}
2523		2575
2524	sub cfg_load {	2576	sub cfg_load {
2525	open my $fh, "<:utf8", cf::confdir . "/config"	2577	open my $fh, "<:utf8", "$CONFDIR/config"
2526	or return;	2578	or return;
2527		2579
2528	local $/;	2580	local $/;
2529	*CFG = YAML::Syck::Load <$fh>;	2581	*CFG = YAML::Syck::Load <$fh>;
2530		2582
…		…
2700	Symbol::delete_package "safe::$_"	2752	Symbol::delete_package "safe::$_"
2701	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	2753	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2702		2754
2703	warn "unloading cf.pm \"a bit\"";	2755	warn "unloading cf.pm \"a bit\"";
2704	delete $INC{"cf.pm"};	2756	delete $INC{"cf.pm"};
		2757	delete $INC{"cf/pod.pm"};
2705		2758
2706	# don't, removes xs symbols, too,	2759	# don't, removes xs symbols, too,
2707	# and global variables created in xs	2760	# and global variables created in xs
2708	#Symbol::delete_package __PACKAGE__;	2761	#Symbol::delete_package __PACKAGE__;
2709		2762
…		…
2787	my $signal = new Coro::Signal;	2840	my $signal = new Coro::Signal;
2788	push @WAIT_FOR_TICK_BEGIN, $signal;	2841	push @WAIT_FOR_TICK_BEGIN, $signal;
2789	$signal->wait;	2842	$signal->wait;
2790	}	2843	}
2791		2844
		2845	my $min = 1e6;#d#
		2846	my $avg = 10;
2792	$TICK_WATCHER = Event->timer (	2847	$TICK_WATCHER = Event->timer (
2793	reentrant => 0,	2848	reentrant => 0,
2794	parked => 1,	2849	parked => 1,
2795	prio => 0,	2850	prio => 0,
2796	at => $NEXT_TICK \|\| $TICK,	2851	at => $NEXT_TICK \|\| $TICK,
…		…
2800	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	2855	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2801	unless ++$bug_warning > 10;	2856	unless ++$bug_warning > 10;
2802	return;	2857	return;
2803	}	2858	}
2804		2859
2805	$NOW = Event::time;	2860	$NOW = $tick_start = Event::time;
2806		2861
2807	cf::server_tick; # one server iteration	2862	cf::server_tick; # one server iteration
		2863
		2864	0 && sync_job {#d#
		2865	for(1..10) {
		2866	my $t = Event::time;
		2867	my $map = my $map = new_from_path cf::map "/tmp/x.map"
		2868	or die;
		2869
		2870	$map->width (50);
		2871	$map->height (50);
		2872	$map->alloc;
		2873	$map->_load_objects ("/tmp/x.map", 1);
		2874	my $t = Event::time - $t;
		2875
		2876	#next unless $t < 0.0013;#d#
		2877	if ($t < $min) {
		2878	$min = $t;
		2879	}
		2880	$avg = $avg * 0.99 + $t * 0.01;
		2881	}
		2882	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
		2883	exit 0;
		2884	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
		2885	};
2808		2886
2809	$RUNTIME += $TICK;	2887	$RUNTIME += $TICK;
2810	$NEXT_TICK += $TICK;	2888	$NEXT_TICK += $TICK;
2811		2889
2812	if ($NOW >= $NEXT_RUNTIME_WRITE) {	2890	if ($NOW >= $NEXT_RUNTIME_WRITE) {
…		…
2818	}	2896	}
2819		2897
2820	# my $AFTER = Event::time;	2898	# my $AFTER = Event::time;
2821	# warn $AFTER - $NOW;#d#	2899	# warn $AFTER - $NOW;#d#
2822		2900
		2901	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
		2902	$sig->send;
		2903	}
		2904	while (my $sig = shift @WAIT_FOR_TICK) {
		2905	$sig->send;
		2906	}
		2907
		2908	$NOW = Event::time;
		2909
2823	# if we are delayed by four ticks or more, skip them all	2910	# if we are delayed by four ticks or more, skip them all
2824	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2911	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2825		2912
2826	$TICK_WATCHER->at ($NEXT_TICK);	2913	$TICK_WATCHER->at ($NEXT_TICK);
2827	$TICK_WATCHER->start;	2914	$TICK_WATCHER->start;
2828		2915
2829	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	2916	$LOAD = ($NOW - $tick_start) / $TICK;
2830	$sig->send;	2917	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2831	}
2832	while (my $sig = shift @WAIT_FOR_TICK) {
2833	$sig->send;
2834	}
2835		2918
2836	_post_tick;	2919	_post_tick;
		2920
		2921
2837	},	2922	},
2838	);	2923	);
2839		2924
2840	{	2925	{
2841	BDB::max_poll_time $TICK * 0.1;	2926	BDB::max_poll_time $TICK * 0.1;
…		…
2869		2954
2870	cf::sync_job {	2955	cf::sync_job {
2871	eval {	2956	eval {
2872	BDB::db_env_open	2957	BDB::db_env_open
2873	$DB_ENV,	2958	$DB_ENV,
2874	$BDB_ENV_DIR,	2959	$BDBDIR,
2875	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN	2960	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN
2876	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	2961	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
2877	0666;	2962	0666;
2878		2963
2879	cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;	2964	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2880		2965
2881	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);	2966	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
2882	$DB_ENV->set_lk_detect;	2967	$DB_ENV->set_lk_detect;
2883	};	2968	};
2884		2969
…		…
2900	prio => 6,	2985	prio => 6,
2901	cb => \&IO::AIO::poll_cb,	2986	cb => \&IO::AIO::poll_cb,
2902	);	2987	);
2903	}	2988	}
2904		2989
		2990	my $_log_backtrace;
		2991
		2992	sub _log_backtrace {
		2993	my ($msg, @addr) = @_;
		2994
		2995	$msg =~ s/\n//;
		2996
		2997	# limit the # of concurrent backtraces
		2998	if ($_log_backtrace < 2) {
		2999	++$_log_backtrace;
		3000	async {
		3001	my @bt = fork_call {
		3002	@addr = map { sprintf "%x", $_ } @addr;
		3003	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
		3004	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"
		3005	or die "addr2line: $!";
		3006
		3007	my @funcs;
		3008	my @res = <$fh>;
		3009	chomp for @res;
		3010	while (@res) {
		3011	my ($func, $line) = splice @res, 0, 2, ();
		3012	push @funcs, "[$func] $line";
		3013	}
		3014
		3015	@funcs
		3016	};
		3017
		3018	LOG llevInfo, "[ABT] $msg\n";
		3019	LOG llevInfo, "[ABT] $_\n" for @bt;
		3020	--$_log_backtrace;
		3021	};
		3022	} else {
		3023	LOG llevInfo, "[ABT] $msg\n";
		3024	LOG llevInfo, "[ABT] [suppressed]\n";
		3025	}
		3026	}
		3027
2905	# load additional modules	3028	# load additional modules
2906	use cf::pod;	3029	use cf::pod;
2907		3030
2908	END { cf::emergency_save }	3031	END { cf::emergency_save }
2909		3032

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.250 by root, Wed Apr 18 14:24:10 2007 UTC vs. Revision 1.274 by root, Tue Jun 5 13:05:02 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.250 by root, Wed Apr 18 14:24:10 2007 UTC vs.
Revision 1.274 by root, Tue Jun 5 13:05:02 2007 UTC