xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

libdraw: reduce memory for writeimage/writememimage

Browse source
This commit is contained in:
cinap_lenrek 2011-09-04 04:38:08 +02:00
parent 4749fc5ca1
commit f6e73a6a22
2 changed files with 36 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
sys/src/libdraw/writeimage.c
View file

@ -39,6 +39,28 @@ writeimage(int fd, Image *i, int dolock)
chunk = i->display->bufsize - 32; /* a little room for header */ chunk = i->display->bufsize - 32; /* a little room for header */
r = i->r; r = i->r;
bpl = bytesperline(r, i->depth); bpl = bytesperline(r, i->depth);
ncblock = _compblocksize(r, i->depth);
if(ncblock > chunk){
sprint(hdr, "%11s %11d %11d %11d %11d ",
chantostr(cbuf, i->chan), r.min.x, r.min.y, r.max.x, r.max.y);
if(write(fd, hdr, 5*12) != 5*12)
return -1;
data = malloc(bpl);
for(miny = r.min.y; miny != r.max.y; miny++){
if(dolock)
lockdisplay(i->display);
nb = unloadimage(i, Rect(r.min.x, miny, r.max.x, miny+1), data, bpl);
if(dolock)
unlockdisplay(i->display);
if(nb != bpl)
goto ErrOut0;
if(write(fd, data, nb) != nb)
goto ErrOut0;
}
free(data);
return 0;
}
n = Dy(r)*bpl; n = Dy(r)*bpl;
data = malloc(n); data = malloc(n);
if(data == 0){ if(data == 0){
@ -61,17 +83,6 @@ writeimage(int fd, Image *i, int dolock)
if(nb != dy*bpl) if(nb != dy*bpl)
goto ErrOut0; goto ErrOut0;
} }
ncblock = _compblocksize(r, i->depth);
if(ncblock > chunk){
sprint(hdr, "%11s %11d %11d %11d %11d ",
chantostr(cbuf, i->chan), r.min.x, r.min.y, r.max.x, r.max.y);
if(write(fd, hdr, 5*12) != 5*12)
goto ErrOut0;
if(write(fd, data, n) != n)
goto ErrOut0;
free(data);
return 0;
}
outbuf = malloc(ncblock); outbuf = malloc(ncblock);
hash = malloc(NHASH*sizeof(Hlist)); hash = malloc(NHASH*sizeof(Hlist));

41
sys/src/libmemdraw/write.c
View file

@ -27,12 +27,10 @@ writememimage(int fd, Memimage *i)
uchar *line, *eline; /* input line, end pointer */ uchar *line, *eline; /* input line, end pointer */
uchar *data, *edata; /* input buffer, end pointer */ uchar *data, *edata; /* input buffer, end pointer */
ulong n; /* length of input buffer */ ulong n; /* length of input buffer */
ulong nb; /* # of bytes returned by unloadimage */
int bpl; /* input line length */ int bpl; /* input line length */
int offs, runlen; /* offset, length of consumed data */ int offs, runlen; /* offset, length of consumed data */
uchar dumpbuf[NDUMP]; /* dump accumulator */ uchar dumpbuf[NDUMP]; /* dump accumulator */
int ndump; /* length of dump accumulator */ int ndump; /* length of dump accumulator */
int miny, dy; /* y values while unloading input */
int ncblock; /* size of compressed blocks */ int ncblock; /* size of compressed blocks */
Rectangle r; Rectangle r;
uchar *p, *q, *s, *es, *t; uchar *p, *q, *s, *es, *t;
@ -41,6 +39,18 @@ writememimage(int fd, Memimage *i)
r = i->r; r = i->r;
bpl = bytesperline(r, i->depth); bpl = bytesperline(r, i->depth);
ncblock = _compblocksize(r, i->depth);
if(ncblock > CHUNK){
sprint(hdr, "%11s %11d %11d %11d %11d ",
chantostr(cbuf, i->chan), r.min.x, r.min.y, r.max.x, r.max.y);
if(write(fd, hdr, 5*12) != 5*12)
return -1;
for(; r.min.y < r.max.y; r.min.y++)
if(write(fd, byteaddr(i, r.min), bpl) != bpl)
return -1;
return 0;
}
n = Dy(r)*bpl; n = Dy(r)*bpl;
data = malloc(n); data = malloc(n);
if(data == 0){ if(data == 0){
@ -48,31 +58,8 @@ writememimage(int fd, Memimage *i)
free(data); free(data);
return -1; return -1;
} }
for(miny = r.min.y; miny != r.max.y; miny += dy){ if(unloadmemimage(i, r, data, n) != n)
dy = r.max.y-miny; goto ErrOut0;
if(dy*bpl > CHUNK)
dy = CHUNK/bpl;
if(dy <= 0)
dy = 1;
nb = unloadmemimage(i, Rect(r.min.x, miny, r.max.x, miny+dy),
data+(miny-r.min.y)*bpl, dy*bpl);
if(nb != dy*bpl)
goto ErrOut0;
}
ncblock = _compblocksize(r, i->depth);
if(ncblock > CHUNK){
sprint(hdr, "%11s %11d %11d %11d %11d ",
chantostr(cbuf, i->chan), r.min.x, r.min.y, r.max.x, r.max.y);
if(write(fd, hdr, 5*12) != 5*12)
goto ErrOut0;
if(write(fd, data, n) != n)
goto ErrOut0;
free(data);
return 0;
}
outbuf = malloc(ncblock); outbuf = malloc(ncblock);
hash = malloc(NHASH*sizeof(Hlist)); hash = malloc(NHASH*sizeof(Hlist));
chain = malloc(NMEM*sizeof(Hlist)); chain = malloc(NMEM*sizeof(Hlist));