Skip to content

extract method refactoring. #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

extract method refactoring. #168

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 62 additions & 46 deletions io/src/main/java/org/apache/pdfbox/io/ScratchFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,67 +241,83 @@ private void enlarge() throws IOException
synchronized (ioLock)
{
checkClosed();

if (pageCount >= maxPageCount)
{
return;
}

if (useScratchFile)
{
// create scratch file is needed
if ( raf == null )
{
file = File.createTempFile("PDFBox", ".tmp", scratchFileDirectory);
try
{
raf = new java.io.RandomAccessFile(file, "rw");
}
catch (IOException e)
{
if (!file.delete())
{
LOG.warn("Error deleting scratch file: {}", file.getAbsolutePath());
}
throw e;
}
}

long fileLen = raf.length();
long expectedFileLen = ((long)pageCount - inMemoryMaxPageCount) * PAGE_SIZE;

if (expectedFileLen != fileLen)
{
throw new IOException("Expected scratch file size of " + expectedFileLen + " but found " + fileLen);
}

// enlarge if we do not overflow
if (pageCount + ENLARGE_PAGE_COUNT > pageCount)
{
fileLen += ENLARGE_PAGE_COUNT * PAGE_SIZE;

raf.setLength(fileLen);

freePages.set(pageCount, pageCount + ENLARGE_PAGE_COUNT);
}
handleScratchFile();
}
else if (!maxMainMemoryIsRestricted)
{
// increase number of in-memory pages
int oldSize = inMemoryPages.length;
int newSize = (int) Math.min( ((long)oldSize) * 2, Integer.MAX_VALUE); // this handles integer overflow
if (newSize > oldSize)
increaseInMemoryPages();
}
}
}

private void handleScratchFile() throws IOException
{
// create scratch file is needed
if ( raf == null )
{
file = File.createTempFile("PDFBox", ".tmp", scratchFileDirectory);
try
{
raf = new java.io.RandomAccessFile(file, "rw");
}
catch (IOException e)
{
if (!file.delete())
{
byte[][] newInMemoryPages = new byte[newSize][];
System.arraycopy(inMemoryPages, 0, newInMemoryPages, 0, oldSize);
inMemoryPages = newInMemoryPages;

freePages.set(oldSize, newSize);
LOG.warn("Error deleting scratch file: {}", file.getAbsolutePath());
}
throw e;
}
}

long fileLen = raf.length();
long expectedFileLen = ((long)pageCount - inMemoryMaxPageCount) * PAGE_SIZE;

if (expectedFileLen != fileLen)
{
throw new IOException("Expected scratch file size of " + expectedFileLen + " but found " + fileLen);
}

enlargeScratchFileIfPossible(fileLen);
}


private void enlargeScratchFileIfPossible(long fileLen) throws IOException
{
// enlarge if we do not overflow
if (pageCount + ENLARGE_PAGE_COUNT > pageCount)
{
fileLen += ENLARGE_PAGE_COUNT * PAGE_SIZE;

raf.setLength(fileLen);

freePages.set(pageCount, pageCount + ENLARGE_PAGE_COUNT);
}
}

private void increaseInMemoryPages()
{
// increase number of in-memory pages
int oldSize = inMemoryPages.length;
int newSize = (int) Math.min( ((long)oldSize) * 2, Integer.MAX_VALUE); // this handles integer overflow
if (newSize > oldSize)
{
byte[][] newInMemoryPages = new byte[newSize][];
System.arraycopy(inMemoryPages, 0, newInMemoryPages, 0, oldSize);
inMemoryPages = newInMemoryPages;

freePages.set(oldSize, newSize);
}
}


/**
* Returns byte size of a page.
*
Expand Down