gegl r2193 - in trunk: . gegl/buffer
- From: ok svn gnome org
- To: svn-commits-list gnome org
- Subject: gegl r2193 - in trunk: . gegl/buffer
- Date: Fri, 18 Apr 2008 21:06:30 +0100 (BST)
Author: ok
Date: Fri Apr 18 20:06:30 2008
New Revision: 2193
URL: http://svn.gnome.org/viewvc/gegl?rev=2193&view=rev
Log:
* gegl/buffer/gegl-tile-backend-swapfile.[ch]: ported to GIO
Modified:
trunk/ChangeLog
trunk/gegl/buffer/gegl-tile-backend-swapfile.c
trunk/gegl/buffer/gegl-tile-backend-swapfile.h
Modified: trunk/gegl/buffer/gegl-tile-backend-swapfile.c
==============================================================================
--- trunk/gegl/buffer/gegl-tile-backend-swapfile.c (original)
+++ trunk/gegl/buffer/gegl-tile-backend-swapfile.c Fri Apr 18 20:06:30 2008
@@ -13,53 +13,36 @@
* You should have received a copy of the GNU Lesser General Public
* License along with GEGL; if not, see <http://www.gnu.org/licenses/>.
*
- * Copyright 2006, 2007 Ãyvind KolÃs <pippin gimp org>
+ * Copyright 2006, 2007, 2008 Ãyvind KolÃs <pippin gimp org>
*/
#include "config.h"
+#include <gio/gio.h>
#include <string.h>
#include <errno.h>
-#define _GNU_SOURCE /* for O_DIRECT */
-
-#include <fcntl.h>
-
-#ifndef O_DIRECT
-#define O_DIRECT 0
-#endif
-
-/* Microsoft Windows does distinguish between binary and text files.
- * We deal with binary files here and have to tell it to open them
- * as binary files. Unortunately the O_BINARY flag used for this is
- * specific to this platform, so we define it for others.
- */
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <sys/types.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
-#define ftruncate(f,d) g_win32_ftruncate(f,d)
-#endif
#include "gegl-tile-backend.h"
#include "gegl-tile-backend-swapfile.h"
+struct _GeglTileBackendSwapfile
+{
+ GeglTileBackend parent_instance;
+
+ gchar *path;
+ GFile *file;
+ GOutputStream *o;
+ GInputStream *i;
+
+ /*gint fd;*/
+ GHashTable *entries;
+ GSList *free_list;
+ guint next_unused;
+ guint total;
+};
+
static void dbg_alloc (int size);
static void dbg_dealloc (int size);
@@ -86,35 +69,34 @@
guchar *dest)
{
gint nleft;
- off_t offset;
+ gboolean success;
gint tile_size = GEGL_TILE_BACKEND (disk)->tile_size;
- offset = lseek (disk->fd, (off_t) entry->offset * tile_size, SEEK_SET);
- if (offset == -1)
+ success = g_seekable_seek (G_SEEKABLE (disk->i),
+ (goffset) entry->offset * tile_size, G_SEEK_SET,
+ NULL, NULL);
+ if (success == FALSE)
{
- g_warning ("unable to seek to tile in swap: %s",
- g_strerror (errno));
+ g_warning ("unable to seek to tile in buffer: %s", g_strerror (errno));
return;
}
nleft = tile_size;
while (nleft > 0)
{
- gint err;
+ gint read;
- do
- {
- err = read (disk->fd, dest + tile_size - nleft, nleft);
- } while ((err == -1) && ((errno == EAGAIN) || (errno == EINTR)));
-
- if (err <= 0)
+ read = g_input_stream_read (G_INPUT_STREAM (disk->i),
+ dest + tile_size - nleft, nleft,
+ NULL, NULL);
+ if (read <= 0)
{
g_message ("unable to read tile data from disk: "
"%s (%d/%d bytes read)",
- g_strerror (errno), err, nleft);
+ g_strerror (errno), read, nleft);
return;
}
- nleft -= err;
+ nleft -= read;
}
}
@@ -123,32 +105,34 @@
DiskEntry *entry,
guchar *source)
{
- gint nleft;
- off_t offset;
- gint tile_size = GEGL_TILE_BACKEND (disk)->tile_size;
-
- offset = lseek (disk->fd, (off_t) entry->offset * tile_size, SEEK_SET);
- if (offset == -1)
+ gint nleft;
+ gboolean success;
+ gint tile_size = GEGL_TILE_BACKEND (disk)->tile_size;
+
+ success = g_seekable_seek (G_SEEKABLE (disk->o),
+ (goffset) entry->offset * tile_size, G_SEEK_SET,
+ NULL, NULL);
+ if (success == FALSE)
{
- g_warning ("unable to seek to tile in swap: %s",
- g_strerror (errno));
+ g_warning ("unable to seek to tile in buffer: %s", g_strerror (errno));
return;
}
nleft = tile_size;
while (nleft > 0)
{
- gint err = write (disk->fd, source + tile_size - nleft, nleft);
+ gint wrote;
+ wrote = g_output_stream_write (disk->o, source + tile_size - nleft,
+ nleft, NULL, NULL);
- if (err <= 0)
+ if (wrote <= 0)
{
g_message ("unable to write tile data to disk: "
"%s (%d/%d bytes written)",
- g_strerror (errno), err, nleft);
+ g_strerror (errno), wrote, nleft);
return;
}
-
- nleft -= err;
+ nleft -= wrote;
}
}
@@ -169,8 +153,10 @@
if (self->offset >= disk->total)
{
gint grow = 32; /* grow 32 tiles of swap space at a time */
- g_assert (0 == ftruncate (disk->fd,
- (off_t) (disk->total + grow) * (off_t) GEGL_TILE_BACKEND (disk)->tile_size));
+ gint tile_size = GEGL_TILE_BACKEND (disk)->tile_size;
+ g_assert (g_seekable_truncate (G_SEEKABLE (disk->o),
+ (goffset) (disk->total + grow) * (goffset) tile_size,
+ NULL,NULL));
disk->total = self->offset;
}
}
@@ -243,41 +229,47 @@
* too often.
*/
static GeglTile *
-get_tile (GeglTileSource *tile_store,
- gint x,
- gint y,
- gint z)
-{
- GeglTileBackendSwapfile *tile_backend_swapfile = GEGL_TILE_BACKEND_SWAPFILE (tile_store);
- GeglTileBackend *backend = GEGL_TILE_BACKEND (tile_store);
- GeglTile *tile = NULL;
-
- {
- DiskEntry *entry = lookup_entry (tile_backend_swapfile, x, y, z);
-
- if (!entry)
- return NULL;
-
- tile = gegl_tile_new (backend->tile_size);
- tile->stored_rev = 1;
- tile->rev = 1;
+get_tile (GeglTileSource *self,
+ gint x,
+ gint y,
+ gint z)
+{
- disk_entry_read (tile_backend_swapfile, entry, tile->data);
- }
+ GeglTileBackend *backend;
+ GeglTileBackendSwapfile *tile_backend_swapfile;
+ DiskEntry *entry;
+ GeglTile *tile = NULL;
+
+ backend = GEGL_TILE_BACKEND (self);
+ tile_backend_swapfile = GEGL_TILE_BACKEND_SWAPFILE (backend);
+ entry = lookup_entry (tile_backend_swapfile, x, y, z);
+
+ if (!entry)
+ return NULL;
+
+ tile = gegl_tile_new (backend->tile_size);
+ tile->stored_rev = 1;
+ tile->rev = 1;
+
+ disk_entry_read (tile_backend_swapfile, entry, tile->data);
return tile;
}
static gpointer
-set_tile (GeglTileSource *store,
+set_tile (GeglTileSource *self,
GeglTile *tile,
gint x,
gint y,
gint z)
{
- GeglTileBackend *backend = GEGL_TILE_BACKEND (store);
- GeglTileBackendSwapfile *tile_backend_swapfile = GEGL_TILE_BACKEND_SWAPFILE (backend);
+ GeglTileBackend *backend;
+ GeglTileBackendSwapfile *tile_backend_swapfile;
+ DiskEntry *entry;
+
+ backend = GEGL_TILE_BACKEND (self);
+ tile_backend_swapfile = GEGL_TILE_BACKEND_SWAPFILE (backend);
+ entry = lookup_entry (tile_backend_swapfile, x, y, z);
- DiskEntry *entry = lookup_entry (tile_backend_swapfile, x, y, z);
if (entry == NULL)
{
@@ -297,15 +289,19 @@
}
static gpointer
-void_tile (GeglTileSource *store,
+void_tile (GeglTileSource *self,
GeglTile *tile,
gint x,
gint y,
gint z)
{
- GeglTileBackend *backend = GEGL_TILE_BACKEND (store);
- GeglTileBackendSwapfile *tile_backend_swapfile = GEGL_TILE_BACKEND_SWAPFILE (backend);
- DiskEntry *entry = lookup_entry (tile_backend_swapfile, x, y, z);
+ GeglTileBackend *backend;
+ GeglTileBackendSwapfile *tile_backend_swapfile;
+ DiskEntry *entry;
+
+ backend = GEGL_TILE_BACKEND (self);
+ tile_backend_swapfile = GEGL_TILE_BACKEND_SWAPFILE (backend);
+ entry = lookup_entry (tile_backend_swapfile, x, y, z);
if (entry != NULL)
{
@@ -316,15 +312,19 @@
}
static gpointer
-exist_tile (GeglTileSource *store,
+exist_tile (GeglTileSource *self,
GeglTile *tile,
gint x,
gint y,
gint z)
{
- GeglTileBackend *backend = GEGL_TILE_BACKEND (store);
- GeglTileBackendSwapfile *tile_backend_swapfile = GEGL_TILE_BACKEND_SWAPFILE (backend);
- DiskEntry *entry = lookup_entry (tile_backend_swapfile, x, y, z);
+ GeglTileBackend *backend;
+ GeglTileBackendSwapfile *tile_backend_swapfile;
+ DiskEntry *entry;
+
+ backend = GEGL_TILE_BACKEND (self);
+ tile_backend_swapfile = GEGL_TILE_BACKEND_SWAPFILE (backend);
+ entry = lookup_entry (tile_backend_swapfile, x, y, z);
return entry!=NULL?((gpointer)0x1):NULL;
}
@@ -336,7 +336,7 @@
};
static gpointer
-command (GeglTileSource *tile_store,
+command (GeglTileSource *self,
GeglTileCommand command,
gint x,
gint y,
@@ -346,18 +346,18 @@
switch (command)
{
case GEGL_TILE_GET:
- return get_tile (tile_store, x, y, z);
+ return get_tile (self, x, y, z);
case GEGL_TILE_SET:
- return set_tile (tile_store, data, x, y, z);
+ return set_tile (self, data, x, y, z);
case GEGL_TILE_IDLE:
return NULL;
case GEGL_TILE_VOID:
- return void_tile (tile_store, data, x, y, z);
+ return void_tile (self, data, x, y, z);
case GEGL_TILE_EXIST:
- return exist_tile (tile_store, data, x, y, z);
+ return exist_tile (self, data, x, y, z);
default:
g_assert (command < GEGL_TILE_LAST_COMMAND &&
@@ -415,8 +415,11 @@
g_hash_table_unref (self->entries);
- close (self->fd);
- g_unlink (self->path);
+ g_object_unref (self->i);
+ g_object_unref (self->o);
+ /* check if we should nuke the buffer or not */
+ g_file_delete (self->file, NULL, NULL);
+ g_object_unref (self->file);
(*G_OBJECT_CLASS (parent_class)->finalize)(object);
}
@@ -475,19 +478,28 @@
object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
disk = GEGL_TILE_BACKEND_SWAPFILE (object);
- disk->fd = g_open (disk->path,
- O_CREAT | O_RDWR | O_BINARY, S_IRUSR | S_IWUSR | O_DIRECT);
+ disk->file = g_file_new_for_commandline_arg (disk->path);
+ disk->o = G_OUTPUT_STREAM (g_file_replace (disk->file, NULL, FALSE, G_FILE_CREATE_NONE, NULL, NULL));
+ g_output_stream_flush (disk->o, NULL, NULL);
+
+ disk->i = G_INPUT_STREAM (g_file_read (disk->file, NULL, NULL));
+ /*disk->fd = g_open (disk->path,
+ O_CREAT | O_RDWR | O_BINARY, S_IRUSR | S_IWUSR | O_DIRECT);*/
+
- if (disk->fd == -1)
+ if (!disk->file)
{
- gchar *name = g_filename_display_name (disk->path);
+ /*gchar *name = g_filename_display_name (disk->path);
g_message ("Unable to open swap file '%s': %s\n"
"GEGL is unable to initialize virtual memory",
name, g_strerror (errno));
- g_free (name);
+ g_free (name);*/
}
+ g_assert (disk->file);
+ g_assert (disk->i);
+ g_assert (disk->o);
disk->entries = g_hash_table_new (hashfunc, equalfunc);
@@ -523,7 +535,9 @@
gegl_tile_backend_swapfile_init (GeglTileBackendSwapfile *self)
{
self->path = NULL;
- self->fd = 0;
+ self->file = NULL;
+ self->i = NULL;
+ self->o = NULL;
self->entries = NULL;
self->free_list = NULL;
self->next_unused = 0;
Modified: trunk/gegl/buffer/gegl-tile-backend-swapfile.h
==============================================================================
--- trunk/gegl/buffer/gegl-tile-backend-swapfile.h (original)
+++ trunk/gegl/buffer/gegl-tile-backend-swapfile.h Fri Apr 18 20:06:30 2008
@@ -34,17 +34,6 @@
typedef struct _GeglTileBackendSwapfile GeglTileBackendSwapfile;
typedef struct _GeglTileBackendSwapfileClass GeglTileBackendSwapfileClass;
-struct _GeglTileBackendSwapfile
-{
- GeglTileBackend parent_instance;
-
- gchar *path;
- gint fd;
- GHashTable *entries;
- GSList *free_list;
- guint next_unused;
- guint total;
-};
struct _GeglTileBackendSwapfileClass
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
