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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.225 by root, Wed Mar 14 00:04:58 2007 UTC vs.
Revision 1.257 by root, Sat Apr 21 17:34:24 2007 UTC

…		…
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Symbol;	6	use Symbol;
7	use List::Util;	7	use List::Util;
		8	use Socket;
8	use Storable;	9	use Storable;
9	use Event;	10	use Event;
10	use Opcode;	11	use Opcode;
11	use Safe;	12	use Safe;
12	use Safe::Hole;	13	use Safe::Hole;
13		14
14	use Coro 3.52 ();	15	use Coro 3.61 ();
15	use Coro::State;	16	use Coro::State;
		17	use Coro::Handle;
16	use Coro::Event;	18	use Coro::Event;
17	use Coro::Timer;	19	use Coro::Timer;
18	use Coro::Signal;	20	use Coro::Signal;
19	use Coro::Semaphore;	21	use Coro::Semaphore;
20	use Coro::AIO;	22	use Coro::AIO;
		23	use Coro::Storable;
21		24
22	use BDB ();	25	use BDB ();
23	use Data::Dumper;	26	use Data::Dumper;
24	use Digest::MD5;	27	use Digest::MD5;
25	use Fcntl;	28	use Fcntl;
		29	use YAML::Syck ();
26	use IO::AIO 2.32 ();	30	use IO::AIO 2.32 ();
27	use YAML::Syck ();
28	use Time::HiRes;	31	use Time::HiRes;
29	use Compress::LZF;	32	use Compress::LZF;
30		33
		34	# configure various modules to our taste
		35	#
		36	$Storable::canonical = 1; # reduce rsync transfers
31	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	37	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
32	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	38	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
		39
33	$Event::Eval = 1; # no idea why this is required, but it is	40	$Event::Eval = 1; # no idea why this is required, but it is
34
35	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
36		41
37	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?	42	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
38	$YAML::Syck::ImplicitUnicode = 1;	43	$YAML::Syck::ImplicitUnicode = 1;
39		44
40	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	45	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
		46
		47	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
41		48
42	our %COMMAND = ();	49	our %COMMAND = ();
43	our %COMMAND_TIME = ();	50	our %COMMAND_TIME = ();
44		51
45	our @EXTS = (); # list of extension package names	52	our @EXTS = (); # list of extension package names
…		…
47	our %EXT_CORO = (); # coroutines bound to extensions	54	our %EXT_CORO = (); # coroutines bound to extensions
48	our %EXT_MAP = (); # pluggable maps	55	our %EXT_MAP = (); # pluggable maps
49		56
50	our $RELOAD; # number of reloads so far	57	our $RELOAD; # number of reloads so far
51	our @EVENT;	58	our @EVENT;
52	our $LIBDIR = datadir . "/ext";
53		59
54	our $TICK = MAX_TIME * 1e-6;	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";
		71
		72	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
55	our $TICK_WATCHER;	73	our $TICK_WATCHER;
56	our $AIO_POLL_WATCHER;	74	our $AIO_POLL_WATCHER;
57	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	75	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
58	our $NEXT_TICK;	76	our $NEXT_TICK;
59	our $NOW;	77	our $NOW;
…		…
68	our $RUNTIME;	86	our $RUNTIME;
69		87
70	our %PLAYER; # all users	88	our %PLAYER; # all users
71	our %MAP; # all maps	89	our %MAP; # all maps
72	our $LINK_MAP; # the special {link} map, which is always available	90	our $LINK_MAP; # the special {link} map, which is always available
73	our $RANDOM_MAPS = cf::localdir . "/random";
74	our $BDB_ENV_DIR = cf::localdir . "/db";
75
76	our $WAIT_FOR_TICK; $WAIT_FOR_TICK \|\|= new Coro::Signal;
77	our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE \|\|= new Coro::Signal;
78		91
79	# 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 ∕
80	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	93	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
81		94
82	binmode STDOUT;	95	binmode STDOUT;
83	binmode STDERR;	96	binmode STDERR;
84		97
85	# read virtual server time, if available	98	# read virtual server time, if available
86	unless ($RUNTIME \|\| !-e cf::localdir . "/runtime") {	99	unless ($RUNTIME \|\| !-e "$LOCALDIR/runtime") {
87	open my $fh, "<", cf::localdir . "/runtime"	100	open my $fh, "<", "$LOCALDIR/runtime"
88	or die "unable to read runtime file: $!";	101	or die "unable to read runtime file: $!";
89	$RUNTIME = <$fh> + 0.;	102	$RUNTIME = <$fh> + 0.;
90	}	103	}
91		104
92	mkdir cf::localdir;	105	mkdir $_
93	mkdir cf::localdir . "/" . cf::playerdir;	106	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
94	mkdir cf::localdir . "/" . cf::tmpdir;
95	mkdir cf::localdir . "/" . cf::uniquedir;
96	mkdir $RANDOM_MAPS;
97	mkdir $BDB_ENV_DIR;
98		107
99	our $EMERGENCY_POSITION;	108	our $EMERGENCY_POSITION;
100		109
101	sub cf::map::normalise;	110	sub cf::map::normalise;
102		111
…		…
113	=item $cf::RUNTIME	122	=item $cf::RUNTIME
114		123
115	The time this server has run, starts at 0 and is increased by $cf::TICK on	124	The time this server has run, starts at 0 and is increased by $cf::TICK on
116	every server tick.	125	every server tick.
117		126
118	=item $cf::LIBDIR	127	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
		128	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
		129	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
