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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.251 by root, Wed Apr 18 14:45:13 2007 UTC vs.
Revision 1.275 by root, Thu Jun 7 19:12:22 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) {
…		…
1253	my ($self, $merge) = @_;	1305	my ($self, $merge) = @_;
1254		1306
1255	# we have to keep some variables in memory intact	1307	# we have to keep some variables in memory intact
1256	local $self->{path};	1308	local $self->{path};
1257	local $self->{load_path};	1309	local $self->{load_path};
1258	local $self->{deny_save};
1259	local $self->{deny_reset};
1260		1310
1261	$self->SUPER::thawer_merge ($merge);	1311	$self->SUPER::thawer_merge ($merge);
1262	}	1312	}
1263		1313
1264	sub normalise {	1314	sub normalise {
…		…
1336		1386
1337	# the original (read-only) location	1387	# the original (read-only) location
1338	sub load_path {	1388	sub load_path {
1339	my ($self) = @_;	1389	my ($self) = @_;
1340		1390
1341	sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}	1391	"$MAPDIR/$self->{path}.map"
1342	}	1392	}
1343		1393
1344	# the temporary/swap location	1394	# the temporary/swap location
1345	sub save_path {	1395	sub save_path {
1346	my ($self) = @_;	1396	my ($self) = @_;
1347		1397
1348	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1398	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1349	sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path	1399	"$TMPDIR/$path.map"
1350	}	1400	}
1351		1401
1352	# the unique path, undef == no special unique path	1402	# the unique path, undef == no special unique path
1353	sub uniq_path {	1403	sub uniq_path {
1354	my ($self) = @_;	1404	my ($self) = @_;
1355		1405
1356	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1406	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1357	sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path	1407	"$UNIQUEDIR/$path"
1358	}	1408	}
1359		1409
1360	# and all this just because we cannot iterate over	1410	# and all this just because we cannot iterate over
1361	# all maps in C++...	1411	# all maps in C++...
1362	sub change_all_map_light {	1412	sub change_all_map_light {
1363	my ($change) = @_;	1413	my ($change) = @_;
1364		1414
1365	$_->change_map_light ($change)	1415	$_->change_map_light ($change)
1366	for grep $_->outdoor, values %cf::MAP;	1416	for grep $_->outdoor, values %cf::MAP;
		1417	}
		1418
		1419	sub decay_objects {
		1420	my ($self) = @_;
		1421
		1422	return if $self->{deny_reset};
		1423
		1424	$self->do_decay_objects;
1367	}	1425	}
1368		1426
1369	sub unlink_save {	1427	sub unlink_save {
1370	my ($self) = @_;	1428	my ($self) = @_;
1371		1429
…		…
1429	$self->load_header_orig	1487	$self->load_header_orig
1430	or return;	1488	or return;
1431	$self->prepare_orig;	1489	$self->prepare_orig;
1432	}	1490	}
1433		1491
		1492	$self->{deny_reset} = 1
		1493	if $self->no_reset;
		1494
1434	$self->default_region (cf::region::find_by_path $self->{path})	1495	$self->default_region (cf::region::find_by_path $self->{path})
1435	unless $self->default_region;	1496	unless $self->default_region;
1436		1497
1437	1	1498	1
1438	}	1499	}
…		…
1453	$map->{last_save} = $cf::RUNTIME;	1514	$map->{last_save} = $cf::RUNTIME;
1454		1515
1455	$map->load_header	1516	$map->load_header
1456	or return;	1517	or return;
1457		1518
1458	if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)	1519	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1459	# doing this can freeze the server in a sync job, obviously	1520	# doing this can freeze the server in a sync job, obviously
1460	#$cf::WAIT_FOR_TICK->wait;	1521	#$cf::WAIT_FOR_TICK->wait;
1461	$map->reset;	1522	$map->reset;
1462	undef $guard;	1523	undef $guard;
1463	return find $path;	1524	return find $path;
…		…
1474	my ($self) = @_;	1535	my ($self) = @_;
1475		1536
1476	local $self->{deny_reset} = 1; # loading can take a long time	1537	local $self->{deny_reset} = 1; # loading can take a long time
1477		1538
1478	my $path = $self->{path};	1539	my $path = $self->{path};
		1540
		1541	{
1479	my $guard = cf::lock_acquire "map_load:$path";	1542	my $guard = cf::lock_acquire "map_load:$path";
1480		1543
1481	return if $self->in_memory != cf::MAP_SWAPPED;	1544	return if $self->in_memory != cf::MAP_SWAPPED;
1482		1545
1483	$self->in_memory (cf::MAP_LOADING);	1546	$self->in_memory (cf::MAP_LOADING);
1484		1547
1485	$self->alloc;	1548	$self->alloc;
1486		1549
1487	$self->pre_load;	1550	$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;	1551	Coro::cede;
1514	$self->set_darkness_map;	1552
		1553	$self->_load_objects ($self->{load_path}, 1)
		1554	or return;
		1555
		1556	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
		1557	if delete $self->{load_original};
		1558
		1559	if (my $uniq = $self->uniq_path) {
		1560	utf8::encode $uniq;
		1561	if (aio_open $uniq, O_RDONLY, 0) {
		1562	$self->clear_unique_items;
		1563	$self->_load_objects ($uniq, 0);
		1564	}
		1565	}
		1566
		1567	Coro::cede;
		1568	# now do the right thing for maps
		1569	$self->link_multipart_objects;
1515	$self->difficulty ($self->estimate_difficulty)	1570	$self->difficulty ($self->estimate_difficulty)
1516	unless $self->difficulty;	1571	unless $self->difficulty;
1517	Coro::cede;	1572	Coro::cede;
		1573
		1574	unless ($self->{deny_activate}) {
		1575	$self->decay_objects;
		1576	$self->fix_auto_apply;
		1577	$self->update_buttons;
		1578	Coro::cede;
		1579	$self->set_darkness_map;
		1580	Coro::cede;
1518	$self->activate;	1581	$self->activate;
1519	Coro::cede;	1582	}
		1583
		1584	$self->in_memory (cf::MAP_IN_MEMORY);
1520	}	1585	}
1521		1586
1522	$self->post_load;	1587	$self->post_load;
1523	Coro::cede;
1524
1525	$self->in_memory (cf::MAP_IN_MEMORY);
1526	}	1588	}
1527		1589
1528	sub customise_for {	1590	sub customise_for {
1529	my ($self, $ob) = @_;	1591	my ($self, $ob) = @_;
1530		1592
1531	return find "~" . $ob->name . "/" . $self->{path}	1593	return find "~" . $ob->name . "/" . $self->{path}
1532	if $self->per_player;	1594	if $self->per_player;
		1595
		1596	# return find "?party/" . $ob->name . "/" . $self->{path}
		1597	# if $self->per_party;
1533		1598
1534	$self	1599	$self
1535	}	1600	}
1536		1601
1537	# 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
…		…
1648		1713
1649	sub reset_at {	1714	sub reset_at {
1650	my ($self) = @_;	1715	my ($self) = @_;
1651		1716
1652	# TODO: safety, remove and allow resettable per-player maps	1717	# TODO: safety, remove and allow resettable per-player maps
1653	return 1e99 if $self->isa ("ext::map_per_player");#d#
1654	return 1e99 if $self->{deny_reset};	1718	return 1e99 if $self->{deny_reset};
1655		1719
1656	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;	1720	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1657	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;
1658		1722
…		…
1669	my ($self) = @_;	1733	my ($self) = @_;
1670		1734
1671	my $lock = cf::lock_acquire "map_data:$self->{path}";	1735	my $lock = cf::lock_acquire "map_data:$self->{path}";
1672		1736
1673	return if $self->players;	1737	return if $self->players;
1674	return if $self->isa ("ext::map_per_player");#d#
1675		1738
1676	warn "resetting map ", $self->path;#d#	1739	warn "resetting map ", $self->path;
1677		1740
1678	$self->in_memory (cf::MAP_SWAPPED);	1741	$self->in_memory (cf::MAP_SWAPPED);
1679		1742
1680	# need to save uniques path	1743	# need to save uniques path
1681	unless ($self->{deny_save}) {	1744	unless ($self->{deny_save}) {
…		…
1721	instantiated unique items. May block.	1784	instantiated unique items. May block.
1722		1785
1723	=cut	1786	=cut
1724		1787
1725	sub unique_maps() {	1788	sub unique_maps() {
1726	my $files = aio_readdir cf::localdir . "/" . cf::uniquedir	1789	my $files = aio_readdir $UNIQUEDIR
1727	or return;	1790	or return;
1728		1791
1729	my @paths;	1792	my @paths;
1730		1793
1731	for (@$files) {	1794	for (@$files) {
…		…
1850	$self->deactivate_recursive;	1913	$self->deactivate_recursive;
1851		1914
1852	return if UNIVERSAL::isa $self->map, "ext::map_link";	1915	return if UNIVERSAL::isa $self->map, "ext::map_link";
1853		1916
1854	$self->{_link_pos} \|\|= [$self->map->{path}, $self->x, $self->y]	1917	$self->{_link_pos} \|\|= [$self->map->{path}, $self->x, $self->y]
1855	if $self->map;	1918	if $self->map && $self->map->{path} ne "{link}";
1856		1919
1857	$self->enter_map ($LINK_MAP \|\| link_map, 10, 10);	1920	$self->enter_map ($LINK_MAP \|\| link_map, 10, 10);
1858	}	1921	}
1859		1922
1860	sub cf::object::player::leave_link {	1923	sub cf::object::player::leave_link {
1861	my ($self, $map, $x, $y) = @_;	1924	my ($self, $map, $x, $y) = @_;
		1925
		1926	return unless $self->contr->active;
1862		1927
1863	my $link_pos = delete $self->{_link_pos};	1928	my $link_pos = delete $self->{_link_pos};
1864		1929
1865	unless ($map) {	1930	unless ($map) {
1866	# restore original map position	1931	# restore original map position
…		…
1889		1954
1890	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	1955	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1891	$self->enter_map ($map, $x, $y);	1956	$self->enter_map ($map, $x, $y);
1892	}	1957	}
1893		1958
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)	1959	=item $player_object->goto ($path, $x, $y[, $check->($map)])
1927		1960
		1961	Moves the player to the given map-path and coordinates by first freezing
		1962	her, loading and preparing them map, calling the provided $check callback
		1963	that has to return the map if sucecssful, and then unfreezes the player on
		1964	the new (success) or old (failed) map position.
		1965
1928	=cut	1966	=cut
		1967
		1968	our $GOTOGEN;
1929		1969
1930	sub cf::object::player::goto {	1970	sub cf::object::player::goto {
1931	my ($self, $path, $x, $y) = @_;	1971	my ($self, $path, $x, $y, $check) = @_;
		1972
		1973	# do generation counting so two concurrent goto's will be executed in-order
		1974	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1932		1975
1933	$self->enter_link;	1976	$self->enter_link;
1934		1977
1935	(async {	1978	(async {
1936	my $map = eval {	1979	my $map = eval {
1937	my $map = cf::map::find $path;	1980	my $map = cf::map::find $path;
		1981
		1982	if ($map) {
1938	$map = $map->customise_for ($self) if $map;	1983	$map = $map->customise_for ($self);
		1984	$map = $check->($map) if $check && $map;
		1985	} else {
		1986	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);
		1987	}
		1988
1939	$map	1989	$map
		1990	};
		1991
		1992	if ($@) {
		1993	$self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE \| cf::NDI_RED);
		1994	LOG llevError \| logBacktrace, Carp::longmess $@;
1940	} or	1995	}
1941	$self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE \| cf::NDI_RED);
1942		1996
		1997	if ($gen == $self->{_goto_generation}) {
		1998	delete $self->{_goto_generation};
1943	$self->leave_link ($map, $x, $y);	1999	$self->leave_link ($map, $x, $y);
		2000	}
1944	})->prio (1);	2001	})->prio (1);
1945	}	2002	}
1946		2003
1947	=item $player_object->enter_exit ($exit_object)	2004	=item $player_object->enter_exit ($exit_object)
1948		2005
…		…
1987		2044
1988	$rmp->{random_seed} \|\|= $exit->random_seed;	2045	$rmp->{random_seed} \|\|= $exit->random_seed;
1989		2046
1990	my $data = cf::to_json $rmp;	2047	my $data = cf::to_json $rmp;
1991	my $md5 = Digest::MD5::md5_hex $data;	2048	my $md5 = Digest::MD5::md5_hex $data;
1992	my $meta = "$cf::RANDOM_MAPS/$md5.meta";	2049	my $meta = "$RANDOMDIR/$md5.meta";
1993		2050
1994	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {	2051	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {
1995	aio_write $fh, 0, (length $data), $data, 0;	2052	aio_write $fh, 0, (length $data), $data, 0;
1996	undef $fh;	2053	undef $fh;
1997	aio_rename "$meta~", $meta;	2054	aio_rename "$meta~", $meta;
…		…
2373		2430
2374	return db_get cache => "$id/data";	2431	return db_get cache => "$id/data";
2375	}	2432	}
2376	}	2433	}
2377		2434
		2435	my $t1 = Time::HiRes::time;
2378	my $data = $process->(\@data);	2436	my $data = $process->(\@data);
		2437	my $t2 = Time::HiRes::time;
		2438
		2439	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2379		2440
2380	db_put cache => "$id/data", $data;	2441	db_put cache => "$id/data", $data;
2381	db_put cache => "$id/md5" , $md5;	2442	db_put cache => "$id/md5" , $md5;
2382	db_put cache => "$id/meta", $meta;	2443	db_put cache => "$id/meta", $meta;
2383		2444
…		…
2414		2475
2415	die $$res unless "ARRAY" eq ref $res;	2476	die $$res unless "ARRAY" eq ref $res;
2416		2477
2417	return wantarray ? @$res : $res->[-1];	2478	return wantarray ? @$res : $res->[-1];
2418	} else {	2479	} else {
		2480	reset_signals;
2419	local $SIG{__WARN__};	2481	local $SIG{__WARN__};
		2482	local $SIG{__DIE__};
2420	eval {	2483	eval {
2421	local $SIG{__DIE__};
2422	close $fh1;	2484	close $fh1;
2423		2485
2424	my @res = eval { $cb->(@args) };	2486	my @res = eval { $cb->(@args) };
2425	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);	2487	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2426	};	2488	};
2427		2489
2428	warn $@ if $@;	2490	warn $@ if $@;
2429	_exit 0;	2491	_exit 0;
2430	}	2492	}
2431	}	2493	}
2432
2433
2434		2494
2435	#############################################################################	2495	#############################################################################
2436	# the server's init and main functions	2496	# the server's init and main functions
2437		2497
2438	sub load_facedata($) {	2498	sub load_facedata($) {
…		…
2485	}	2545	}
2486		2546
2487	1	2547	1
2488	}	2548	}
2489		2549
		2550	sub reload_regions {
		2551	load_resource_file "$MAPDIR/regions"
		2552	or die "unable to load regions file\n";
		2553	}
		2554
2490	sub reload_facedata {	2555	sub reload_facedata {
2491	load_facedata sprintf "%s/facedata", cf::datadir	2556	load_facedata "$DATADIR/facedata"
2492	or die "unable to load facedata\n";	2557	or die "unable to load facedata\n";
2493	}	2558	}
2494		2559
2495	sub reload_regions {
2496	load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2497	or die "unable to load regions file\n";
2498	}
2499
2500	sub reload_archetypes {	2560	sub reload_archetypes {
2501	load_resource_file sprintf "%s/archetypes", cf::datadir	2561	load_resource_file "$DATADIR/archetypes"
2502	or die "unable to load archetypes\n";	2562	or die "unable to load archetypes\n";
2503	}	2563	}
2504		2564
2505	sub reload_treasures {	2565	sub reload_treasures {
2506	load_resource_file sprintf "%s/treasures", cf::datadir	2566	load_resource_file "$DATADIR/treasures"
2507	or die "unable to load treasurelists\n";	2567	or die "unable to load treasurelists\n";
2508	}	2568	}
2509		2569
2510	sub reload_resources {	2570	sub reload_resources {
2511	warn "reloading resource files...\n";	2571	warn "reloading resource files...\n";
2512		2572
2513	reload_regions;	2573	reload_regions;
2514	reload_facedata;	2574	reload_facedata;
		2575	#reload_archetypes;#d#
2515	reload_archetypes;	2576	reload_archetypes;
2516	reload_treasures;	2577	reload_treasures;
2517		2578
2518	warn "finished reloading resource files\n";	2579	warn "finished reloading resource files\n";
2519	}	2580	}
…		…
2521	sub init {	2582	sub init {
2522	reload_resources;	2583	reload_resources;
2523	}	2584	}
2524		2585
2525	sub cfg_load {	2586	sub cfg_load {
2526	open my $fh, "<:utf8", cf::confdir . "/config"	2587	open my $fh, "<:utf8", "$CONFDIR/config"
2527	or return;	2588	or return;
2528		2589
2529	local $/;	2590	local $/;
2530	*CFG = YAML::Syck::Load <$fh>;	2591	*CFG = YAML::Syck::Load <$fh>;
2531		2592
…		…
2701	Symbol::delete_package "safe::$_"	2762	Symbol::delete_package "safe::$_"
2702	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	2763	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2703		2764
2704	warn "unloading cf.pm \"a bit\"";	2765	warn "unloading cf.pm \"a bit\"";
2705	delete $INC{"cf.pm"};	2766	delete $INC{"cf.pm"};
		2767	delete $INC{"cf/pod.pm"};
2706		2768
2707	# don't, removes xs symbols, too,	2769	# don't, removes xs symbols, too,
2708	# and global variables created in xs	2770	# and global variables created in xs
2709	#Symbol::delete_package __PACKAGE__;	2771	#Symbol::delete_package __PACKAGE__;
2710		2772
…		…
2788	my $signal = new Coro::Signal;	2850	my $signal = new Coro::Signal;
2789	push @WAIT_FOR_TICK_BEGIN, $signal;	2851	push @WAIT_FOR_TICK_BEGIN, $signal;
2790	$signal->wait;	2852	$signal->wait;
2791	}	2853	}
2792		2854
		2855	my $min = 1e6;#d#
		2856	my $avg = 10;
