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.119 by root, Tue Sep 12 20:51:17 2006 UTC vs.
Revision 1.129 by root, Mon Nov 20 16:41:46 2006 UTC

… …
12 12
13=cut 13=cut
14 14
15package CFPlus; 15package CFPlus;
16 16
17use Carp ();
18
17BEGIN { 19BEGIN {
18 $VERSION = '0.51'; 20 $VERSION = '0.96';
19 21
20 use XSLoader; 22 use XSLoader;
21 XSLoader::load "CFPlus", $VERSION; 23 XSLoader::load "CFPlus", $VERSION;
22} 24}
23 25
24use utf8; 26use utf8;
25 27
26use Carp ();
27use AnyEvent (); 28use AnyEvent ();
28use BerkeleyDB; 29use BerkeleyDB;
29use Pod::POM (); 30use Pod::POM ();
30use Scalar::Util (); 31use Scalar::Util ();
31use Storable (); # finally 32use Storable (); # finally
32 33
34BEGIN {
35 use Crossfire::Protocol::Base ();
36 *to_json = \&Crossfire::Protocol::Base::to_json;
37 *from_json = \&Crossfire::Protocol::Base::from_json;
38}
39
33=item guard { BLOCK } 40=item guard { BLOCK }
34 41
35Returns an object that executes the given block as soon as it is destroyed. 42Returns an object that executes the given block as soon as it is destroyed.
36 43
37=cut 44=cut
… …
50 s/&/&/g; 57 s/&/&/g;
51 s/>/>/g; 58 s/>/>/g;
52 s/</&lt;/g; 59 s/</&lt;/g;
53 60
54 $_ 61 $_
62}
63
64sub socketpipe() {
65 socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
66 or die "cannot establish bidiretcional pipe: $!\n";
67
68 ($fh1, $fh2)
69}
70
71sub background(&;&) {
72 my ($bg, $cb) = @_;
73
74 my ($fh_r, $fh_w) = CFPlus::socketpipe;
75
76 my $pid = fork;
77
78 if (defined $pid && !$pid) {
79 local $SIG{__DIE__};
80
81 open STDOUT, ">&", $fh_w;
82 open STDERR, ">&", $fh_w;
83 close $fh_r;
84 close $fh_w;
85
86 $| = 1;
87
88 eval { $bg->() };
89
90 if ($@) {
91 my $msg = $@;
92 $msg =~ s/\n+/\n/;
93 warn "FATAL: $msg";
94 CFPlus::_exit 1;
95 }
96
97 # win32 is fucked up, of course. exit will clean stuff up,
98 # which destroys our database etc. _exit will exit ALL
99 # forked processes, because of the dreaded fork emulation.
100 CFPlus::_exit 0;
101 }
102
103 close $fh_w;
104
105 my $buffer;
106
107 my $w; $w = AnyEvent->io (fh => $fh_r, poll => 'r', cb => sub {
108 unless (sysread $fh_r, $buffer, 4096, length $buffer) {
109 undef $w;
110 $cb->();
111 return;
112 }
113
114 while ($buffer =~ s/^(.*)\n//) {
115 my $line = $1;
116 $line =~ s/\s+$//;
117 utf8::decode $line;
118 if ($line =~ /^\x{e877}json_msg (.*)$/s) {
119 $cb->(from_json $1);
120 } else {
121 ::message ({
122 markup => "background($pid): " . CFPlus::asxml $line,
123 });
124 }
125 }
126 });
127}
128
129sub background_msg {
130 my ($msg) = @_;
131
132 $msg = "\x{e877}json_msg " . to_json $msg;
133 $msg =~ s/\n//g;
134 utf8::encode $msg;
135 print $msg, "\n";
55} 136}
56 137
57package CFPlus::Database; 138package CFPlus::Database;
58 139
59our @ISA = BerkeleyDB::Btree::; 140our @ISA = BerkeleyDB::Btree::;
… …
90 $path = "$_/CFPlus/resources/$_[0]"; 171 $path = "$_/CFPlus/resources/$_[0]";
91 return $path if -r $path; 172 return $path if -r $path;
92 } 173 }
93 174
94 die "FATAL: can't find required file $_[0]\n"; 175 die "FATAL: can't find required file $_[0]\n";
95}
96
97BEGIN {
98 use Crossfire::Protocol::Base ();
99 *to_json = \&Crossfire::Protocol::Base::to_json;
100 *from_json = \&Crossfire::Protocol::Base::from_json;
101} 176}
102 177
103sub read_cfg { 178sub read_cfg {
104 my ($file) = @_; 179 my ($file) = @_;
105 180
… …
128 open my $fh, ">:utf8", $file 203 open my $fh, ">:utf8", $file
129 or return; 204 or return;
130 print $fh to_json $::CFG; 205 print $fh to_json $::CFG;
131} 206}
132 207
208sub http_proxy {
209 my @proxy = win32_proxy_info;
210
211 if (@proxy) {
212 "http://" . (@proxy < 2 ? "" : @proxy < 3 ? "$proxy[1]\@" : "$proxy[1]:$proxy[2]\@") . $proxy[0]
213 } elsif (exists $ENV{http_proxy}) {
214 $ENV{http_proxy}
215 } else {
216 ()
217 }
218}
219
220sub set_proxy {
221 my $proxy = http_proxy
222 or return;
223
224 $ENV{http_proxy} = $proxy;
225}
226
227sub lwp_useragent {
228 require LWP::UserAgent;
229
230 CFPlus::set_proxy;
231
232 my $ua = LWP::UserAgent->new (
233 agent => "cfplus $VERSION",
234 keep_alive => 1,
235 env_proxy => 1,
236 timeout => 30,
237 );
238}
239
240sub lwp_check($) {
241 my ($res) = @_;
242
243 $res->is_error
244 and die $res->status_line;
245
246 $res
247}
248
133our $DB_ENV; 249our $DB_ENV;
250our $DB_STATE;
251
252sub db_table($) {
253 my ($table) = @_;
254
255 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
256
257 new CFPlus::Database
258 -Env => $DB_ENV,
259 -Filename => $table,
260# -Filename => "database",
261# -Subname => $table,
262 -Property => DB_CHKSUM,
263 -Flags => DB_CREATE | DB_UPGRADE,
264 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
265}
134 266
135{ 267{
136 use strict; 268 use strict;
137 269
138 mkdir "$Crossfire::VARDIR/cfplus", 0777; 270 mkdir "$Crossfire::VARDIR/cfplus", 0777;
… …
147# -ErrPrefix => "DATABASE", 279# -ErrPrefix => "DATABASE",
148 -Verbose => 1, 280 -Verbose => 1,
149 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover, 281 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
150 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE, 282 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
151 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error"; 283 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
152}
153 284
154sub db_table($) { 285 $DB_STATE = db_table "state";
155 my ($table) = @_;
156
157 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
158
159 new CFPlus::Database
160 -Env => $DB_ENV,
161 -Filename => $table,
162# -Filename => "database",
163# -Subname => $table,
164 -Property => DB_CHKSUM,
165 -Flags => DB_CREATE | DB_UPGRADE,
166 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
167} 286}
168 287
169package CFPlus::Layout; 288package CFPlus::Layout;
170 289
171$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub { 290$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {

Diff Legend

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