119		130
120	The perl library directory, where extensions and cf-specific modules can	131	Various directories - "/etc", read-only install directory, perl-library
121	be found. It will be added to C<@INC> automatically.	132	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
		133	unique-items directory, player file directory, random maps directory and
		134	database environment.
122		135
123	=item $cf::NOW	136	=item $cf::NOW
124		137
125	The time of the last (current) server tick.	138	The time of the last (current) server tick.
126		139
…		…
131	=item %cf::CFG	144	=item %cf::CFG
132		145
133	Configuration for the server, loaded from C</etc/crossfire/config>, or	146	Configuration for the server, loaded from C</etc/crossfire/config>, or
134	from wherever your confdir points to.	147	from wherever your confdir points to.
135		148
136	=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE	149	=item cf::wait_for_tick, cf::wait_for_tick_begin
137		150
138	These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)	151	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
139	or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick	152	returns directly I<after> the tick processing (and consequently, can only wake one process
140	processing has been done. Call C<< ->wait >> on them to maximise the	153	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
141	window of cpu time available, or simply to synchronise to the server tick.
142		154
143	=back	155	=back
144		156
145	=cut	157	=cut
146		158
147	BEGIN {	159	BEGIN {
148	*CORE::GLOBAL::warn = sub {	160	*CORE::GLOBAL::warn = sub {
149	my $msg = join "", @_;	161	my $msg = join "", @_;
150	utf8::encode $msg;
151		162
152	$msg .= "\n"	163	$msg .= "\n"
153	unless $msg =~ /\n$/;	164	unless $msg =~ /\n$/;
154		165
		166	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
		167
		168	utf8::encode $msg;
155	LOG llevError, $msg;	169	LOG llevError, $msg;
156	};	170	};
157	}	171	}
158		172
159	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	173	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
205	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	219	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
206	$d	220	$d
207	} \|\| "[unable to dump $_[0]: '$@']";	221	} \|\| "[unable to dump $_[0]: '$@']";
208	}	222	}
209		223
210	use JSON::Syck (); # TODO# replace by JSON::PC once working	224	use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
211		225
212	=item $ref = cf::from_json $json	226	=item $ref = cf::from_json $json
213		227
214	Converts a JSON string into the corresponding perl data structure.	228	Converts a JSON string into the corresponding perl data structure.
215		229
216	=cut
217
218	sub from_json($) {
219	$JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
220	JSON::Syck::Load $_[0]
221	}
222
223	=item $json = cf::to_json $ref	230	=item $json = cf::to_json $ref
224		231
225	Converts a perl data structure into its JSON representation.	232	Converts a perl data structure into its JSON representation.
226
227	=cut
228
229	sub to_json($) {
230	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
231	JSON::Syck::Dump $_[0]
232	}
233		233
234	=item cf::lock_wait $string	234	=item cf::lock_wait $string
235		235
236	Wait until the given lock is available. See cf::lock_acquire.	236	Wait until the given lock is available. See cf::lock_acquire.
237		237
…		…
243	returned.	243	returned.
244		244
245	Lock names should begin with a unique identifier (for example, cf::map::find	245	Lock names should begin with a unique identifier (for example, cf::map::find
246	uses map_find and cf::map::load uses map_load).	246	uses map_find and cf::map::load uses map_load).
247		247
		248	=item $locked = cf::lock_active $string
		249
		250	Return true if the lock is currently active, i.e. somebody has locked it.
		251
248	=cut	252	=cut
249		253
250	our %LOCK;	254	our %LOCK;
251		255
252	sub lock_wait($) {	256	sub lock_wait($) {
…		…
269		273
270	Coro::guard {	274	Coro::guard {
271	# wake up all waiters, to be on the safe side	275	# wake up all waiters, to be on the safe side
272	$_->ready for @{ delete $LOCK{$key} };	276	$_->ready for @{ delete $LOCK{$key} };
273	}	277	}
		278	}
		279
		280	sub lock_active($) {
		281	my ($key) = @_;
		282
		283	! ! $LOCK{$key}
274	}	284	}
275		285
276	sub freeze_mainloop {	286	sub freeze_mainloop {
277	return unless $TICK_WATCHER->is_active;	287	return unless $TICK_WATCHER->is_active;
278		288
…		…
359	}	369	}
360		370
361	sub write_runtime {	371	sub write_runtime {
362	my $guard = cf::lock_acquire "write_runtime";	372	my $guard = cf::lock_acquire "write_runtime";
363		373
364	my $runtime = cf::localdir . "/runtime";	374	my $runtime = "$LOCALDIR/runtime";
365		375
366	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644	376	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644
367	or return;	377	or return;
368		378
369	my $value = $cf::RUNTIME + 90 + 10;	379	my $value = $cf::RUNTIME + 90 + 10;
…		…
382		392
383	aio_rename "$runtime~", $runtime	393	aio_rename "$runtime~", $runtime
384	and return;	394	and return;
385		395
386	1	396	1
		397	}
		398
		399	=item cf::datalog type => key => value, ...
		400
		401	Log a datalog packet of the given type with the given key-value pairs.
		402
		403	=cut
		404
		405	sub datalog($@) {
		406	my ($type, %kv) = @_;
		407	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
387	}	408	}
388		409
389	=back	410	=back
390		411
391	=cut	412	=cut
…		…
953	Returns the given player object, loading it if necessary (might block).	974	Returns the given player object, loading it if necessary (might block).
954		975
955	=cut	976	=cut
956		977
957	sub playerdir($) {	978	sub playerdir($) {
958	cf::localdir	979	"$PLAYERDIR/"
959	. "/"
960	. cf::playerdir
961	. "/"
962	. (ref $_[0] ? $_[0]->ob->name : $_[0])	980	. (ref $_[0] ? $_[0]->ob->name : $_[0])
963	}	981	}
964		982
965	sub path($) {	983	sub path($) {
966	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];	984	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
967		985
968	(playerdir $login) . "/$login.pl"	986	(playerdir $login) . "/playerdata"
969	}	987	}
970		988
971	sub find_active($) {	989	sub find_active($) {
972	$cf::PLAYER{$_[0]}	990	$cf::PLAYER{$_[0]}
973	and $cf::PLAYER{$_[0]}->active	991	and $cf::PLAYER{$_[0]}->active
…		…
986	my $login = $_[0];	1004	my $login = $_[0];
987		1005
988	my $guard = cf::lock_acquire "user_find:$login";	1006	my $guard = cf::lock_acquire "user_find:$login";
989		1007
990	$cf::PLAYER{$_[0]} \|\| do {	1008	$cf::PLAYER{$_[0]} \|\| do {
		1009	# rename old playerfiles to new ones
		1010	#TODO: remove when no longer required
		1011	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
		1012	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
		1013	aio_unlink +(playerdir $login) . "/$login.pl.pst";
		1014	aio_unlink +(playerdir $login) . "/$login.pl";
		1015
991	my $pl = load_pl path $login	1016	my $pl = load_pl path $login
992	or return;	1017	or return;
993	$cf::PLAYER{$login} = $pl	1018	$cf::PLAYER{$login} = $pl
994	}	1019	}
995	}	1020	}
…		…
1079	while and may block, so not sync_job-capable, ever.	1104	while and may block, so not sync_job-capable, ever.
1080		1105
1081	=cut	1106	=cut
1082		1107
1083	sub list_logins {	1108	sub list_logins {
1084	my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir	1109	my $dirs = aio_readdir $PLAYERDIR
1085	or return [];	1110	or return [];
1086		1111
1087	my @logins;	1112	my @logins;
1088		1113
1089	for my $login (@$dirs) {	1114	for my $login (@$dirs) {
…		…
1124	}	1149	}
1125		1150
1126	\@paths	1151	\@paths
1127	}	1152	}
1128		1153
1129	=item $player->ext_reply ($msgid, $msgtype, %msg)	1154	=item $player->ext_reply ($msgid, %msg)
1130		1155
1131	Sends an ext reply to the player.	1156	Sends an ext reply to the player.
1132		1157
1133	=cut	1158	=cut
1134		1159
1135	sub ext_reply($$$%) {	1160	sub ext_reply($$%) {
1136	my ($self, $id, %msg) = @_;	1161	my ($self, $id, %msg) = @_;
1137		1162
1138	$msg{msgid} = $id;	1163	$msg{msgid} = $id;
1139		1164
1140	$self->send ("ext " . cf::to_json \%msg);	1165	$self->send ("ext " . cf::to_json \%msg);
1141	}	1166	}
1142		1167
1143	package cf;	1168	=item $player->ext_event ($type, %msg)
		1169
		1170	Sends an ext event to the client.
		1171
		1172	=cut
		1173
		1174	sub ext_event($$%) {
		1175	my ($self, $type, %msg) = @_;
		1176
		1177	$self->ns->ext_event ($type, %msg);
		1178	}
		1179
		1180	=head3 cf::region
		1181
		1182	=over 4
		1183
		1184	=cut
		1185
		1186	package cf::region;
		1187
		1188	=item cf::region::find_by_path $path
		1189
		1190	Tries to decuce the probable region for a map knowing only its path.
		1191
		1192	=cut
		1193
		1194	sub find_by_path($) {
		1195	my ($path) = @_;
		1196
		1197	my ($match, $specificity);
		1198
		1199	for my $region (list) {
		1200	if ($region->match && $path =~ $region->match) {
		1201	($match, $specificity) = ($region, $region->specificity)
		1202	if $region->specificity > $specificity;
		1203	}
		1204	}
		1205
		1206	$match
		1207	}
1144		1208
1145	=back	1209	=back
1146
1147		1210
1148	=head3 cf::map	1211	=head3 cf::map
1149		1212
1150	=over 4	1213	=over 4
1151		1214
…		…
1289		1352
1290	# the original (read-only) location	1353	# the original (read-only) location
1291	sub load_path {	1354	sub load_path {
1292	my ($self) = @_;	1355	my ($self) = @_;
1293		1356
1294	sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}	1357	"$MAPDIR/$self->{path}.map"
1295	}	1358	}
1296		1359
1297	# the temporary/swap location	1360	# the temporary/swap location
1298	sub save_path {	1361	sub save_path {
1299	my ($self) = @_;	1362	my ($self) = @_;
1300		1363
1301	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1364	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1302	sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path	1365	"$TMPDIR/$path.map"
1303	}	1366	}
1304		1367
1305	# the unique path, undef == no special unique path	1368	# the unique path, undef == no special unique path
1306	sub uniq_path {	1369	sub uniq_path {
1307	my ($self) = @_;	1370	my ($self) = @_;
1308		1371
1309	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1372	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1310	sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path	1373	"$UNIQUEDIR/$path"
1311	}	1374	}
1312		1375
1313	# and all this just because we cannot iterate over	1376	# and all this just because we cannot iterate over
1314	# all maps in C++...	1377	# all maps in C++...
1315	sub change_all_map_light {	1378	sub change_all_map_light {
…		…
1382	$self->load_header_orig	1445	$self->load_header_orig
1383	or return;	1446	or return;
1384	$self->prepare_orig;	1447	$self->prepare_orig;
1385	}	1448	}
1386		1449
		1450	$self->default_region (cf::region::find_by_path $self->{path})
		1451	unless $self->default_region;
		1452
1387	1	1453	1
1388	}	1454	}
1389		1455
1390	sub find;	1456	sub find;
1391	sub find {	1457	sub find {
…		…
1424	my ($self) = @_;	1490	my ($self) = @_;
1425		1491
1426	local $self->{deny_reset} = 1; # loading can take a long time	1492	local $self->{deny_reset} = 1; # loading can take a long time
1427		1493
1428	my $path = $self->{path};	1494	my $path = $self->{path};
		1495
		1496	{
1429	my $guard = cf::lock_acquire "map_load:$path";	1497	my $guard = cf::lock_acquire "map_load:$path";
1430		1498
1431	return if $self->in_memory != cf::MAP_SWAPPED;	1499	return if $self->in_memory != cf::MAP_SWAPPED;
1432		1500
1433	$self->in_memory (cf::MAP_LOADING);	1501	$self->in_memory (cf::MAP_LOADING);
1434		1502
1435	$self->alloc;	1503	$self->alloc;
1436		1504
1437	$self->pre_load;	1505	$self->pre_load;
1438
1439	$self->_load_objects ($self->{load_path}, 1)
1440	or return;
1441
1442	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1443	if delete $self->{load_original};
1444
1445	if (my $uniq = $self->uniq_path) {
1446	utf8::encode $uniq;
1447	if (aio_open $uniq, O_RDONLY, 0) {
1448	$self->clear_unique_items;
1449	$self->_load_objects ($uniq, 0);
1450	}
1451	}
1452
1453	Coro::cede;
1454
1455	# now do the right thing for maps
1456	$self->link_multipart_objects;
1457
1458	unless ($self->{deny_activate}) {
1459	$self->decay_objects;
1460	$self->fix_auto_apply;
1461	$self->update_buttons;
1462	Coro::cede;	1506	Coro::cede;
1463	$self->set_darkness_map;	1507
		1508	$self->_load_objects ($self->{load_path}, 1)
		1509	or return;
		1510
		1511	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
		1512	if delete $self->{load_original};
		1513
		1514	if (my $uniq = $self->uniq_path) {
		1515	utf8::encode $uniq;
		1516	if (aio_open $uniq, O_RDONLY, 0) {
		1517	$self->clear_unique_items;
		1518	$self->_load_objects ($uniq, 0);
		1519	}
		1520	}
		1521
		1522	Coro::cede;
		1523	# now do the right thing for maps
		1524	$self->link_multipart_objects;
1464	$self->difficulty ($self->estimate_difficulty)	1525	$self->difficulty ($self->estimate_difficulty)
1465	unless $self->difficulty;	1526	unless $self->difficulty;
1466	Coro::cede;	1527	Coro::cede;
		1528
		1529	unless ($self->{deny_activate}) {
		1530	$self->decay_objects;
		1531	$self->fix_auto_apply;
		1532	$self->update_buttons;
		1533	Coro::cede;
		1534	$self->set_darkness_map;
		1535	Coro::cede;
1467	$self->activate;	1536	$self->activate;
		1537	}
		1538
		1539	$self->in_memory (cf::MAP_IN_MEMORY);
1468	}	1540	}
1469		1541
1470	$self->post_load;	1542	$self->post_load;
1471
1472	$self->in_memory (cf::MAP_IN_MEMORY);
1473	}	1543	}
1474		1544
1475	sub customise_for {	1545	sub customise_for {
1476	my ($self, $ob) = @_;	1546	my ($self, $ob) = @_;
1477		1547
…		…
1668	instantiated unique items. May block.	1738	instantiated unique items. May block.
1669		1739
1670	=cut	1740	=cut
1671		1741
1672	sub unique_maps() {	1742	sub unique_maps() {
1673	my $files = aio_readdir cf::localdir . "/" . cf::uniquedir	1743	my $files = aio_readdir $UNIQUEDIR
1674	or return;	1744	or return;
1675		1745
1676	my @paths;	1746	my @paths;
1677		1747
1678	for (@$files) {	1748	for (@$files) {
…		…
1791	$LINK_MAP	1861	$LINK_MAP
1792	}	1862	}
1793		1863
1794	sub cf::object::player::enter_link {	1864	sub cf::object::player::enter_link {
1795	my ($self) = @_;	1865	my ($self) = @_;
1796
1797	$self->deactivate_recursive;
1798		1866
1799	return if UNIVERSAL::isa $self->map, "ext::map_link";	1867	return if UNIVERSAL::isa $self->map, "ext::map_link";
1800		1868
1801	$self->{_link_pos} \|\|= [$self->map->{path}, $self->x, $self->y]	1869	$self->{_link_pos} \|\|= [$self->map->{path}, $self->x, $self->y]
1802	if $self->map;	1870	if $self->map;
…		…
1934		2002
1935	$rmp->{random_seed} \|\|= $exit->random_seed;	2003	$rmp->{random_seed} \|\|= $exit->random_seed;
1936		2004
1937	my $data = cf::to_json $rmp;	2005	my $data = cf::to_json $rmp;
1938	my $md5 = Digest::MD5::md5_hex $data;	2006	my $md5 = Digest::MD5::md5_hex $data;
1939	my $meta = "$cf::RANDOM_MAPS/$md5.meta";	2007	my $meta = "$RANDOMDIR/$md5.meta";
1940		2008
1941	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {	2009	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {
1942	aio_write $fh, 0, (length $data), $data, 0;	2010	aio_write $fh, 0, (length $data), $data, 0;
1943	undef $fh;	2011	undef $fh;
1944	aio_rename "$meta~", $meta;	2012	aio_rename "$meta~", $meta;
…		…
1953		2021
1954	return unless $self->type == cf::PLAYER;	2022	return unless $self->type == cf::PLAYER;
1955		2023
1956	if ($exit->slaying eq "/!") {	2024	if ($exit->slaying eq "/!") {
1957	#TODO: this should de-fi-ni-te-ly not be a sync-job	2025	#TODO: this should de-fi-ni-te-ly not be a sync-job
		2026	# the problem is that $exit might not survive long enough
		2027	# so it needs to be done right now, right here
1958	cf::sync_job { prepare_random_map $exit };	2028	cf::sync_job { prepare_random_map $exit };
1959	}	2029	}
1960		2030
1961	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2031	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1962	my $hp = $exit->stats->hp;	2032	my $hp = $exit->stats->hp;
…		…
1970	$self->goto ($slaying, $hp, $sp);	2040	$self->goto ($slaying, $hp, $sp);
1971		2041
1972	1;	2042	1;
1973	}) {	2043	}) {
1974	$self->message ("Something went wrong deep within the crossfire server. "	2044	$self->message ("Something went wrong deep within the crossfire server. "
1975	. "I'll try to bring you back to the map you were before. "	2045	. "I'll try to bring you back to the map you were before. "
1976	. "Please report this to the dungeon master!",	2046	. "Please report this to the dungeon master!",
1977	cf::NDI_UNIQUE \| cf::NDI_RED);	2047	cf::NDI_UNIQUE \| cf::NDI_RED);
1978		2048
1979	warn "ERROR in enter_exit: $@";	2049	warn "ERROR in enter_exit: $@";
1980	$self->leave_link;	2050	$self->leave_link;
1981	}	2051	}
1982	})->prio (1);	2052	})->prio (1);
…		…
1998		2068
1999	utf8::encode $text;	2069	utf8::encode $text;
2000	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2070	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2001	}	2071	}
2002		2072
		2073	=item $client->ext_event ($type, %msg)
		2074
		2075	Sends an exti event to the client.
		2076
		2077	=cut
		2078
		2079	sub cf::client::ext_event($$%) {
		2080	my ($self, $type, %msg) = @_;
		2081
		2082	$msg{msgtype} = "event_$type";
		2083	$self->send_packet ("ext " . cf::to_json \%msg);
		2084	}
