gegl r2202 - in trunk: . gegl/buffer

[ok svn gnome org]

Author: ok
Date: Sat Apr 19 18:14:21 2008
New Revision: 2202
URL: http://svn.gnome.org/viewvc/gegl?rev=2202&view=rev

Log:
* gegl/buffer/gegl-buffer-load.c: (read_header), (read_block),
(load_info_destroy), (gegl_buffer_load):
* gegl/buffer/gegl-buffer-save.c: (write_block),
(save_info_destroy), (gegl_buffer_save): ported to GIO


Modified:
   trunk/ChangeLog
   trunk/gegl/buffer/gegl-buffer-load.c
   trunk/gegl/buffer/gegl-buffer-save.c

Modified: trunk/gegl/buffer/gegl-buffer-load.c
==============================================================================
--- trunk/gegl/buffer/gegl-buffer-load.c	(original)
+++ trunk/gegl/buffer/gegl-buffer-load.c	Sat Apr 19 18:14:21 2008
@@ -21,20 +21,10 @@
 #include <string.h>
 #include <errno.h>
 
-#include <fcntl.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
+#include <gio/gio.h>
 #include <glib-object.h>
-#include <glib/gstdio.h>
-
-#ifdef G_OS_WIN32
-#include <io.h>
-#endif
 
 #include "gegl-types.h"
-
 #include "gegl-buffer-types.h"
 #include "gegl-buffer.h"
 #include "gegl-buffer-load.h"
@@ -57,7 +47,8 @@
   GeglBufferHeader header;
   GList           *tiles;
   gchar           *path;
-  gint             fd;
+  GFile           *file;
+  GInputStream    *i;
   gint             tile_size;
   Babl            *format;
   gint             pos;
@@ -77,22 +68,26 @@
       g_print ("%s must seek\n", G_STRFUNC);
     }
 
-  info->pos += read (info->fd, &block, sizeof (GeglBufferBlock));
+  info->pos += g_input_stream_read (info->i, &block, sizeof (GeglBufferBlock), NULL, NULL);
 
   if (info->got_header)
     {
       ret = g_malloc (block.length);
       memcpy (ret, &block, sizeof (GeglBufferBlock));
-      info->pos+=read (info->fd,  ((gchar*)ret) + sizeof(GeglBufferBlock),
-                       block.length - sizeof(GeglBufferBlock));
+      info->pos+= g_input_stream_read (info->i,
+                       ((gchar*)ret) + sizeof(GeglBufferBlock),
+                       block.length - sizeof(GeglBufferBlock),
+                       NULL, NULL);
     }
   else
     {
       info->got_header = TRUE;
       ret = g_malloc (sizeof (GeglBufferHeader));
       memcpy (ret, &block, sizeof (GeglBufferBlock));
-      info->pos+=read (info->fd,  ((gchar*)ret) + sizeof(GeglBufferBlock),
-                       sizeof(GeglBufferHeader) - sizeof(GeglBufferBlock));
+      info->pos+= g_input_stream_read (info->i,
+                       ((gchar*)ret) + sizeof(GeglBufferBlock),
+                       sizeof(GeglBufferHeader) - sizeof(GeglBufferBlock),
+                       NULL, NULL);
     }
   info->next_block = ret->block.next;
   return ret;
@@ -109,21 +104,25 @@
       g_print ("must seek\n");
     }
 
-  info->pos+=read (info->fd, &block, sizeof (GeglBufferBlock));
+  info->pos+= g_input_stream_read (info->i, &block, sizeof (GeglBufferBlock),
+                                   NULL, NULL);
   if (info->got_header)
     {
       ret = g_malloc (block.length);
       memcpy (ret, &block, sizeof (GeglBufferBlock));
-      info->pos+=read (info->fd,  ((gchar*)ret) + sizeof(GeglBufferBlock),
-                       block.length - sizeof(GeglBufferBlock));
+      info->pos+= g_input_stream_read (info->i,
+                       ((gchar*)ret) + sizeof(GeglBufferBlock),
+                       block.length - sizeof(GeglBufferBlock),
+                       NULL, NULL);
     }
   else
     {
       info->got_header = TRUE;
       ret = g_malloc (sizeof (GeglBufferHeader));
       memcpy (ret, &block, sizeof (GeglBufferBlock));
-      info->pos+=read (info->fd,  ((gchar*)ret) + sizeof(GeglBufferBlock),
-                       sizeof(GeglBufferHeader) - sizeof(GeglBufferBlock));
+      info->pos+= g_input_stream_read (info->i,  ((gchar*)ret) + sizeof(GeglBufferBlock),
+                       sizeof(GeglBufferHeader) - sizeof(GeglBufferBlock),
+                       NULL, NULL);
     }
   info->next_block = ret->block.next;
   return ret;
