2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-06 08:40:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rebase OnDemandRequestWorker#service(T, Channel, V)

Browse Source
This commit is contained in:
atomicint
2015-03-27 16:42:55 -04:00
parent cff1184e33
commit 29f6524d14
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/apollo/update/OnDemandRequestWorker.java
+6 -18
View File
@@ -5,9 +5,7 @@ import io.netty.buffer.Unpooled;
import io.netty.channel.Channel; import io.netty.channel.Channel;
import java.io.IOException; import java.io.IOException;
import java.nio.ByteBuffer;
import org.apollo.fs.FileDescriptor;
import org.apollo.fs.IndexedFileSystem; import org.apollo.fs.IndexedFileSystem;
import org.apollo.net.codec.update.OnDemandRequest; import org.apollo.net.codec.update.OnDemandRequest;
import org.apollo.net.codec.update.OnDemandResponse; import org.apollo.net.codec.update.OnDemandResponse;
@@ -20,7 +18,7 @@ import org.apollo.net.codec.update.OnDemandResponse;
public final class OnDemandRequestWorker extends RequestWorker<OnDemandRequest, IndexedFileSystem> { public final class OnDemandRequestWorker extends RequestWorker<OnDemandRequest, IndexedFileSystem> {
/** /**
* The maximum length of a chunk, in bytes. * The maximum length of a chunk, in {@code byte}s.
*/ */
private static final int CHUNK_LENGTH = 500; private static final int CHUNK_LENGTH = 500;
@@ -41,22 +39,12 @@ public final class OnDemandRequestWorker extends RequestWorker<OnDemandRequest,
@Override @Override
protected void service(IndexedFileSystem fs, Channel channel, OnDemandRequest request) throws IOException { protected void service(IndexedFileSystem fs, Channel channel, OnDemandRequest request) throws IOException {
FileDescriptor desc = request.getFileDescriptor(); ByteBuf buffer = Unpooled.wrappedBuffer(fs.getFile(request.getFileDescriptor()));
int length = buffer.readableBytes();
ByteBuffer buffer = fs.getFile(desc); for (int chunk = 0; buffer.readableBytes() > 0; chunk++) {
int length = buffer.remaining(); int chunkSize = Math.min(buffer.readableBytes(), CHUNK_LENGTH);
OnDemandResponse response = new OnDemandResponse(request.getFileDescriptor(), length, chunk, buffer.readBytes(chunkSize));
for (int chunk = 0; buffer.remaining() > 0; chunk++) {
int chunkSize = buffer.remaining();
if (chunkSize > CHUNK_LENGTH) {
chunkSize = CHUNK_LENGTH;
}
byte[] tmp = new byte[chunkSize];
buffer.get(tmp, 0, tmp.length);
ByteBuf chunkData = Unpooled.wrappedBuffer(tmp, 0, chunkSize);
OnDemandResponse response = new OnDemandResponse(desc, length, chunk, chunkData);
channel.writeAndFlush(response); channel.writeAndFlush(response);
} }
} }