2793	$TICK_WATCHER = Event->timer (	2857	$TICK_WATCHER = Event->timer (
2794	reentrant => 0,	2858	reentrant => 0,
2795	parked => 1,	2859	parked => 1,
2796	prio => 0,	2860	prio => 0,
2797	at => $NEXT_TICK \|\| $TICK,	2861	at => $NEXT_TICK \|\| $TICK,
…		…
2801	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	2865	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2802	unless ++$bug_warning > 10;	2866	unless ++$bug_warning > 10;
2803	return;	2867	return;
2804	}	2868	}
2805		2869
2806	$NOW = Event::time;	2870	$NOW = $tick_start = Event::time;
2807		2871
2808	cf::server_tick; # one server iteration	2872	cf::server_tick; # one server iteration
		2873
		2874	0 && sync_job {#d#
		2875	for(1..10) {
		2876	my $t = Event::time;
		2877	my $map = my $map = new_from_path cf::map "/tmp/x.map"
		2878	or die;
		2879
		2880	$map->width (50);
		2881	$map->height (50);
		2882	$map->alloc;
		2883	$map->_load_objects ("/tmp/x.map", 1);
		2884	my $t = Event::time - $t;
		2885
		2886	#next unless $t < 0.0013;#d#
		2887	if ($t < $min) {
		2888	$min = $t;
		2889	}
		2890	$avg = $avg * 0.99 + $t * 0.01;
		2891	}
		2892	warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
		2893	exit 0;
		2894	# 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
		2895	};
