Skip to content
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

avoid flush repeatedly when has finished flushing #839

Merged
merged 4 commits into from
Jul 6, 2021
Merged

avoid flush repeatedly when has finished flushing #839

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2144db4
avoid repeat flush when position finish
jerry-l-20230331 Jun 30, 2021
00da460
format
jerry-l-20230331 Jul 6, 2021
47be1a0
Formatting
theigl Jul 6, 2021
0c4f854
Formatting
theigl Jul 6, 2021
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
213 changes: 107 additions & 106 deletions src/com/esotericsoftware/kryo/io/OutputChunked.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,106 +1,107 @@
/* Copyright (c) 2008-2020, Nathan Sweet
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
* - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided with the distribution.
* - Neither the name of Esoteric Software nor the names of its contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
* BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
* SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */

package com.esotericsoftware.kryo.io;

import static com.esotericsoftware.kryo.util.Util.*;
import static com.esotericsoftware.minlog.Log.*;

import com.esotericsoftware.kryo.KryoException;

import java.io.IOException;
import java.io.OutputStream;

/** An {@link Output} that writes the length before each flush. The length allows the chunks to be skipped when reading.
* @author Nathan Sweet */
public class OutputChunked extends Output {
/** @see Output#Output() */
public OutputChunked () {
super();
}

/** @see Output#Output(int) */
public OutputChunked (int bufferSize) {
super(bufferSize);
}

/** @see Output#Output(OutputStream) */
public OutputChunked (OutputStream outputStream) {
super(outputStream);
}

/** @see Output#Output(OutputStream, int) */
public OutputChunked (OutputStream outputStream, int bufferSize) {
super(outputStream, bufferSize);
}

public void flush () throws KryoException {
if (position() > 0) {
try {
writeChunkSize();
super.flush();
} catch (IOException ex) {
throw new KryoException(ex);
}
}
super.flush();
}

private void writeChunkSize () throws IOException {
int size = position();
if (TRACE) trace("kryo", "Write chunk: " + size + pos(size));
OutputStream outputStream = getOutputStream();
if ((size & ~0x7F) == 0) {
outputStream.write(size);
return;
}
outputStream.write((size & 0x7F) | 0x80);
size >>>= 7;
if ((size & ~0x7F) == 0) {
outputStream.write(size);
return;
}
outputStream.write((size & 0x7F) | 0x80);
size >>>= 7;
if ((size & ~0x7F) == 0) {
outputStream.write(size);
return;
}
outputStream.write((size & 0x7F) | 0x80);
size >>>= 7;
if ((size & ~0x7F) == 0) {
outputStream.write(size);
return;
}
outputStream.write((size & 0x7F) | 0x80);
size >>>= 7;
outputStream.write(size);
}

/** Marks the curent written data as the end of a chunk. This chunk can then be skipped when reading. */
public void endChunk () {
flush();
if (TRACE) trace("kryo", "End chunk.");
try {
getOutputStream().write(0); // Zero length chunk.
} catch (IOException ex) {
throw new KryoException(ex);
}
}
}
/* Copyright (c) 2008-2020, Nathan Sweet
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
* - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided with the distribution.
* - Neither the name of Esoteric Software nor the names of its contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
* BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
* SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */

package com.esotericsoftware.kryo.io;

import static com.esotericsoftware.kryo.util.Util.*;
import static com.esotericsoftware.minlog.Log.*;

import com.esotericsoftware.kryo.KryoException;

import java.io.IOException;
import java.io.OutputStream;

/** An {@link Output} that writes the length before each flush. The length allows the chunks to be skipped when reading.
* @author Nathan Sweet */
public class OutputChunked extends Output {
/** @see Output#Output() */
public OutputChunked () {
super();
}

/** @see Output#Output(int) */
public OutputChunked (int bufferSize) {
super(bufferSize);
}

/** @see Output#Output(OutputStream) */
public OutputChunked (OutputStream outputStream) {
super(outputStream);
}

/** @see Output#Output(OutputStream, int) */
public OutputChunked (OutputStream outputStream, int bufferSize) {
super(outputStream, bufferSize);
}

public void flush () throws KryoException {
if (position() > 0) {
try {
writeChunkSize();
super.flush();
} catch (IOException ex) {
throw new KryoException(ex);
}
} else {
super.flush();
}
}

private void writeChunkSize () throws IOException {
int size = position();
if (TRACE) trace("kryo", "Write chunk: " + size + pos(size));
OutputStream outputStream = getOutputStream();
if ((size & ~0x7F) == 0) {
outputStream.write(size);
return;
}
outputStream.write((size & 0x7F) | 0x80);
size >>>= 7;
if ((size & ~0x7F) == 0) {
outputStream.write(size);
return;
}
outputStream.write((size & 0x7F) | 0x80);
size >>>= 7;
if ((size & ~0x7F) == 0) {
outputStream.write(size);
return;
}
outputStream.write((size & 0x7F) | 0x80);
size >>>= 7;
if ((size & ~0x7F) == 0) {
outputStream.write(size);
return;
}
outputStream.write((size & 0x7F) | 0x80);
size >>>= 7;
outputStream.write(size);
}

/** Marks the current written data as the end of a chunk. This chunk can then be skipped when reading. */
public void endChunk () {
flush();
if (TRACE) trace("kryo", "End chunk.");
try {
getOutputStream().write(0); // Zero length chunk.
} catch (IOException ex) {
throw new KryoException(ex);
}
}
}