Changeset 1892

Timestamp:

05/25/09 18:03:39 (16 years ago)

Author:

epitzer

Message:

Configurable compression level (and lower default settings) and remove excessive logging for better saving speed. (#646)

File:

• trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/XmlGenerator.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/XmlGenerator.cs

@@ -157 +157 @@
 
     public static void Serialize(object o, string filename) {
-      Serialize(o, filename, ConfigurationService.Instance.GetDefaultConfig(new XmlFormat()));
+      Serialize(o, filename, ConfigurationService.Instance.GetDefaultConfig(new XmlFormat()), false, 5);
+    }
+
+    public static void Serialize(object o, string filename, int compression) {
+      Serialize(o, filename, ConfigurationService.Instance.GetConfiguration(new XmlFormat()), false, compression);
     }
 
     public static void Serialize(object obj, string filename, Configuration config) {
-      Serialize(obj, filename, config, false);
-    }
-
-    public static void Serialize(object obj, string filename, Configuration config, bool includeAssemblies) {
-      string tempfile = Path.GetTempFileName();
+      Serialize(obj, filename, config, false, 5);
+    }
+
+    public static void Serialize(object obj, string filename, Configuration config, bool includeAssemblies, int compression) {      
       try {
-        Serialize(obj, File.Create(tempfile), config, includeAssemblies);
+        string tempfile = Path.GetTempFileName();
+        DateTime start = DateTime.Now;
+        Serialize(obj, File.Create(tempfile), config, includeAssemblies, compression);
+        Logger.Info(String.Format("serialization took {0} seconds with compression level {1}",
+          (DateTime.Now - start).TotalSeconds, compression));
         File.Copy(tempfile, filename, true);
         File.Delete(tempfile);
@@ -180 +187 @@
       Serialize(obj, stream, config, false);
     }
-
+    
     public static void Serialize(object obj, Stream stream, Configuration config, bool includeAssemblies) {
+      Serialize(obj, stream, config, includeAssemblies, 9);
+    }
+
+    public static void Serialize(object obj, Stream stream, Configuration config, bool includeAssemblies, int compression) {      
       try {
         Serializer serializer = new Serializer(obj, config);
         XmlGenerator generator = new XmlGenerator();
-        ILog logger = Logger.GetDefaultLogger();
         using (ZipOutputStream zipStream = new ZipOutputStream(stream)) {
-          zipStream.SetLevel(9);
+          zipStream.SetLevel(compression);
           zipStream.PutNextEntry(new ZipEntry("data.xml"));
           StreamWriter writer = new StreamWriter(zipStream);
@@ -193 +203 @@
             string line = generator.Format(token);
             writer.Write(line);
-            logger.Debug(line.TrimEnd());
           }
           writer.Flush();
@@ -199 +208 @@
           foreach (string line in generator.Format(serializer.TypeCache)) {
             writer.Write(line);
-            logger.Debug(line.TrimEnd());
           }
           writer.Flush();
@@ -226 +234 @@
       } catch (Exception e) {
         throw new PersistenceException("Unexpected exception during Serialization.", e);
-      }
+      }      
     }
   }