[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/DB.pm

Comparing deliantra/Deliantra-Client/DC/DB.pm (file contents):
Revision 1.23 by root, Fri Nov 16 04:54:25 2007 UTC vs.
Revision 1.27 by root, Wed Dec 26 18:20:46 2007 UTC

…		…
18	use utf8;	18	use utf8;
19		19
20	use Carp ();	20	use Carp ();
21	use Storable ();	21	use Storable ();
22	use Config;	22	use Config;
		23	use BDB;
23		24
24	use CFPlus;	25	use CFPlus;
25		26
26	our $DB_HOME = "$Crossfire::VARDIR/cfplus-$BerkeleyDB::db_version-$Config{archname}";	27	our $DBDIR = "cfplus-" . BDB::VERSION . "-$Config{archname}";
		28	our $DB_HOME = "$Deliantra::VARDIR/$DBDIR";
27		29
28	sub path_of_res($) {	30	if (!-e $DB_HOME and -e "$Deliantra::OLDDIR/$DBDIR") {
29	utf8::downgrade $_[0]; # bug in unpack "H*"	31	rename "$Deliantra::OLDDIR/$DBDIR", $DB_HOME;
30	"$DB_HOME/res-data-" . unpack "H*", $_[0]	32	print STDERR "INFO: moved old database from $Deliantra::OLDDIR/$DBDIR to $DB_HOME\n";
31	}	33	}
32		34
33	sub sync {	35	our $DB_ENV;
34	# for debugging	36	our $DB_STATE;
35	#CFPlus::DB::Server::req (sync => sub { });	37	our %DB_TABLE;
36	CFPlus::DB::Server::sync ();	38
		39	sub open_db {
		40	mkdir $DB_HOME, 0777;
		41
		42	$DB_ENV = db_env_create;
		43
		44	$DB_ENV->set_errfile (\*STDERR);
		45	$DB_ENV->set_msgfile (\*STDERR);
		46	$DB_ENV->set_verbose (-1, 1);
		47
		48	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::LOG_AUTOREMOVE \| BDB::TXN_WRITE_NOSYNC);
		49	$DB_ENV->set_cachesize (0, 2048 * 1024, 0);
		50
		51	db_env_open $DB_ENV, $DB_HOME,
		52	BDB::CREATE \| BDB::REGISTER \| BDB::RECOVER \| BDB::INIT_MPOOL \| BDB::INIT_LOCK \| BDB::INIT_TXN,
		53	0666;
		54
		55	$! and die "cannot open database environment $DB_HOME: " . BDB::strerror;
		56
		57	1
37	}	58	}
		59
		60	sub table($) {
		61	$DB_TABLE{$_[0]} \|\|= do {
		62	my ($table) = @_;
		63
		64	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
		65
		66	my $db = db_create $DB_ENV;
		67	$db->set_flags (BDB::CHKSUM);
		68
		69	db_open $db, undef, $table, undef, BDB::BTREE,
		70	BDB::AUTO_COMMIT \| BDB::CREATE \| BDB::READ_UNCOMMITTED, 0666;
		71
		72	$! and "unable to open/create database table $_[0]: ". BDB::strerror;
		73
		74	$db
		75	}
		76	}
		77
		78	#############################################################################
		79
		80	unless (eval { open_db }) {
		81	warn "$@";#d#
		82	eval { File::Path::rmtree $DB_HOME };
		83	open_db;
		84	}
		85
		86	our $WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
		87
		88	our $SYNC = EV::timer_ns 0, 60, sub {
		89	$_[0]->stop;
		90	db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
		91	};
		92
		93	our $tilemap;