2003		2085
2004	=item $success = $client->query ($flags, "text", \&cb)	2086	=item $success = $client->query ($flags, "text", \&cb)
2005		2087
2006	Queues a query to the client, calling the given callback with	2088	Queues a query to the client, calling the given callback with
2007	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2089	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
…		…
2104		2186
2105	# here we export the classes and methods available to script code	2187	# here we export the classes and methods available to script code
2106		2188
2107	=pod	2189	=pod
2108		2190
2109	The following fucntions and emthods are available within a safe environment:	2191	The following functions and methods are available within a safe environment:
2110		2192
2111	cf::object contr pay_amount pay_player map	2193	cf::object contr pay_amount pay_player map
2112	cf::object::player player	2194	cf::object::player player
2113	cf::player peaceful	2195	cf::player peaceful
2114	cf::map trigger	2196	cf::map trigger
…		…
2199	#############################################################################	2281	#############################################################################
2200		2282
2201	=head2 EXTENSION DATABASE SUPPORT	2283	=head2 EXTENSION DATABASE SUPPORT
2202		2284
2203	Crossfire maintains a very simple database for extension use. It can	2285	Crossfire maintains a very simple database for extension use. It can
2204	currently store anything that can be serialised using Storable, which	2286	currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2205	excludes objects.	2287	convert to/from binary).
2206		2288
2207	The parameter C<$family> should best start with the name of the extension	2289	The parameter C<$family> should best start with the name of the extension
2208	using it, it should be unique.	2290	using it, it should be unique.
2209		2291
2210	=over 4	2292	=over 4
…		…
2233	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;	2315	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
2234	cf::cleanup "db_open(db): $!" if $!;	2316	cf::cleanup "db_open(db): $!" if $!;
2235	};	2317	};
2236	cf::cleanup "db_open(db): $@" if $@;	2318	cf::cleanup "db_open(db): $@" if $@;
2237	};	2319	};
2238
2239	my $path = cf::localdir . "/database.pst";
2240	if (stat $path) {
2241	cf::sync_job {
2242	my $pst = Storable::retrieve $path;
2243
2244	cf::db_put (board => data => $pst->{board});
2245	cf::db_put (guildrules => data => $pst->{guildrules});
2246	cf::db_put (rent => balance => $pst->{rent}{balance});
2247	BDB::db_env_txn_checkpoint $DB_ENV;
2248
2249	unlink $path;
2250	};
2251	}
2252	}	2320	}
2253	}	2321	}
2254		2322
2255	sub db_get($$) {	2323	sub db_get($$) {
2256	my $key = "$_[0]/$_[1]";	2324	my $key = "$_[0]/$_[1]";
2257		2325
2258	cf::sync_job {	2326	cf::sync_job {
2259	BDB::db_get $DB, undef, $key, my $data;	2327	BDB::db_get $DB, undef, $key, my $data;
2260		2328
2261	$! ? ()	2329	$! ? ()
2262	: Compress::LZF::sthaw $data	2330	: $data
2263	}	2331	}
2264	}	2332	}
2265		2333
2266	sub db_put($$$) {	2334	sub db_put($$$) {
2267	BDB::dbreq_pri 4;	2335	BDB::dbreq_pri 4;
2268	BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };	2336	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2269	}	2337	}
		2338
		2339	=item cf::cache $id => [$paths...], $processversion => $process
		2340
		2341	Generic caching function that returns the value of the resource $id,
		2342	caching and regenerating as required.
		2343
		2344	This function can block.
		2345
		2346	=cut
		2347
		2348	sub cache {
		2349	my ($id, $src, $processversion, $process) = @_;
		2350
		2351	my $meta =
		2352	join "\x00",
		2353	$processversion,
		2354	map {
		2355	aio_stat $_
		2356	and Carp::croak "$_: $!";
		2357
		2358	($_, (stat _)[7,9])
		2359	} @$src;
		2360
		2361	my $dbmeta = db_get cache => "$id/meta";
		2362	if ($dbmeta ne $meta) {
		2363	# changed, we may need to process
		2364
		2365	my @data;
		2366	my $md5;
		2367
		2368	for (0 .. $#$src) {
		2369	0 <= aio_load $src->[$_], $data[$_]
		2370	or Carp::croak "$src->[$_]: $!";
		2371	}
		2372
		2373	# if processing is expensive, check
		2374	# checksum first
		2375	if (1) {
		2376	$md5 =
		2377	join "\x00",
		2378	$processversion,
		2379	map {
		2380	Coro::cede;
		2381	($src->[$_], Digest::MD5::md5_hex $data[$_])
		2382	} 0.. $#$src;
		2383
		2384
		2385	my $dbmd5 = db_get cache => "$id/md5";
		2386	if ($dbmd5 eq $md5) {
		2387	db_put cache => "$id/meta", $meta;
		2388
		2389	return db_get cache => "$id/data";
		2390	}
		2391	}
		2392
		2393	my $t1 = Time::HiRes::time;
		2394	my $data = $process->(\@data);
		2395	my $t2 = Time::HiRes::time;
		2396
		2397	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
		2398
		2399	db_put cache => "$id/data", $data;
		2400	db_put cache => "$id/md5" , $md5;
		2401	db_put cache => "$id/meta", $meta;
		2402
		2403	return $data;
		2404	}
		2405
		2406	db_get cache => "$id/data"
		2407	}
		2408
		2409	=item fork_call { }, $args
		2410
		2411	Executes the given code block with the given arguments in a seperate
		2412	process, returning the results. Everything must be serialisable with
		2413	Coro::Storable. May, of course, block. Note that the executed sub may
		2414	never block itself or use any form of Event handling.
		2415
		2416	=cut
		2417
		2418	sub fork_call(&@) {
		2419	my ($cb, @args) = @_;
		2420
		2421	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
		2422	# or die "socketpair: $!";
		2423	pipe my $fh1, my $fh2
		2424	or die "pipe: $!";
		2425
		2426	if (my $pid = fork) {
		2427	close $fh2;
		2428
		2429	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
		2430	$res = Coro::Storable::thaw $res;
		2431
		2432	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
		2433
		2434	die $$res unless "ARRAY" eq ref $res;
		2435
		2436	return wantarray ? @$res : $res->[-1];
		2437	} else {
		2438	local $SIG{__WARN__};
		2439	eval {
		2440	local $SIG{__DIE__};
		2441	close $fh1;
		2442
		2443	my @res = eval { $cb->(@args) };
		2444	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
		2445	};
		2446
		2447	warn $@ if $@;
		2448	_exit 0;
		2449	}
		2450	}
		2451
		2452