2809		2896
2810	$RUNTIME += $TICK;	2897	$RUNTIME += $TICK;
2811	$NEXT_TICK += $TICK;	2898	$NEXT_TICK += $TICK;
2812		2899
2813	if ($NOW >= $NEXT_RUNTIME_WRITE) {	2900	if ($NOW >= $NEXT_RUNTIME_WRITE) {
…		…
2819	}	2906	}
2820		2907
2821	# my $AFTER = Event::time;	2908	# my $AFTER = Event::time;
2822	# warn $AFTER - $NOW;#d#	2909	# warn $AFTER - $NOW;#d#
2823		2910
		2911	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
		2912	$sig->send;
		2913	}
		2914	while (my $sig = shift @WAIT_FOR_TICK) {
		2915	$sig->send;
		2916	}
		2917
		2918	$NOW = Event::time;
		2919
2824	# if we are delayed by four ticks or more, skip them all	2920	# if we are delayed by four ticks or more, skip them all
2825	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2921	$NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2826		2922
2827	$TICK_WATCHER->at ($NEXT_TICK);	2923	$TICK_WATCHER->at ($NEXT_TICK);
2828	$TICK_WATCHER->start;	2924	$TICK_WATCHER->start;
2829		2925
2830	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	2926	$LOAD = ($NOW - $tick_start) / $TICK;
2831	$sig->send;	2927	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2832	}
2833	while (my $sig = shift @WAIT_FOR_TICK) {
2834	$sig->send;
2835	}
2836		2928
2837	_post_tick;	2929	_post_tick;
		2930
		2931
