revert perftest

Author: Steve Hanson

test/perftest/schematest.cpp

@@ -51,8 +51,6 @@ RAPIDJSON_DIAG_POP
 
 class Schema : public PerfTest {
 public:
-    typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
-
     Schema() {}
 
     virtual void SetUp() {
@@ -91,8 +89,6 @@ class Schema : public PerfTest {
 
         char jsonBuffer[65536];
         MemoryPoolAllocator<> jsonAllocator(jsonBuffer, sizeof(jsonBuffer));
-        char schemaBuffer[65536];
-        MemoryPoolAllocator<> schemaAllocator(schemaBuffer, sizeof(schemaBuffer));
 
         for (size_t i = 0; i < ARRAY_SIZE(filenames); i++) {
             char filename[FILENAME_MAX];
@@ -116,7 +112,7 @@ class Schema : public PerfTest {
                     continue;
 
                 TestSuite* ts = new TestSuite;
-                ts->schema = new SchemaDocumentType((*schemaItr)["schema"], 0, 0, 0, &schemaAllocator);
+                ts->schema = new SchemaDocument((*schemaItr)["schema"]);
 
                 const Value& tests = (*schemaItr)["tests"];
                 for (Value::ConstValueIterator testItr = tests.Begin(); testItr != tests.End(); ++testItr) {
@@ -191,7 +187,7 @@ class Schema : public PerfTest {
             for (DocumentList::iterator itr = tests.begin(); itr != tests.end(); ++itr)
                 delete *itr;
         }
-        SchemaDocumentType* schema;
+        SchemaDocument* schema;
         DocumentList tests;
     };
 
@@ -203,14 +199,13 @@ TEST_F(Schema, TestSuite) {
     char validatorBuffer[65536];
     MemoryPoolAllocator<> validatorAllocator(validatorBuffer, sizeof(validatorBuffer));
 
-    // DCOLES - Reduce number by a factor of 100 to make it more reasonable and inline with other test counts
-    const int trialCount = 1000;
+    const int trialCount = 100000;
     int testCount = 0;
     clock_t start = clock();
     for (int i = 0; i < trialCount; i++) {
         for (TestSuiteList::const_iterator itr = testSuites.begin(); itr != testSuites.end(); ++itr) {
             const TestSuite& ts = **itr;
-            GenericSchemaValidator<SchemaDocumentType, BaseReaderHandler<UTF8<> >, MemoryPoolAllocator<> >  validator(*ts.schema, &validatorAllocator);
+            GenericSchemaValidator<SchemaDocument, BaseReaderHandler<UTF8<> >, MemoryPoolAllocator<> >  validator(*ts.schema, &validatorAllocator);
             for (DocumentList::const_iterator testItr = ts.tests.begin(); testItr != ts.tests.end(); ++testItr) {
                 validator.Reset();
                 (*testItr)->Accept(validator);