2270		2453
2271	#############################################################################	2454	#############################################################################
2272	# the server's init and main functions	2455	# the server's init and main functions
2273		2456
2274	sub load_faces {	2457	sub load_facedata($) {
2275	my $path = sprintf "%s/faces", cf::datadir;	2458	my ($path) = @_;
2276		2459
2277	warn "loading faces from $path\n";	2460	warn "loading facedata from $path\n";
2278		2461
2279	my $faces;	2462	my $facedata;
2280	0 < aio_load $path, $faces	2463	0 < aio_load $path, $facedata
2281	or die "$path: $!";	2464	or die "$path: $!";
2282		2465
2283	Coro::cede;
2284	$faces = Storable::thaw $faces;	2466	$facedata = Coro::Storable::thaw $facedata;
2285	Coro::cede;
2286		2467
		2468	$facedata->{version} == 2
		2469	or cf::cleanup "$path: version mismatch, cannot proceed.";
		2470
		2471	{
		2472	my $faces = $facedata->{faceinfo};
		2473
2287	while (my ($face, $info) = each %$faces) {	2474	while (my ($face, $info) = each %$faces) {
2288	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	2475	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2289	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	2476	cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2290	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	2477	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
		2478	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2291	Coro::cede;	2479	Coro::cede;
2292	}	2480	}
2293		2481
2294	while (my ($face, $info) = each %$faces) {	2482	while (my ($face, $info) = each %$faces) {
2295	next unless $info->{smooth};	2483	next unless $info->{smooth};
2296	my $idx = cf::face::find $face	2484	my $idx = cf::face::find $face
2297	or next;	2485	or next;
2298	if (my $smooth = cf::face::find $info->{smooth}) {	2486	if (my $smooth = cf::face::find $info->{smooth}) {
2299	cf::face::set_smooth $idx, $smooth;	2487	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2300	warn "smooth $idx,$smooth ($face,$info->{smooth})\n";#d#
2301	} else {	2488	} else {
2302	warn "smooth face '$info->{smooth}' not found for face '$face'";	2489	warn "smooth face '$info->{smooth}' not found for face '$face'";
2303	}	2490	}
2304	Coro::cede;	2491	Coro::cede;
		2492	}
		2493	}
		2494
		2495	{
		2496	my $anims = $facedata->{animinfo};
		2497
		2498	while (my ($anim, $info) = each %$anims) {
		2499	cf::anim::set $anim, $info->{frames}, $info->{facings};
		2500	Coro::cede;
		2501	}
		2502
		2503	cf::anim::invalidate_all; # d'oh
2305	}	2504	}
2306		2505
2307	1	2506	1
2308	}	2507	}
2309		2508
		2509	sub reload_regions {
		2510	load_resource_file "$MAPDIR/regions"
		2511	or die "unable to load regions file\n";
		2512	}
		2513
		2514	sub reload_facedata {
		2515	load_facedata "$DATADIR/facedata"
		2516	or die "unable to load facedata\n";
		2517	}
		2518
		2519	sub reload_archetypes {
		2520	load_resource_file "$DATADIR/archetypes"
		2521	or die "unable to load archetypes\n";
		2522	}
		2523
		2524	sub reload_treasures {
		2525	load_resource_file "$DATADIR/treasures"
		2526	or die "unable to load treasurelists\n";
		2527	}
		2528
2310	sub reload_resources {	2529	sub reload_resources {
2311	load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir	2530	warn "reloading resource files...\n";
2312	or die "unable to load regions file\n";#d#	2531
		2532	reload_regions;
2313	load_faces	2533	reload_facedata;
2314	or die "unable to load faces\n";#d#	2534	reload_archetypes;
		2535	reload_treasures;
		2536
		2537	warn "finished reloading resource files\n";
2315	}	2538	}
2316		2539
2317	sub init {	2540	sub init {
2318	reload_resources;	2541	reload_resources;
2319	}	2542	}
2320		2543
2321	sub cfg_load {	2544	sub cfg_load {
2322	open my $fh, "<:utf8", cf::confdir . "/config"	2545	open my $fh, "<:utf8", "$CONFDIR/config"
2323	or return;	2546	or return;
2324		2547
2325	local $/;	2548	local $/;
2326	*CFG = YAML::Syck::Load <$fh>;	2549	*CFG = YAML::Syck::Load <$fh>;
2327		2550
…		…
2412		2635
2413	warn Carp::longmess "post_cleanup backtrace"	2636	warn Carp::longmess "post_cleanup backtrace"
2414	if $make_core;	2637	if $make_core;
2415	}	2638	}
2416		2639
2417	sub reload() {	2640	sub do_reload_perl() {
2418	# can/must only be called in main	2641	# can/must only be called in main
2419	if ($Coro::current != $Coro::main) {	2642	if ($Coro::current != $Coro::main) {
2420	warn "can only reload from main coroutine";	2643	warn "can only reload from main coroutine";
2421	return;	2644	return;
2422	}	2645	}
…		…
2497	Symbol::delete_package "safe::$_"	2720	Symbol::delete_package "safe::$_"
2498	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	2721	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2499		2722
2500	warn "unloading cf.pm \"a bit\"";	2723	warn "unloading cf.pm \"a bit\"";
2501	delete $INC{"cf.pm"};	2724	delete $INC{"cf.pm"};
		2725	delete $INC{"cf/pod.pm"};
2502		2726
2503	# don't, removes xs symbols, too,	2727	# don't, removes xs symbols, too,
2504	# and global variables created in xs	2728	# and global variables created in xs
2505	#Symbol::delete_package __PACKAGE__;	2729	#Symbol::delete_package __PACKAGE__;
2506		2730
…		…
2521	warn "reattaching attachments to maps";	2745	warn "reattaching attachments to maps";
2522	reattach $_ for values %MAP;	2746	reattach $_ for values %MAP;
2523	warn "reattaching attachments to players";	2747	warn "reattaching attachments to players";
2524	reattach $_ for values %PLAYER;	2748	reattach $_ for values %PLAYER;
2525		2749
2526	warn "loading reloadable resources";
2527	reload_resources;
2528
2529	warn "leaving sync_job";	2750	warn "leaving sync_job";
2530		2751
2531	1	2752	1
2532	} or do {	2753	} or do {
2533	warn $@;	2754	warn $@;
…		…
2538	warn "reloaded";	2759	warn "reloaded";
2539	};	2760	};
2540		2761
2541	our $RELOAD_WATCHER; # used only during reload	2762	our $RELOAD_WATCHER; # used only during reload
2542		2763
		2764	sub reload_perl() {
		2765	# doing reload synchronously and two reloads happen back-to-back,
		2766	# coro crashes during coro_state_free->destroy here.
		2767
		2768	$RELOAD_WATCHER \|\|= Event->timer (
		2769	reentrant => 0,
		2770	after => 0,
		2771	data => WF_AUTOCANCEL,
		2772	cb => sub {
		2773	do_reload_perl;
		2774	undef $RELOAD_WATCHER;
		2775	},
		2776	);
		2777	}
		2778