38		94
39	sub exists($$$) {	95	sub exists($$$) {
40	CFPlus::DB::Server::req (exists => @_);	96	my ($db, $key, $cb) = @_;
		97
		98	my $data;
		99	db_get table $db, undef, $key, $data, 0, sub {
		100	$cb->($! ? () : length $data);
		101	};
41	}	102	}
42		103
43	sub get($$$) {	104	sub get($$$) {
44	CFPlus::DB::Server::req (get => @_);	105	my ($db, $key, $cb) = @_;
		106
		107	my $data;
		108	db_get table $db, undef, $key, $data, 0, sub {
		109	$cb->($! ? () : $data);
		110	};
45	}	111	}
46		112
47	sub put($$$$) {	113	sub put($$$$) {
48	CFPlus::DB::Server::req (put => @_);	114	my ($db, $key, $data, $cb) = @_;
49	}
50		115
51	sub unlink($$) {	116	db_put table $db, undef, $key, $data, 0, sub {
52	CFPlus::DB::Server::req (unlink => @_);	117	$cb->($!);
		118	$SYNC->again unless $SYNC->is_active;
		119	};
53	}	120	}
54		121
55	sub read_file($$) {	122	sub do_table {
56	CFPlus::DB::Server::req (read_file => @_);	123	my ($db, $cb) = @_;
57	}
58		124
59	sub write_file($$$) {	125	$db = table $db;
60	CFPlus::DB::Server::req (write_file => @_);
61	}
62		126
63	sub prefetch_file($$$) {	127	my $cursor = $db->cursor;
64	CFPlus::DB::Server::req (prefetch_file => @_);	128	my %kv;
65	}
66		129
67	sub logprint($$$) {	130	for (;;) {
68	CFPlus::DB::Server::req (logprint => @_);	131	db_c_get $cursor, my $k, my $v, BDB::NEXT;
69	}	132	last if $!;
		133	$kv{$k} = $v;
		134	}
70		135
71	our $tilemap;	136	$cb->(\%kv);
		137	}
		138
		139	sub do_get_tile_id {
		140	my ($name, $cb) = @_;
		141
		142	my $table = table "facemap";
		143	my $id;
		144
		145	db_get $table, undef, $name, $id, 0;
		146	return $cb->($id) unless $!;
		147
		148	for (1..100) {
		149	my $txn = $DB_ENV->txn_begin;
		150	db_get $table, $txn, id => $id, 0;
		151
		152	$id = 64 if $id < 64;
		153
		154	++$id;
		155
		156	db_put $table, $txn, id => $id, 0;
		157	db_txn_finish $txn;
		158
		159	$SYNC->again unless $SYNC->is_active;
		160
		161	return $cb->($id) unless $!;
		162
		163	select undef, undef, undef, 0.01 * rand;
		164	}
		165
		166	die "maximum number of transaction retries reached - database problems?";
		167	}
