Changeset 6211 for branches/PersistenceSpeedUp

Timestamp:

05/17/11 10:59:06 (14 years ago)

Author:

epitzer

Message:

Use an asynchronous buffer to allow parallel execution of zip (de)compression and (de)serialization (#1530)

Location:

branches/PersistenceSpeedUp/HeuristicLab.Persistence/3.3

Files:

• Default/Xml/AsyncBuffer.cs (added)
• Default/Xml/XmlGenerator.cs (modified) (4 diffs)
• Default/Xml/XmlParser.cs (modified) (5 diffs)
• HeuristicLab.Persistence-3.3.csproj (modified) (1 diff)

branches/PersistenceSpeedUp/HeuristicLab.Persistence/3.3/Default/Xml/XmlGenerator.cs

@@ -257 +257 @@
           {"typeName", lastTypeToken.TypeName },
           {"serializer", lastTypeToken.Serializer }});
-      }
-      finally {
+      } finally {
         lastTypeToken = null;
       }
@@ -333 +332 @@
             zipStream.PutNextEntry(new ZipEntry("data.xml") { DateTime = DateTime.MinValue });
             StreamWriter writer = new StreamWriter(zipStream);
-            foreach (ISerializationToken token in serializer) {
-              string line = generator.Format(token);
-              writer.Write(line);
+            foreach (ISerializationToken token in new AsyncBuffer<ISerializationToken>(serializer)) {
+              writer.Write(generator.Format(token));
             }
             writer.Flush();
             zipStream.PutNextEntry(new ZipEntry("typecache.xml") { DateTime = DateTime.MinValue });
-            foreach (string line in generator.Format(serializer.TypeCache)) {
+            foreach (string line in new AsyncBuffer<string>(generator.Format(serializer.TypeCache))) {
               writer.Write(line);
             }
@@ -368 +366 @@
         File.Copy(tempfile, filename, true);
         File.Delete(tempfile);
-      }
-      catch (Exception) {
+      } catch (Exception) {
         Logger.Warn("Exception caught, no data has been written.");
         throw;
@@ -438 +435 @@
         serializer.InterleaveTypeInformation = true;
         XmlGenerator generator = new XmlGenerator();
-        foreach (ISerializationToken token in serializer) {
+        foreach (ISerializationToken token in new AsyncBuffer<ISerializationToken>(serializer)) {
           string line = generator.Format(token);
           writer.Write(line);

branches/PersistenceSpeedUp/HeuristicLab.Persistence/3.3/Default/Xml/XmlParser.cs

@@ -75 +75 @@
         try {
           iterator = handlers[reader.Name].Invoke();
-        }
-        catch (KeyNotFoundException) {
+        } catch (KeyNotFoundException) {
           throw new PersistenceException(String.Format(
             "Invalid XML tag \"{0}\" in persistence file.",
@@ -176 +175 @@
         }
         return typeCache;
-      }
-      catch (PersistenceException) {
+      } catch (PersistenceException) {
         throw;
-      }
-      catch (Exception e) {
+      } catch (Exception e) {
         throw new PersistenceException("Unexpected exception during type cache parsing.", e);
       }
@@ -196 +193 @@
           return Deserialize(file);
         }
-      }
-      finally {
+      } finally {
         TimeSpan end = System.Diagnostics.Process.GetCurrentProcess().TotalProcessorTime;
         Tracing.Logger.Info(string.Format(
@@ -226 +222 @@
           XmlParser parser = new XmlParser(reader);
           Deserializer deserializer = new Deserializer(new TypeMapping[] { });
-          return deserializer.Deserialize(parser);
-        }
-      }
-      catch (PersistenceException) {
+          return deserializer.Deserialize(new AsyncBuffer<ISerializationToken>(parser));
+        }
+      } catch (PersistenceException) {
         throw;
-      }
-      catch (Exception x) {
+      } catch (Exception x) {
         throw new PersistenceException("Unexpected exception during deserialization", x);
       }
@@ -258 +252 @@
         XmlParser parser = new XmlParser(
           new StreamReader(zipFile.GetInputStream(data)));
-        object result = deSerializer.Deserialize(parser);
+        object result = deSerializer.Deserialize(new AsyncBuffer<ISerializationToken>(parser));
         zipFile.Close();
         return result;
-      }
-      catch (PersistenceException) {
+      } catch (PersistenceException) {
         throw;
-      }
-      catch (Exception e) {
+      } catch (Exception e) {
         throw new PersistenceException("Unexpected exception during deserialization", e);
       }

branches/PersistenceSpeedUp/HeuristicLab.Persistence/3.3/HeuristicLab.Persistence-3.3.csproj

@@ -177 +177 @@
     <Compile Include="Default\DebugString\PrimitiveSerializers\UShort2DebugStringSerializer.cs" />
     <Compile Include="Default\DebugString\PrimitiveSerializers\ValueType2DebugStringSerializerBase.cs" />
+    <Compile Include="Default\Xml\AsyncBuffer.cs" />
     <Compile Include="Default\Xml\Compact\ByteArray2XmlSerializer.cs" />
     <Compile Include="Default\Xml\Compact\CompactXmlSerializerBase.cs" />