2838	},	2932	},
2839	);	2933	);
2840		2934
2841	{	2935	{
2842	BDB::max_poll_time $TICK * 0.1;	2936	BDB::max_poll_time $TICK * 0.1;
…		…
2870		2964
2871	cf::sync_job {	2965	cf::sync_job {
2872	eval {	2966	eval {
2873	BDB::db_env_open	2967	BDB::db_env_open
2874	$DB_ENV,	2968	$DB_ENV,
2875	$BDB_ENV_DIR,	2969	$BDBDIR,
2876	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN	2970	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN
2877	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	2971	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
2878	0666;	2972	0666;
2879		2973
2880	cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;	2974	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2881		2975
2882	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);	2976	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
2883	$DB_ENV->set_lk_detect;	2977	$DB_ENV->set_lk_detect;
2884	};	2978	};
2885		2979
…		…
2901	prio => 6,	2995	prio => 6,
2902	cb => \&IO::AIO::poll_cb,	2996	cb => \&IO::AIO::poll_cb,
2903	);	2997	);
2904	}	2998	}
2905		2999
		3000	my $_log_backtrace;
		3001
		3002	sub _log_backtrace {
		3003	my ($msg, @addr) = @_;
		3004
		3005	$msg =~ s/\n//;
		3006
		3007	# limit the # of concurrent backtraces
		3008	if ($_log_backtrace < 2) {
		3009	++$_log_backtrace;
		3010	async {
		3011	my @bt = fork_call {
		3012	@addr = map { sprintf "%x", $_ } @addr;
		3013	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
		3014	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"
		3015	or die "addr2line: $!";
		3016
		3017	my @funcs;
		3018	my @res = <$fh>;
		3019	chomp for @res;
		3020	while (@res) {
		3021	my ($func, $line) = splice @res, 0, 2, ();
		3022	push @funcs, "[$func] $line";
		3023	}
		3024
		3025	@funcs
		3026	};
		3027
		3028	LOG llevInfo, "[ABT] $msg\n";
		3029	LOG llevInfo, "[ABT] $_\n" for @bt;
		3030	--$_log_backtrace;
		3031	};
		3032	} else {
		3033	LOG llevInfo, "[ABT] $msg\n";
		3034	LOG llevInfo, "[ABT] [suppressed]\n";
		3035	}
		3036	}
		3037
2906	# load additional modules	3038	# load additional modules
2907	use cf::pod;	3039	use cf::pod;
2908		3040
2909	END { cf::emergency_save }	3041	END { cf::emergency_save }
2910		3042

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.251 by root, Wed Apr 18 14:45:13 2007 UTC vs. Revision 1.275 by root, Thu Jun 7 19:12:22 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.251 by root, Wed Apr 18 14:45:13 2007 UTC vs.
Revision 1.275 by root, Thu Jun 7 19:12:22 2007 UTC