d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make cmp work by mmapping chunks of a file, rather than the whole

Browse Source 
file at one time.

PR:		24732
Submitted by:	Andrew L. Neporada <andr@dgap.mipt.ru>
MFC after:	2 weeks
This commit is contained in:
David Malone 2001-11-04 21:31:16 +00:00
parent b1f214cf5f
commit 60b49f05fa
1 changed files with 52 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
usr.bin/cmp/regular.c
View File

@ -51,6 +51,9 @@ static const char sccsid[] = "@(#)regular.c 8.3 (Berkeley) 4/2/94";
#include "extern.h" #include "extern.h"
static u_char *remmap __P((u_char *, int, off_t));
#define MMAP_CHUNK (8*1024*1024)
#define ROUNDPAGE(i) ((i) & ~pagemask) #define ROUNDPAGE(i) ((i) & ~pagemask)
void void
@ -59,7 +62,7 @@ c_regular(fd1, file1, skip1, len1, fd2, file2, skip2, len2)
char *file1, *file2; char *file1, *file2;
off_t skip1, len1, skip2, len2; off_t skip1, len1, skip2, len2;
{ {
u_char ch, *p1, *p2; u_char ch, *p1, *p2, *m1, *m2, *e1, *e2;
off_t byte, length, line; off_t byte, length, line;
int dfound; int dfound;
off_t pagemask, off1, off2; off_t pagemask, off1, off2;
@ -81,23 +84,25 @@ c_regular(fd1, file1, skip1, len1, fd2, file2, skip2, len2)
off2 = ROUNDPAGE(skip2); off2 = ROUNDPAGE(skip2);
length = MIN(len1, len2); length = MIN(len1, len2);
if (length > SIZE_T_MAX)
return (c_special(fd1, file1, skip1, fd2, file2, skip2));
if ((p1 = (u_char *)mmap(NULL, (size_t)len1 + skip1 % pagesize, if ((m1 = remmap(NULL, fd1, off1)) == NULL) {
PROT_READ, MAP_SHARED, fd1, off1)) == (u_char *)MAP_FAILED) c_special(fd1, file1, skip1, fd2, file2, skip2);
err(ERR_EXIT, "%s", file1); return;
}
madvise(p1, len1 + skip1 % pagesize, MADV_SEQUENTIAL); if ((m2 = remmap(NULL, fd2, off2)) == NULL) {
if ((p2 = (u_char *)mmap(NULL, (size_t)len2 + skip2 % pagesize, munmap(m1, MMAP_CHUNK);
PROT_READ, MAP_SHARED, fd2, off2)) == (u_char *)MAP_FAILED) c_special(fd1, file1, skip1, fd2, file2, skip2);
err(ERR_EXIT, "%s", file2); return;
madvise(p2, len2 + skip2 % pagesize, MADV_SEQUENTIAL); }
dfound = 0; dfound = 0;
p1 += skip1 - off1; e1 = m1 + MMAP_CHUNK;
p2 += skip2 - off2; e2 = m2 + MMAP_CHUNK;
for (byte = line = 1; length--; ++p1, ++p2, ++byte) { p1 = m1 + (skip1 - off1);
p2 = m2 + (skip2 - off2);
for (byte = line = 1; length--; ++byte) {
if ((ch = *p1) != *p2) { if ((ch = *p1) != *p2) {
if (xflag) { if (xflag) {
dfound = 1; dfound = 1;
@ -111,10 +116,43 @@ c_regular(fd1, file1, skip1, len1, fd2, file2, skip2, len2)
} }
if (ch == '\n') if (ch == '\n')
++line; ++line;
if (++p1 == e1) {
off1 += MMAP_CHUNK;
if ((p1 = m1 = remmap(m1, fd1, off1)) == NULL) {
munmap(m2, MMAP_CHUNK);
err(ERR_EXIT, "remmap %s", file1);
}
e1 = m1 + MMAP_CHUNK;
}
if (++p2 == e2) {
off2 += MMAP_CHUNK;
if ((p2 = m2 = remmap(m2, fd2, off2)) == NULL) {
munmap(m1, MMAP_CHUNK);
err(ERR_EXIT, "remmap %s", file2);
}
e2 = m2 + MMAP_CHUNK;
}
} }
munmap(m1, MMAP_CHUNK);
munmap(m2, MMAP_CHUNK);
if (len1 != len2) if (len1 != len2)
eofmsg (len1 > len2 ? file2 : file1); eofmsg (len1 > len2 ? file2 : file1);
if (dfound) if (dfound)
exit(DIFF_EXIT); exit(DIFF_EXIT);
} }
static u_char *
remmap(mem, fd, offset)
u_char *mem;
int fd;
off_t offset;
{
if (mem != NULL)
munmap(mem, MMAP_CHUNK);
mem = mmap(NULL, MMAP_CHUNK, PROT_READ, MAP_SHARED, fd, offset);
if (mem == MAP_FAILED)
return (NULL);
madvise(mem, MMAP_CHUNK, MADV_SEQUENTIAL);
return (mem);
}