Changeset 6211 for branches/PersistenceSpeedUp/HeuristicLab.Persistence/3.3/Default/Xml/XmlParser.cs

Timestamp:

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

Author:

epitzer

Message:

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

File:

• branches/PersistenceSpeedUp/HeuristicLab.Persistence/3.3/Default/Xml/XmlParser.cs (modified) (5 diffs)

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);
       }