commit fa0ea940ed303df1e2a79db5eb00adc9adf582c1
author cristy <urban-warrior@git.imagemagick.org> Fri Dec 21 02:42:29 2012 +0000
committer cristy <urban-warrior@git.imagemagick.org> Fri Dec 21 02:42:29 2012 +0000
tree dc31a7b54d8390e1e400f70b05f3ad68d7781364
parent 71d226a732a6e8dfa6a85a13fa56b29eee7e6389

MagickCore/blob.c

diff --git a/MagickCore/blob.c b/MagickCore/blob.c
index b00e2b1..00f7204 100644
--- a/MagickCore/blob.c
+++ b/MagickCore/blob.c
@@ -560,10 +560,7 @@
     case FileStream:
     {
       if (image->blob->synchronize != MagickFalse)
-        {
-          status=fflush(image->blob->file_info.file);
-          status=fsync(fileno(image->blob->file_info.file));
-        }
+        status=fsync(fileno(image->blob->file_info.file));
       status=fclose(image->blob->file_info.file);
       break;
     }
@@ -3748,6 +3745,18 @@
         break;
       offset=SeekBlob(image,(MagickOffsetType) extent-1,SEEK_SET);
       count=fwrite((const unsigned char *) "",1,1,image->blob->file_info.file);
+#if defined(MAGICKCORE_HAVE_POSIX_FALLOCATE)
+      if (image->blob->synchronize != MagickFalse)
+        {
+          int
+            status;
+
+          status=posix_fallocate(fileno(image->blob->file_info.file),offset,
+            extent-offset);
+          if (status != 0)
+            return(MagickFalse);
+        }
+#endif
       offset=SeekBlob(image,offset,SEEK_SET);
       if (count != (MagickOffsetType) 1)
         return(MagickFalse);
@@ -3783,6 +3792,18 @@
           offset=SeekBlob(image,(MagickOffsetType) extent-1,SEEK_SET);
           count=fwrite((const unsigned char *) "",1,1,
             image->blob->file_info.file);
+#if defined(MAGICKCORE_HAVE_POSIX_FALLOCATE)
+          if (image->blob->synchronize != MagickFalse)
+            {
+              int
+                status;
+
+              status=posix_fallocate(fileno(image->blob->file_info.file),offset,
+                extent-offset);
+              if (status != 0)
+                return(MagickFalse);
+            }
+#endif
           offset=SeekBlob(image,offset,SEEK_SET);
           if (count != (MagickOffsetType) 1)
             return(MagickTrue);

MagickCore/cache-private.h

diff --git a/MagickCore/cache-private.h b/MagickCore/cache-private.h
index 26a38dc..e5b6bf3 100644
--- a/MagickCore/cache-private.h
+++ b/MagickCore/cache-private.h
@@ -175,6 +175,7 @@
     *random_info;
 
   MagickBooleanType
+    synchronize,
     debug;
 
   MagickThreadType

MagickCore/cache.c

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 7433d8c..b09e799 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -192,6 +192,9 @@
   CacheInfo
     *cache_info;
 
+  char
+    *synchronize;
+
   cache_info=(CacheInfo *) AcquireQuantumMemory(1,sizeof(*cache_info));
   if (cache_info == (CacheInfo *) NULL)
     ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
@@ -211,6 +214,12 @@
   cache_info->nexus_info=AcquirePixelCacheNexus(cache_info->number_threads);
   if (cache_info->nexus_info == (NexusInfo **) NULL)
     ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
+  synchronize=GetEnvironmentValue("MAGICK_SYNCHRONIZE");
+  if (synchronize != (const char *) NULL)
+    {
+      cache_info->synchronize=IsStringTrue(synchronize);
+      synchronize=DestroyString(synchronize);
+    }
   cache_info->semaphore=AllocateSemaphoreInfo();
   cache_info->reference_count=1;
   cache_info->file_semaphore=AllocateSemaphoreInfo();
@@ -3691,6 +3700,17 @@
     return(MagickTrue);
   extent=(MagickOffsetType) length-1;
   count=WritePixelCacheRegion(cache_info,extent,1,(const unsigned char *) "");
+#if defined(MAGICKCORE_HAVE_POSIX_FALLOCATE)
+  if (cache_info->synchronize != MagickFalse)
+    {
+      int
+        status;
+
+      status=posix_fallocate(cache_info->file,offset+1,extent-offset);
+      if (status != 0)
+        return(MagickFalse);
+    }
+#endif
   return(count != (MagickOffsetType) 1 ? MagickFalse : MagickTrue);
 }
 

MagickCore/image.c

diff --git a/MagickCore/image.c b/MagickCore/image.c
index 5d56375..bbe60ad 100644
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -1202,6 +1202,9 @@
 */
 MagickExport void GetImageInfo(ImageInfo *image_info)
 {
+  char
+    *synchronize;
+
   ExceptionInfo
     *exception;
 
@@ -1217,8 +1220,12 @@
   image_info->quality=UndefinedCompressionQuality;
   image_info->antialias=MagickTrue;
   image_info->dither=MagickTrue;
-  image_info->synchronize=IsStringTrue(GetEnvironmentValue(
-         "MAGICK_SYNCHRONIZE"));
+  synchronize=GetEnvironmentValue("MAGICK_SYNCHRONIZE");
+  if (synchronize != (const char *) NULL)
+    {
+      image_info->synchronize=IsStringTrue(synchronize);
+      synchronize=DestroyString(synchronize);
+    }
   exception=AcquireExceptionInfo();
   (void) QueryColorCompliance(BackgroundColor,AllCompliance,
     &image_info->background_color,exception);