2543	register_command "reload" => sub {	2779	register_command "reload" => sub {
2544	my ($who, $arg) = @_;	2780	my ($who, $arg) = @_;
2545		2781
2546	if ($who->flag (FLAG_WIZ)) {	2782	if ($who->flag (FLAG_WIZ)) {
2547	$who->message ("reloading server.");	2783	$who->message ("reloading server.");
2548		2784	async { reload_perl };
2549	# doing reload synchronously and two reloads happen back-to-back,
2550	# coro crashes during coro_state_free->destroy here.
2551
2552	$RELOAD_WATCHER \|\|= Event->timer (
2553	reentrant => 0,
2554	after => 0,
2555	data => WF_AUTOCANCEL,
2556	cb => sub {
2557	reload;
2558	undef $RELOAD_WATCHER;
2559	},
2560	);
2561	}	2785	}
2562	};	2786	};
2563		2787
2564	unshift @INC, $LIBDIR;	2788	unshift @INC, $LIBDIR;
2565		2789
2566	my $bug_warning = 0;	2790	my $bug_warning = 0;
		2791
		2792	our @WAIT_FOR_TICK;
		2793	our @WAIT_FOR_TICK_BEGIN;
		2794
		2795	sub wait_for_tick {
		2796	return unless $TICK_WATCHER->is_active;
		2797	return if $Coro::current == $Coro::main;
		2798
		2799	my $signal = new Coro::Signal;
		2800	push @WAIT_FOR_TICK, $signal;
		2801	$signal->wait;
		2802	}
		2803
		2804	sub wait_for_tick_begin {
		2805	return unless $TICK_WATCHER->is_active;
		2806	return if $Coro::current == $Coro::main;
		2807
		2808	my $signal = new Coro::Signal;
		2809	push @WAIT_FOR_TICK_BEGIN, $signal;
		2810	$signal->wait;
		2811	}
2567		2812
2568	$TICK_WATCHER = Event->timer (	2813	$TICK_WATCHER = Event->timer (
2569	reentrant => 0,	2814	reentrant => 0,
2570	parked => 1,	2815	parked => 1,
2571	prio => 0,	2816	prio => 0,
…		…
2579	}	2824	}
2580		2825
2581	$NOW = Event::time;	2826	$NOW = Event::time;
2582		2827
2583	cf::server_tick; # one server iteration	2828	cf::server_tick; # one server iteration
		2829
2584	$RUNTIME += $TICK;	2830	$RUNTIME += $TICK;
2585	$NEXT_TICK += $TICK;	2831	$NEXT_TICK += $TICK;
2586		2832
2587	if ($NOW >= $NEXT_RUNTIME_WRITE) {	2833	if ($NOW >= $NEXT_RUNTIME_WRITE) {
2588	$NEXT_RUNTIME_WRITE = $NOW + 10;	2834	$NEXT_RUNTIME_WRITE = $NOW + 10;
…		…
2590	write_runtime	2836	write_runtime
2591	or warn "ERROR: unable to write runtime file: $!";	2837	or warn "ERROR: unable to write runtime file: $!";
2592	};	2838	};
2593	}	2839	}
2594		2840
2595	$WAIT_FOR_TICK->broadcast;
2596	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2597
2598	# my $AFTER = Event::time;	2841	# my $AFTER = Event::time;
2599	# warn $AFTER - $NOW;#d#	2842	# warn $AFTER - $NOW;#d#
2600		2843
2601	# if we are delayed by four ticks or more, skip them all	2844	# if we are delayed by four ticks or more, skip them all
2602	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2845	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2603		2846
2604	$TICK_WATCHER->at ($NEXT_TICK);	2847	$TICK_WATCHER->at ($NEXT_TICK);
2605	$TICK_WATCHER->start;	2848	$TICK_WATCHER->start;
		2849
		2850	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
		2851	$sig->send;
		2852	}
		2853	while (my $sig = shift @WAIT_FOR_TICK) {
		2854	$sig->send;
		2855	}
		2856
		2857	_post_tick;
2606	},	2858	},
2607	);	2859	);
2608		2860
2609	{	2861	{
2610	BDB::max_poll_time $TICK * 0.1;	2862	BDB::max_poll_time $TICK * 0.1;
…		…
2638		2890
2639	cf::sync_job {	2891	cf::sync_job {
2640	eval {	2892	eval {
2641	BDB::db_env_open	2893	BDB::db_env_open
2642	$DB_ENV,	2894	$DB_ENV,
2643	$BDB_ENV_DIR,	2895	$BDBDIR,
2644	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN	2896	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN
2645	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	2897	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
2646	0666;	2898	0666;
2647		2899
2648	cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;	2900	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2649		2901
2650	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);	2902	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
2651	$DB_ENV->set_lk_detect;	2903	$DB_ENV->set_lk_detect;
2652	};	2904	};
2653		2905
…		…
2669	prio => 6,	2921	prio => 6,
2670	cb => \&IO::AIO::poll_cb,	2922	cb => \&IO::AIO::poll_cb,
2671	);	2923	);
2672	}	2924	}
2673		2925
		2926	# load additional modules
		2927	use cf::pod;
		2928
2674	END { cf::emergency_save }	2929	END { cf::emergency_save }
2675		2930
2676	1	2931	1
2677		2932

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.225 by root, Wed Mar 14 00:04:58 2007 UTC vs. Revision 1.257 by root, Sat Apr 21 17:34:24 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.225 by root, Wed Mar 14 00:04:58 2007 UTC vs.
Revision 1.257 by root, Sat Apr 21 17:34:24 2007 UTC