ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.136 by root, Sat Dec 9 02:21:24 2006 UTC vs.
Revision 1.142 by root, Fri Apr 6 23:25:07 2007 UTC

24} 24}
25 25
26use utf8; 26use utf8;
27 27
28use AnyEvent (); 28use AnyEvent ();
29use BerkeleyDB;
30use Pod::POM (); 29use Pod::POM ();
31use Scalar::Util ();
32use File::Path (); 30use File::Path ();
33use Storable (); # finally 31use Storable (); # finally
32use Fcntl ();
34 33
35BEGIN { 34BEGIN {
36 use Crossfire::Protocol::Base (); 35 use Crossfire::Protocol::Base ();
37 *to_json = \&Crossfire::Protocol::Base::to_json; 36 *to_json = \&Crossfire::Protocol::Base::to_json;
38 *from_json = \&Crossfire::Protocol::Base::from_json; 37 *from_json = \&Crossfire::Protocol::Base::from_json;
72 $_ 71 $_
73} 72}
74 73
75sub socketpipe() { 74sub socketpipe() {
76 socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 75 socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
77 or die "cannot establish bidiretcional pipe: $!\n"; 76 or die "cannot establish bidirectional pipe: $!\n";
78 77
79 ($fh1, $fh2) 78 ($fh1, $fh2)
80} 79}
81 80
82sub background(&;&) { 81sub background(&;&) {
125 while ($buffer =~ s/^(.*)\n//) { 124 while ($buffer =~ s/^(.*)\n//) {
126 my $line = $1; 125 my $line = $1;
127 $line =~ s/\s+$//; 126 $line =~ s/\s+$//;
128 utf8::decode $line; 127 utf8::decode $line;
129 if ($line =~ /^\x{e877}json_msg (.*)$/s) { 128 if ($line =~ /^\x{e877}json_msg (.*)$/s) {
130 $cb->(from_json $1); 129 $cb->(JSON::XS->new->allow_nonref->decode ($1));
131 } else { 130 } else {
132 ::message ({ 131 ::message ({
133 markup => "background($pid): " . CFPlus::asxml $line, 132 markup => "background($pid): " . CFPlus::asxml $line,
134 }); 133 });
135 } 134 }
138} 137}
139 138
140sub background_msg { 139sub background_msg {
141 my ($msg) = @_; 140 my ($msg) = @_;
142 141
143 $msg = "\x{e877}json_msg " . to_json $msg; 142 $msg = "\x{e877}json_msg " . JSON::XS->new->allow_nonref->encode ($msg);
144 $msg =~ s/\n//g; 143 $msg =~ s/\n//g;
145 utf8::encode $msg; 144 utf8::encode $msg;
146 print $msg, "\n"; 145 print $msg, "\n";
147}
148
149package CFPlus::Database;
150
151our @ISA = BerkeleyDB::Btree::;
152
153sub get($$) {
154 my $data;
155
156 $_[0]->db_get ($_[1], $data) == 0
157 ? $data
158 : ()
159}
160
161my %DB_SYNC;
162
163sub put($$$) {
164 my ($db, $key, $data) = @_;
165
166 my $hkey = $db + 0;
167 Scalar::Util::weaken $db;
168 $DB_SYNC{$hkey} ||= AnyEvent->timer (after => 5, cb => sub {
169 delete $DB_SYNC{$hkey};
170 $db->db_sync if $db;
171 });
172
173 $db->db_put ($key => $data)
174} 146}
175 147
176package CFPlus; 148package CFPlus;
177 149
178sub find_rcfile($) { 150sub find_rcfile($) {
255 and die $res->status_line; 227 and die $res->status_line;
256 228
257 $res 229 $res
258} 230}
259 231
260our $DB_ENV; 232sub fh_nonblocking($$) {
261our $DB_STATE;
262
263sub db_table($) {
264 my ($table) = @_; 233 my ($fh, $nb) = @_;
265 234
266 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 235 if ($^O eq "MSWin32") {
267 236 $nb = (! ! $nb) + 0;
268 new CFPlus::Database 237 ioctl $fh, 0x8004667e, $nb; # FIONBIO
269 -Env => $DB_ENV, 238 } else {
270 -Filename => $table, 239 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
271# -Filename => "database",
272# -Subname => $table,
273 -Property => DB_CHKSUM,
274 -Flags => DB_CREATE | DB_UPGRADE,
275 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
276}
277
278our $DB_HOME = "$Crossfire::VARDIR/cfplus";
279
280sub open_db {
281 use strict;
282
283 mkdir $DB_HOME, 0777;
284 my $recover = $BerkeleyDB::db_version >= 4.4
285 ? eval "DB_REGISTER | DB_RECOVER"
286 : 0;
287
288 $DB_ENV = new BerkeleyDB::Env
289 -Home => $DB_HOME,
290 -Cachesize => 1_000_000,
291 -ErrFile => "$DB_HOME/errorlog.txt",
292# -ErrPrefix => "DATABASE",
293 -Verbose => 1,
294 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
295 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
296 or die "unable to create/open database home $DB_HOME: $BerkeleyDB::Error";
297
298 $DB_STATE = db_table "state";
299
300 1 240 }
301}
302 241
303unless (eval { open_db }) {
304 File::Path::rmtree $DB_HOME;
305 open_db;
306} 242}
307 243
308package CFPlus::Layout; 244package CFPlus::Layout;
309 245
310$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub { 246$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines