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.184 by root, Mon Jul 7 12:56:07 2008 UTC

1=head1 NAME 1=head1 NAME
2 2
3CFPlus - undocumented utility garbage for our crossfire client 3DC - undocumented utility garbage for our deliantra client
4 4
5=head1 SYNOPSIS 5=head1 SYNOPSIS
6 6
7 use CFPlus; 7 use DC;
8 8
9=head1 DESCRIPTION 9=head1 DESCRIPTION
10 10
11=over 4 11=over 4
12 12
13=cut 13=cut
14 14
15package Deliantra::Client; # work around CPAN breakage
16package App::Deliantra; # try to reserve namespace
15package CFPlus; 17package DC;
16 18
17use Carp (); 19use Carp ();
18 20
19BEGIN { 21BEGIN {
20 $VERSION = '0.97'; 22 $VERSION = '0.9973';
21 23
22 use XSLoader; 24 use XSLoader;
23 XSLoader::load "CFPlus", $VERSION; 25 XSLoader::load "Deliantra::Client", $VERSION;
24} 26}
25 27
26use utf8; 28use utf8;
27 29
28use AnyEvent (); 30use AnyEvent ();
29use BerkeleyDB;
30use Pod::POM (); 31use Pod::POM ();
31use Scalar::Util ();
32use File::Path (); 32use File::Path ();
33use Storable (); # finally 33use Storable (); # finally
34 34use Fcntl ();
35BEGIN { 35use JSON::XS qw(encode_json decode_json);
36 use Crossfire::Protocol::Base ();
37 *to_json = \&Crossfire::Protocol::Base::to_json;
38 *from_json = \&Crossfire::Protocol::Base::from_json;
39}
40 36
41=item guard { BLOCK } 37=item guard { BLOCK }
42 38
43Returns an object that executes the given block as soon as it is destroyed. 39Returns an object that executes the given block as soon as it is destroyed.
44 40
45=cut 41=cut
46 42
47sub guard(&) { 43sub guard(&) {
48 bless \(my $cb = $_[0]), "CFPlus::Guard" 44 bless \(my $cb = $_[0]), "DC::Guard"
49} 45}
50 46
51sub CFPlus::Guard::DESTROY { 47sub DC::Guard::DESTROY {
52 ${$_[0]}->() 48 ${$_[0]}->()
53} 49}
54 50
55=item shorten $string[, $maxlength] 51=item shorten $string[, $maxlength]
56 52
72 $_ 68 $_
73} 69}
74 70
75sub socketpipe() { 71sub socketpipe() {
76 socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 72 socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
77 or die "cannot establish bidiretcional pipe: $!\n"; 73 or die "cannot establish bidirectional pipe: $!\n";
78 74
79 ($fh1, $fh2) 75 ($fh1, $fh2)
80} 76}
81 77
82sub background(&;&) { 78sub background(&;&) {
83 my ($bg, $cb) = @_; 79 my ($bg, $cb) = @_;
84 80
85 my ($fh_r, $fh_w) = CFPlus::socketpipe; 81 my ($fh_r, $fh_w) = DC::socketpipe;
86 82
87 my $pid = fork; 83 my $pid = fork;
88 84
89 if (defined $pid && !$pid) { 85 if (defined $pid && !$pid) {
90 local $SIG{__DIE__}; 86 local $SIG{__DIE__};
100 96
101 if ($@) { 97 if ($@) {
102 my $msg = $@; 98 my $msg = $@;
103 $msg =~ s/\n+/\n/; 99 $msg =~ s/\n+/\n/;
104 warn "FATAL: $msg"; 100 warn "FATAL: $msg";
105 CFPlus::_exit 1; 101 DC::_exit 1;
106 } 102 }
107 103
108 # win32 is fucked up, of course. exit will clean stuff up, 104 # win32 is fucked up, of course. exit will clean stuff up,
109 # which destroys our database etc. _exit will exit ALL 105 # which destroys our database etc. _exit will exit ALL
110 # forked processes, because of the dreaded fork emulation. 106 # forked processes, because of the dreaded fork emulation.
111 CFPlus::_exit 0; 107 DC::_exit 0;
112 } 108 }
113 109
114 close $fh_w; 110 close $fh_w;
115 111
116 my $buffer; 112 my $buffer;
125 while ($buffer =~ s/^(.*)\n//) { 121 while ($buffer =~ s/^(.*)\n//) {
126 my $line = $1; 122 my $line = $1;
127 $line =~ s/\s+$//; 123 $line =~ s/\s+$//;
128 utf8::decode $line; 124 utf8::decode $line;
129 if ($line =~ /^\x{e877}json_msg (.*)$/s) { 125 if ($line =~ /^\x{e877}json_msg (.*)$/s) {
130 $cb->(from_json $1); 126 $cb->(JSON::XS->new->allow_nonref->decode ($1));
131 } else { 127 } else {
132 ::message ({ 128 ::message ({
133 markup => "background($pid): " . CFPlus::asxml $line, 129 markup => "background($pid): " . DC::asxml $line,
134 }); 130 });
135 } 131 }
136 } 132 }
137 }); 133 });
138} 134}
139 135
140sub background_msg { 136sub background_msg {
141 my ($msg) = @_; 137 my ($msg) = @_;
142 138
143 $msg = "\x{e877}json_msg " . to_json $msg; 139 $msg = "\x{e877}json_msg " . JSON::XS->new->allow_nonref->encode ($msg);
144 $msg =~ s/\n//g; 140 $msg =~ s/\n//g;
145 utf8::encode $msg; 141 utf8::encode $msg;
146 print $msg, "\n"; 142 print $msg, "\n";
147} 143}
148 144
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}
175
176package CFPlus; 145package DC;
177 146
178sub find_rcfile($) { 147sub find_rcfile($) {
179 my $path; 148 my $path;
180 149
181 for (grep !ref, @INC) { 150 for (grep !ref, @INC) {
182 $path = "$_/CFPlus/resources/$_[0]"; 151 $path = "$_/Deliantra/Client/private/resources/$_[0]";
183 return $path if -r $path; 152 return $path if -r $path;
184 } 153 }
185 154
186 die "FATAL: can't find required file $_[0]\n"; 155 die "FATAL: can't find required file $_[0]\n";
187} 156}
193 or return; 162 or return;
194 163
195 local $/; 164 local $/;
196 my $CFG = <$fh>; 165 my $CFG = <$fh>;
197 166
198 if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
199 require YAML;
200 utf8::decode $CFG;
201 $::CFG = YAML::Load ($CFG);
202 } elsif ($CFG =~ /^\{/) {
203 $::CFG = from_json $CFG; 167 $::CFG = decode_json $CFG;
204 } else {
205 $::CFG = eval $CFG; ## todo comaptibility cruft
206 }
207} 168}
208 169
209sub write_cfg { 170sub write_cfg {
210 my ($file) = @_; 171 my $file = "$Deliantra::VARDIR/client.cf";
211 172
212 $::CFG->{VERSION} = $::VERSION; 173 $::CFG->{VERSION} = $::VERSION;
213 174
214 open my $fh, ">:utf8", $file 175 open my $fh, ">:utf8", $file
215 or return; 176 or return;
216 print $fh to_json $::CFG; 177 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
217} 178}
218 179
219sub http_proxy { 180sub http_proxy {
220 my @proxy = win32_proxy_info; 181 my @proxy = win32_proxy_info;
221 182
236} 197}
237 198
238sub lwp_useragent { 199sub lwp_useragent {
239 require LWP::UserAgent; 200 require LWP::UserAgent;
240 201
241 CFPlus::set_proxy; 202 DC::set_proxy;
242 203
243 my $ua = LWP::UserAgent->new ( 204 my $ua = LWP::UserAgent->new (
244 agent => "cfplus $VERSION", 205 agent => "deliantra $VERSION",
245 keep_alive => 1, 206 keep_alive => 1,
246 env_proxy => 1, 207 env_proxy => 1,
247 timeout => 30, 208 timeout => 30,
248 ); 209 );
249} 210}
255 and die $res->status_line; 216 and die $res->status_line;
256 217
257 $res 218 $res
258} 219}
259 220
260our $DB_ENV; 221sub fh_nonblocking($$) {
261our $DB_STATE;
262
263sub db_table($) {
264 my ($table) = @_; 222 my ($fh, $nb) = @_;
265 223
266 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 224 if ($^O eq "MSWin32") {
267 225 $nb = (! ! $nb) + 0;
268 new CFPlus::Database 226 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
269 -Env => $DB_ENV, 227 } else {
270 -Filename => $table, 228 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 229 }
301} 230}
302 231
303unless (eval { open_db }) {
304 File::Path::rmtree $DB_HOME;
305 open_db;
306}
307
308package CFPlus::Layout; 232package DC::Layout;
309 233
234$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {
235 glyph_cache_restore;
236};
237
310$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub { 238$DC::OpenGL::SHUTDOWN_HOOK{"DC::Layout"} = sub {
311 reset_glyph_cache; 239 glyph_cache_backup;
312}; 240};
313 241
3141; 2421;
315 243
316=back 244=back

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines