Fix bugs

2 files changed, 4 insertions, 38 deletions

diff --git a/benchmarks/java/src/main/java/com/google/protocolbuffers/ProtoBench.java b/benchmarks/java/src/main/java/com/google/protobuf/ProtoBench.java
index 72f2d629..abd9200e 100755
--- a/benchmarks/java/src/main/java/com/google/protocolbuffers/ProtoBench.java
+++ b/benchmarks/java/src/main/java/com/google/protobuf/ProtoBench.java
@@ -29,7 +29,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-package com.google.protocolbuffers;
+package com.google.protobuf;
 
 import com.google.caliper.BeforeExperiment;
 import com.google.caliper.Benchmark;
@@ -93,7 +93,7 @@ public class ProtoBench {
       return false;
     }
     argsList.add("-DdataFile=" + file);
-    argsList.add("com.google.protocolbuffers.ProtoBenchCaliper");
+    argsList.add("com.google.protobuf.ProtoBenchCaliper");
     
     try {
       String args[] = new String[argsList.size()];
@@ -121,17 +121,9 @@ public class ProtoBench {
     } else if (benchmarkDataset.getMessageName().
         equals("benchmarks.google_message3.GoogleMessage3")) {
       temp.add("-DbenchmarkMessageType=GOOGLE_MESSAGE3");
-      for (String opt : ProtoBenchCaliper
-                          .BenchmarkMessageType.GOOGLE_MESSAGE3.getSpecificCaliperOption()) {
-        temp.add(opt);
-      }
     } else if (benchmarkDataset.getMessageName().
         equals("benchmarks.google_message4.GoogleMessage4")) {
       temp.add("-DbenchmarkMessageType=GOOGLE_MESSAGE4");
-      for (String opt : ProtoBenchCaliper
-                          .BenchmarkMessageType.GOOGLE_MESSAGE4.getSpecificCaliperOption()) {
-        temp.add(opt);
-      }
     } else {
       return null;
     }
@@ -142,6 +134,7 @@ public class ProtoBench {
     String benchmarkNames = "serializeToByteString,serializeToByteArray,serializeToMemoryStream"
        + ",deserializeFromByteString,deserializeFromByteArray,deserializeFromMemoryStream";
     temp.add(benchmarkNames);
+    temp.add("-Cinstrument.runtime.options.timingInterval=3000ms");
     
     return temp;
   }
diff --git a/benchmarks/java/src/main/java/com/google/protocolbuffers/ProtoBenchCaliper.java b/benchmarks/java/src/main/java/com/google/protobuf/ProtoBenchCaliper.java
index 4045b56a..546c25a1 100755
--- a/benchmarks/java/src/main/java/com/google/protocolbuffers/ProtoBenchCaliper.java
+++ b/benchmarks/java/src/main/java/com/google/protobuf/ProtoBenchCaliper.java
@@ -1,5 +1,5 @@
 
-package com.google.protocolbuffers;
+package com.google.protobuf;
 
 import com.google.caliper.BeforeExperiment;
 import com.google.caliper.Benchmark;
@@ -26,7 +26,6 @@ public class ProtoBenchCaliper {
         return com.google.protobuf.benchmarks.BenchmarkMessage1Proto3.GoogleMessage1
             .getDefaultInstance();
       }
-      @Override String[] getSpecificCaliperOption() { return null; }
     },
     GOOGLE_MESSAGE1_PROTO2 {
       @Override ExtensionRegistry getExtensionRegistry() { return ExtensionRegistry.newInstance(); }
@@ -35,7 +34,6 @@ public class ProtoBenchCaliper {
         return com.google.protobuf.benchmarks.BenchmarkMessage1Proto2.GoogleMessage1
             .getDefaultInstance();
       }
-      @Override String[] getSpecificCaliperOption() { return null; }
     },
     GOOGLE_MESSAGE2 {
       @Override ExtensionRegistry getExtensionRegistry() { return ExtensionRegistry.newInstance(); }
@@ -43,7 +41,6 @@ public class ProtoBenchCaliper {
       Message getDefaultInstance() {
         return com.google.protobuf.benchmarks.BenchmarkMessage2.GoogleMessage2.getDefaultInstance();
       }
-      @Override String[] getSpecificCaliperOption() { return null; }
     },
     GOOGLE_MESSAGE3 {
       @Override
@@ -64,12 +61,6 @@ public class ProtoBenchCaliper {
       Message getDefaultInstance() {
         return benchmarks.google_message3.BenchmarkMessage3.GoogleMessage3.getDefaultInstance();
       }
-      @Override 
-      String[] getSpecificCaliperOption() { 
-        String[] opt = new String[1];
-        opt[0] = "-Cinstrument.runtime.options.timingInterval=3000ms";
-        return opt;
-      }
     },
     GOOGLE_MESSAGE4 {
       @Override
@@ -85,17 +76,10 @@ public class ProtoBenchCaliper {
       Message getDefaultInstance() {
         return benchmarks.google_message4.BenchmarkMessage4.GoogleMessage4.getDefaultInstance();
       }
-      @Override 
-      String[] getSpecificCaliperOption() { 
-        String[] opt = new String[1];
-        opt[0] = "-Cinstrument.runtime.options.timingInterval=3000ms";
-        return opt;
-      }
     };
     
     abstract ExtensionRegistry getExtensionRegistry();
     abstract Message getDefaultInstance();
-    abstract String[] getSpecificCaliperOption();
   }
   
   @Param 
@@ -112,8 +96,6 @@ public class ProtoBenchCaliper {
   private List<ByteString> inputStringList;
   private List<Message> sampleMessageList;
   private int counter;
-  private FileOutputStream devNull;
-  private CodedOutputStream reuseDevNull;
   
   @BeforeExperiment
   void setUp() throws IOException {
@@ -135,15 +117,6 @@ public class ProtoBenchCaliper {
       sampleMessageList.add(
           defaultMessage.newBuilderForType().mergeFrom(singleInputData, extensions).build());
     }
-    devNull = null;
-    reuseDevNull = null;
-    
-    try {
-      devNull = new FileOutputStream("/dev/null");
-      reuseDevNull = CodedOutputStream.newInstance(devNull);
-    } catch (FileNotFoundException e) {
-      // ignore: this is probably Windows, where /dev/null does not exist
-    }
     
     counter = 0;
   }