72		168
73	sub get_tile_id_sync($) {	169	sub get_tile_id_sync($) {
74	my ($name) = @_;	170	my ($name) = @_;
75		171
76	# fetch the full face table first	172	# fetch the full face table first
77	unless ($tilemap) {	173	unless ($tilemap) {
78	CFPlus::DB::Server::req (table => facemap => sub {	174	do_table facemap => sub {
79	$tilemap = $_[0];	175	$tilemap = $_[0];
80	delete $tilemap->{id};	176	delete $tilemap->{id};
81	my %maptile = reverse %$tilemap;#d#	177	my %maptile = reverse %$tilemap;#d#
82	if ((scalar keys %$tilemap) != (scalar keys %maptile)) {#d#	178	if ((scalar keys %$tilemap) != (scalar keys %maptile)) {#d#
83	$tilemap = { };#d#	179	$tilemap = { };#d#
84	CFPlus::error "FATAL: facemap is not a 1:1 mapping, please report this and delete your $DB_HOME directory!\n";#d#	180	CFPlus::error "FATAL: facemap is not a 1:1 mapping, please report this and delete your $DB_HOME directory!\n";#d#
85	}#d#	181	}#d#
86	});	182	};
87	sync;	183	BDB::flush;
88	}	184	}
89		185
90	$tilemap->{$name} \|\|= do {	186	$tilemap->{$name} \|\|= do {
91	my $id;	187	my $id;
92	CFPlus::DB::Server::req (get_tile_id => $name, sub { $id = $_[0] });	188	do_get_tile_id $name, sub {
93	sync;	189	$id = $_[0];
		190	};
		191	BDB::flush;
94	$id	192	$id
95	}	193	}
		194	}
		195
		196	#############################################################################
		197
		198	sub path_of_res($) {
		199	utf8::downgrade $_[0]; # bug in unpack "H*"
		200	"$DB_HOME/res-data-" . unpack "H*", $_[0]
		201	}
		202
		203	sub sync {
		204	# for debugging
		205	#CFPlus::DB::Server::req (sync => sub { });
		206	CFPlus::DB::Server::sync ();
		207	}
		208
		209	sub unlink($$) {
		210	CFPlus::DB::Server::req (unlink => @_);
		211	}
		212
		213	sub read_file($$) {
		214	CFPlus::DB::Server::req (read_file => @_);
		215	}
		216
		217	sub write_file($$$) {
		218	CFPlus::DB::Server::req (write_file => @_);
		219	}
		220
		221	sub prefetch_file($$$) {
		222	CFPlus::DB::Server::req (prefetch_file => @_);
		223	}
		224
		225	sub logprint($$$) {
		226	CFPlus::DB::Server::req (logprint => @_);
96	}	227	}
97		228
98	package CFPlus::DB::Server;	229	package CFPlus::DB::Server;
99		230
100	use strict;	231	use strict;
101		232
102	use EV ();	233	use EV ();
103	use Fcntl;	234	use Fcntl;
104	use BerkeleyDB;
105
106	our $DB_ENV;
107	our $DB_STATE;
108	our %DB_TABLE;
109
110	sub open_db {
111	mkdir $DB_HOME, 0777;
112	my $recover = $BerkeleyDB::db_version >= 4.4
113	? eval "DB_REGISTER \| DB_RECOVER"
114	: 0;
115
116	$DB_ENV = new BerkeleyDB::Env
117	-Home => $DB_HOME,
118	-Cachesize => 8_000_000,
119	-ErrFile => "$DB_HOME/errorlog.txt",
120	# -ErrPrefix => "DATABASE",
121	-Verbose => 1,
122	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN \| $recover,
123	-SetFlags => DB_AUTO_COMMIT \| DB_LOG_AUTOREMOVE \| DB_TXN_WRITE_NOSYNC,
124	or die "unable to create/open database home $DB_HOME: $BerkeleyDB::Error";
125
126	1
127	}
128
129	sub table($) {
130	$DB_TABLE{$_[0]} \|\|= do {
131	my ($table) = @_;
132
133	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
134
135	new BerkeleyDB::Btree
136	-Env => $DB_ENV,
137	-Filename => $table,
138	# -Filename => "database",
139	# -Subname => $table,
140	-Property => DB_CHKSUM,
141	-Flags => DB_AUTO_COMMIT \| DB_CREATE \| DB_UPGRADE,
142	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
143	}
144	}
145		235
146	our %CB;	236	our %CB;
147	our $FH;	237	our $FH;
148	our $ID = "aaa0";	238	our $ID = "aaa0";
149	our ($fh_r_watcher, $fh_w_watcher);	239	our ($fh_r_watcher, $fh_w_watcher);
150	our $sync_timer;	240	our $sync_timer;
151	our $write_buf;	241	our $write_buf;
152	our $read_buf;	242	our $read_buf;
153		243
154	our $SYNC = EV::timer_ns 0, 60, sub {
155	$_[0]->stop;
156	CFPlus::DB::Server::req (sync => sub { });
157	};
158
159	sub fh_write {	244	sub fh_write {
160	my $len = syswrite $FH, $write_buf;	245	my $len = syswrite $FH, $write_buf;
161		246
162	substr $write_buf, 0, $len, "";	247	substr $write_buf, 0, $len, "";
163		248
…		…
206	my $id = ++$ID;	291	my $id = ++$ID;
207	$write_buf .= pack "N/a*", Storable::freeze [$id, $type, @args];	292	$write_buf .= pack "N/a*", Storable::freeze [$id, $type, @args];
208	$CB{$id} = $cb;	293	$CB{$id} = $cb;
209		294
210	$fh_w_watcher->start;	295	$fh_w_watcher->start;
211	$SYNC->again unless $SYNC->is_active;
212	}
213
214	sub do_sync {
215	$DB_ENV->txn_checkpoint (0, 0, 0);
216	()
217	}
218
219	sub do_exists {
220	my ($db, $key) = @_;
221
222	utf8::downgrade $key;
223	my $data;
224	(table $db)->db_get ($key, $data) == 0
225	? length $data
226	: ()
227	}
228
229	sub do_get {
230	my ($db, $key) = @_;
231
232	utf8::downgrade $key;
233	my $data;
234	(table $db)->db_get ($key, $data) == 0
235	? $data
236	: ()
237	}
238
239	sub do_put {
240	my ($db, $key, $data) = @_;
241
242	utf8::downgrade $key;
243	utf8::downgrade $data;
244	(table $db)->db_put ($key => $data)
245	}
246
247	sub do_table {
248	my ($db) = @_;
249
250	$db = table $db;
251
252	my $cursor = $db->db_cursor;
253	my %kv;
254	my ($k, $v);
255	$kv{$k} = $v while $cursor->c_get ($k, $v, BerkeleyDB::DB_NEXT) == 0;
256
257	\%kv
258	}
259
260	sub do_get_tile_id {
261	my ($name) = @_;
262
263	my $id;
264	my $table = table "facemap";
265
266	return $id
267	if $table->db_get ($name, $id) == 0;
268
269	for (1..100) {
270	my $txn = $DB_ENV->txn_begin;
271	my $status = $table->db_get (id => $id);
272	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
273	$id = ($id \|\| 64) + 1;
274	if ($table->db_put (id => $id) == 0
275	&& $table->db_put ($name => $id) == 0) {
276	$txn->txn_commit;
277
278	return $id;
279	}
280	}
281	$txn->txn_abort;
282	select undef, undef, undef, 0.01 * rand;
283	}
284
285	die "maximum number of transaction retries reached - database problems?";
286	}	296	}
287		297
288	sub do_unlink {	298	sub do_unlink {
289	unlink $_[0];	299	unlink $_[0];
290	}	300	}
…		…
359	local $SIG{__DIE__};	369	local $SIG{__DIE__};
360	local $SIG{__WARN__};	370	local $SIG{__WARN__};
361	eval {	371	eval {
362	close $FH;	372	close $FH;
363		373
364	unless (eval { open_db }) {
365	eval { File::Path::rmtree $DB_HOME };
366	open_db;
367	}
368
369	while () {	374	while () {
370	4 == read $fh, my $len, 4	375	4 == read $fh, my $len, 4
371	or last;	376	or last;
372	$len = unpack "N", $len;	377	$len = unpack "N", $len;
373	$len == read $fh, my $req, $len	378	$len == read $fh, my $req, $len
…		…
385	};	390	};
386		391
387	my $error = $@;	392	my $error = $@;
388		393
389	eval {	394	eval {
390	$DB_ENV->txn_checkpoint (0, 0, 0);
391
392	undef %DB_TABLE;
393	undef $DB_ENV;
394
395	Storable::store_fd [die => $error], $fh;	395	Storable::store_fd [die => $error], $fh;
396	};	396	};
397		397
		398	warn $error
		399	if $error;
		400
398	CFPlus::_exit 0;	401	CFPlus::_exit 0;
399	}	402	}
400		403
401	close $fh;	404	close $fh;
402	CFPlus::fh_nonblocking $FH, 1;	405	CFPlus::fh_nonblocking $FH, 1;
403		406
404	$CB{die} = sub { die shift };	407	$CB{die} = sub { die shift };
405		408
406	$fh_r_watcher = EV::io $FH, EV::READ , \&fh_read;	409	$fh_r_watcher = EV::io $FH, EV::READ , \&fh_read;
407	$fh_w_watcher = EV::io $FH, EV::WRITE, \&fh_write;	410	$fh_w_watcher = EV::io $FH, EV::WRITE, \&fh_write;
408	$SYNC->again unless $SYNC->is_active;
409	}	411	}
410		412
411	sub stop {	413	sub stop {
412	close $FH;	414	close $FH;
413	}	415	}

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/DB.pm (file contents): Revision 1.23 by root, Fri Nov 16 04:54:25 2007 UTC vs. Revision 1.27 by root, Wed Dec 26 18:20:46 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/DB.pm (file contents):
Revision 1.23 by root, Fri Nov 16 04:54:25 2007 UTC vs.
Revision 1.27 by root, Wed Dec 26 18:20:46 2007 UTC