@@ -136,9 +135,11 @@
     return;
   if (info->path)
     g_free (info->path);
-  if (info->fd != 0 &&
-      info->fd != -1)
-    close (info->fd);
+  if (info->i)
+    g_object_unref (info->i);
+  if (info->file)
+    g_object_unref (info->file);
+
   if (info->tiles != NULL)
     {
       GList *iter;
@@ -162,7 +163,9 @@
   GEGL_BUFFER_SANITY;
 
   info->path = g_strdup (path);
-  info->fd   = g_open (info->path, O_RDONLY, 0);
+  info->file = g_file_new_for_commandline_arg (info->path);
+  info->i = G_INPUT_STREAM (g_file_read (info->file, NULL, NULL));
+#if 0
   if (info->fd == -1)
     {
       gchar *name = g_filename_display_name (info->path);
@@ -174,6 +177,7 @@
       load_info_destroy (info);
       return;
     }
+#endif
 
   {
     GeglBufferItem *header= read_header (info);
@@ -234,7 +238,8 @@
             g_warning ("%s must seek", G_STRFUNC);
           }
 
-        info->pos += read (info->fd, data, info->tile_size);
+        info->pos += g_input_stream_read (info->i, data, info->tile_size,
+                                          NULL, NULL);
         /*g_print ("%i %i\n", i, data[0]);
         g_print ("%i %i %i   %i %i %i\n", entry->x, entry->y, entry->z, tile->x, tile->y, tile->z);*/
 

Modified: trunk/gegl/buffer/gegl-buffer-save.c
==============================================================================
--- trunk/gegl/buffer/gegl-buffer-save.c	(original)
+++ trunk/gegl/buffer/gegl-buffer-save.c	Sat Apr 19 18:14:21 2008
@@ -19,25 +19,9 @@
 #include "config.h"
 
 #include <string.h>
-#include <errno.h>
-
-#include <fcntl.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 
+#include <gio/gio.h>
 #include <glib-object.h>
-#include <glib/gstdio.h>
-
-#ifdef G_OS_WIN32
-#include <io.h>
-#ifndef S_IRUSR
-#define S_IRUSR _S_IREAD
-#endif
-#ifndef S_IWUSR
-#define S_IWUSR _S_IWRITE
-#endif
-#endif
 
 #include "gegl-types.h"
 
@@ -61,11 +45,16 @@
   GeglBufferHeader header;
   GList           *tiles;
   gchar           *path;
-  gint             fd;
+  GFile           *file;
+  GOutputStream   *o;
+
   gint             tile_size;
-  gint             x_tile_shift;
-  gint             y_tile_shift;
   gint             offset;
+  GeglBufferBlock *last_added;
+  GeglBufferBlock *in_holding; /* we need to write one block added behind
+                                * to be able to recompute the forward pointing
+                                * link from one entry to the next.
+                                */
 } SaveInfo;
 
 
@@ -88,6 +77,30 @@
   g_slice_free (GeglBufferTile, entry);
 }
 
+static gsize write_block (SaveInfo        *info,
+                          GeglBufferBlock *block)
+{
+   gssize ret = 0;
+
+   if (info->in_holding)
+     {
+       glong allocated_pos = info->offset + info->in_holding->length;
+       info->in_holding->next = allocated_pos;
+
+       if (block == NULL)
+         info->in_holding->next = 0;
+
+       ret = g_output_stream_write (info->o, info->in_holding, info->in_holding->length, NULL, NULL);
+       info->offset += ret;
+       g_assert (allocated_pos == info->offset);
+     }
+  /* write block should also allocate the block and update the
+   * previously added blocks next pointer
+   */
+   info->in_holding = block;
+   return ret;
+}
+
 static void
 save_info_destroy (SaveInfo *info)
 {
@@ -95,9 +108,10 @@
     return;
   if (info->path)
     g_free (info->path);
-  if (info->fd != 0 &&
-      info->fd != -1)
-    close (info->fd);
+  if (info->o)
+    g_object_unref (info->o);
+  if (info->file)
+    g_object_unref (info->file);
   if (info->tiles != NULL)
     {
       GList *iter;
@@ -147,6 +161,8 @@
   return z_order (entryB) - z_order (entryA);
 }
 
+
+
 void
 gegl_buffer_save (GeglBuffer          *buffer,
                   const gchar         *path,
@@ -168,8 +184,9 @@
   info->header.next = (prediction += sizeof (GeglBufferHeader));
 
   info->path = g_strdup (path);
-  info->fd   = g_open (info->path,
-                       O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
+  info->file = g_file_new_for_commandline_arg (info->path);
+  info->o    = G_OUTPUT_STREAM (g_file_replace (info->file, NULL, FALSE, G_FILE_CREATE_NONE, NULL, NULL));
+#if 0
   if (info->fd == -1)
     {
       gchar *name = g_filename_display_name (info->path);
@@ -181,6 +198,7 @@
       save_info_destroy (info);
       return;
     }
+#endif
 
   info->header.tile_width  = buffer->tile_storage->tile_width;
   info->header.tile_height = buffer->tile_storage->tile_height;
@@ -225,9 +243,6 @@
         height = roi->height;
       }
 
-    info->x_tile_shift = -buffer->shift_x / tile_width;
-    info->y_tile_shift = -buffer->shift_y / tile_height;
-
     {
       gint z;
       gint factor = 1;
@@ -278,9 +293,8 @@
   /* set the offset in the file each tile will be stored on */
   {
     GList *iter;
-    gint   predicted_offset = sizeof (GeglBufferHeader) + sizeof (GeglBufferTile) * (info->header.entry_count);
-    GeglBufferTile *last_entry = NULL;
-
+    gint   predicted_offset = sizeof (GeglBufferHeader) +
+                              sizeof (GeglBufferTile) * (info->header.entry_count);
     for (iter = info->tiles; iter; iter = iter->next)
       {
         GeglBufferTile *entry = iter->data;
@@ -288,13 +302,11 @@
                                 (prediction += sizeof (GeglBufferTile)):0;
         entry->offset = predicted_offset;
         predicted_offset += info->tile_size;
-        last_entry = entry;
       }
-    last_entry->blockdef.next=0; /* terminate */
   }
 
   /* save the header */
-  info->offset += write (info->fd, &info->header, sizeof (GeglBufferHeader));
+  info->offset += g_output_stream_write (info->o, &info->header, sizeof (GeglBufferHeader), NULL, NULL);
   g_assert (info->offset == info->header.next);
 
   /* save the index */
@@ -302,14 +314,15 @@
     GList *iter;
     for (iter = info->tiles; iter; iter = iter->next)
       {
-        GeglBufferTile *entry = iter->data;
-        info->offset += write (info->fd, entry, sizeof (GeglBufferTile));
-        if (entry->blockdef.next)
-          {
-            g_assert (info->offset == entry->blockdef.next);
-          }
+        GeglBufferItem *item = iter->data;
+
+        write_block (info, &item->block);
+
       }
   }
+  write_block (info, NULL); /* terminate the index */
+
+  /* update header to point to start of new index */
 
   /* save each tile */
   {
@@ -330,7 +343,7 @@
         g_assert (data);
 
         g_assert (info->offset == entry->offset);
-        info->offset += write (info->fd, data, info->tile_size);
+        info->offset += g_output_stream_write (info->o, data, info->tile_size, NULL, NULL);
         g_object_unref (G_OBJECT (tile));
         i++;
       }