added getSize, incrSize and resetSize methods in Input.java for getting size of deserialized data to Unpacker objects

muga · muga · commit 80b125a4e37d · 2011-11-02T18:29:52.000+09:00
diff --git a/src/main/java/org/msgpack/io/AbstractInput.java b/src/main/java/org/msgpack/io/AbstractInput.java
@@ -0,0 +1,35 @@
+//
+// MessagePack for Java
+//
+// Copyright (C) 2009-2011 FURUHASHI Sadayuki
+//
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+package org.msgpack.io;
+
+
+abstract class AbstractInput implements Input {
+    private long size = 0;
+
+    public long getSize() {
+        return size;
+    }
+
+    public void incrSize(long s) {
+        size += s;
+    }
+
+    public void resetSize() {
+        size = 0;
+    }
+}
diff --git a/src/main/java/org/msgpack/io/Input.java b/src/main/java/org/msgpack/io/Input.java
@@ -41,5 +41,9 @@ public interface Input extends Closeable {
     public float getFloat() throws IOException;
 
     public double getDouble() throws IOException;
+
+    public long getSize();
+
+    public void resetSize();
 }
 
diff --git a/src/main/java/org/msgpack/io/LinkedBufferInput.java b/src/main/java/org/msgpack/io/LinkedBufferInput.java
@@ -23,12 +23,15 @@
 import java.nio.ByteBuffer;
 
 
-public class LinkedBufferInput implements Input {
+public class LinkedBufferInput extends AbstractInput {
     private LinkedList<ByteBuffer> link;
+
     private int writable;
+
     private int nextAdvance;
 
     private byte[] tmpBuffer;
+
     private ByteBuffer tmpByteBuffer;
 
     private final int bufferSize;
@@ -50,10 +53,12 @@ public int read(byte[] b, int off, int len) throws EOFException {
             ByteBuffer bb = link.peekFirst();
             if(len < bb.remaining()) {
                 bb.get(b, off, len);
+                incrSize(olen);
                 return olen;
             }
             int rem = bb.remaining();
             bb.get(b, off, rem);
+            incrSize(rem);
             len -= rem;
             off += rem;
             if(!removeFirstLink(bb)) {
@@ -76,6 +81,7 @@ public boolean tryRefer(BufferReferer ref, int len) throws IOException {
         try {
             bb.limit(pos+len);
             ref.refer(bb, true);
+            incrSize(len);
             success = true;
         } finally {
             bb.limit(lim);
@@ -97,6 +103,7 @@ public byte readByte() throws EOFException {
             throw new EndOfBufferException();
         }
         byte result = bb.get();
+        incrSize(1);
         if(bb.remaining() == 0) {
             removeFirstLink(bb);
         }
@@ -170,6 +177,7 @@ private ByteBuffer require(int n) throws EOFException {
             return bb;
         } else {
             requireMore(n);
+            incrSize(n);
             nextAdvance = n;
             return tmpByteBuffer;
         }
diff --git a/src/main/java/org/msgpack/io/StreamInput.java b/src/main/java/org/msgpack/io/StreamInput.java
@@ -23,7 +23,7 @@
 import java.io.EOFException;
 
 
-public class StreamInput implements Input {
+public class StreamInput extends AbstractInput {
     private final InputStream in;
 
     private byte[] castBuffer;
@@ -41,6 +41,7 @@ public int read(byte[] b, int off, int len) throws IOException {
         int remain = len;
         while(remain > 0) {
             int n = in.read(b, off, remain);
+            incrSize(remain);
             if(n <= 0) {
                 throw new EOFException();
             }
@@ -56,6 +57,7 @@ public boolean tryRefer(BufferReferer ref, int size) throws IOException {
 
     public byte readByte() throws IOException {
         int n = in.read();
+        incrSize(1);
         if(n < 0) {
             throw new EOFException();
         }
@@ -69,6 +71,7 @@ public void advance() {
     private void require(int len) throws IOException {
         while(filled < len) {
             int n = in.read(castBuffer, filled, len - filled);
+            incrSize(len - filled);
             if(n < 0) {
                 throw new EOFException();
             }

Original file line number	Diff line number	Diff line change
`@@ -41,5 +41,9 @@ public interface Input extends Closeable {`
`41`	`41`	`public float getFloat() throws IOException;`
`42`	`42`
`43`	`43`	`public double getDouble() throws IOException;`
	`44`	`+`
	`45`	`+ public long getSize();`
	`46`	`+`
	`47`	`+ public void resetSize();`
`44`	`48`	`}`
`45`	`49`