Thread: [Getdata-commits] SF.net SVN: getdata:[905] trunk/getdata (Page 9)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 905
          http://sourceforge.net/p/getdata/code/905
Author:   ketiltrout
Date:     2014-05-22 21:39:16 +0000 (Thu, 22 May 2014)
Log Message:
-----------
Disable the slimdopen stuff to avoid a libslim bug (that might be my fault).
Some re-arrangement to get modules working again.

Modified Paths:
--------------
    trunk/getdata/ChangeLog
    trunk/getdata/src/bzip.c
    trunk/getdata/src/debug.c
    trunk/getdata/src/encoding.c
    trunk/getdata/src/getdata.h.in
    trunk/getdata/src/gzip.c
    trunk/getdata/src/lzma.c
    trunk/getdata/src/slim.c

Modified: trunk/getdata/ChangeLog
===================================================================

--- trunk/getdata/ChangeLog	2014-05-19 19:46:21 UTC (rev 904)
+++ trunk/getdata/ChangeLog	2014-05-22 21:39:16 UTC (rev 905)
@@ -1,3 +1,13 @@
+2014-05-22     D. V. Wiebe <ge...@ke...> svn:905
+	* src/slim.c (_GD_SlimOpen _GD_SlimSize): Disable the slimdopen and
+	slimdrawsize stuff to avoid a slimlib bug.
+
+	* src/bzip.c src/lzma.c: Re-order some functions to get modules working
+	again.
+	
+	* src/encoding.c (_GD_InitialiseFramework): Don't try to lock the mutex if
+	it's not needed.
+
 2014-05-19     D. V. Wiebe <ge...@ke...> svn:904
 	* src/lzma.c: Rewritten with better understanding of liblzma.  Includes
 	write support.
@@ -13,6 +23,10 @@
 
 	* src/bzip.c: Remove unnecessary .write member.
 
+2014-05-10     D. V. Wiebe <ge...@ke...> svn:903
+	* src/slim.c (_GD_SlimOpen _GD_SlimSize): Use slimdopen and slimdrawsize if
+	available to reduce race conditions.
+
 2014-05-06     D. V. Wiebe <ge...@ke...> svn:901
 	* src/encoding.c: Add bzip2 OOP write support.
 	* src/bzip.c (_GD_Bzip2DoOpen _GD_Bzip2Open _GD_Bzip2Seek _GD_Bzip2Close

Modified: trunk/getdata/src/bzip.c
===================================================================
--- trunk/getdata/src/bzip.c	2014-05-19 19:46:21 UTC (rev 904)
+++ trunk/getdata/src/bzip.c	2014-05-22 21:39:16 UTC (rev 905)
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008-2011 D. V. Wiebe
+/* Copyright (C) 2008-2011, 2014 D. V. Wiebe
  *
  ***************************************************************************
  *
@@ -136,6 +136,90 @@
   return 0;
 }
 
+ssize_t _GD_Bzip2Read(struct gd_raw_file_ *restrict file, void *restrict data,
+    gd_type_t data_type, size_t nmemb)
+{
+  char* output = (char*)data;
+  struct gd_bzdata *ptr = (struct gd_bzdata *)file->edata;
+  unsigned long long nbytes = nmemb * GD_SIZE(data_type);
+
+  dtrace("%p, %p, 0x%X, %" PRNsize_t, file, data, data_type, nmemb);
+
+  while (nbytes > (unsigned long long)(ptr->end - ptr->pos)) {
+    int n;
+
+    memcpy(output, ptr->data + ptr->pos, ptr->end - ptr->pos);
+    output += ptr->end - ptr->pos;
+    nbytes -= ptr->end - ptr->pos;
+    ptr->pos = ptr->end;
+
+    if (ptr->stream_end) {
+      dreturn("%li", (long)(nmemb - nbytes / GD_SIZE(data_type)));
+      return nmemb - nbytes / GD_SIZE(data_type);
+    }
+
+    ptr->bzerror = 0;
+    n = BZ2_bzRead(&ptr->bzerror, ptr->bzfile, ptr->data,
+        GD_BZIP_BUFFER_SIZE);
+
+    if (ptr->bzerror == BZ_OK || ptr->bzerror == BZ_STREAM_END) {
+      ptr->base += ptr->end;
+      ptr->pos = 0;
+      ptr->end = n;
+    } else {
+      dreturn("%i", -1);
+      return -1;
+    }
+
+    /* eof */
+    if (ptr->bzerror != BZ_OK) {
+      ptr->stream_end = 1;
+      break;
+    }
+  }
+
+  if (nbytes > (unsigned long long)(ptr->end - ptr->pos)) {
+    memcpy(output, ptr->data + ptr->pos, ptr->end - ptr->pos);
+    ptr->pos = ptr->end;
+    nbytes -= ptr->end;
+  } else {
+    memcpy(output, ptr->data + ptr->pos, nbytes);
+    ptr->pos += nbytes;
+    nbytes = 0;
+  }
+
+  file->pos = (ptr->base + ptr->pos) / GD_SIZE(data_type);
+
+  dreturn("%li", (long)(nmemb - nbytes / GD_SIZE(data_type)));
+  return nmemb - nbytes / GD_SIZE(data_type);
+}
+
+ssize_t _GD_Bzip2Write(struct gd_raw_file_ *file, const void *data,
+    gd_type_t data_type, size_t nmemb)
+{
+  struct gd_bzdata *ptr = (struct gd_bzdata *)file->edata;
+  ssize_t n;
+
+  dtrace("%p, %p, 0x%X, %" PRNsize_t, file, data, data_type, nmemb);
+
+  n = GD_SIZE(data_type) * nmemb;
+  if (n > INT_MAX)
+    n = INT_MAX;
+
+  BZ2_bzWrite(&ptr->bzerror, ptr->bzfile, (void*)data, (int)n);
+
+  if (ptr->bzerror)
+    n = -1;
+  else {
+    ptr->base += n;
+    n /= GD_SIZE(data_type);
+    file->pos += n;
+  }
+
+  dreturn("%" PRNssize_t, n);
+  return n;
+}
+
 off64_t _GD_Bzip2Seek(struct gd_raw_file_* file, off64_t count,
     gd_type_t data_type, unsigned int mode)
 {
@@ -223,90 +307,6 @@
   return file->pos;;
 }
 
-ssize_t _GD_Bzip2Read(struct gd_raw_file_ *restrict file, void *restrict data,
-    gd_type_t data_type, size_t nmemb)
-{
-  char* output = (char*)data;
-  struct gd_bzdata *ptr = (struct gd_bzdata *)file->edata;
-  unsigned long long nbytes = nmemb * GD_SIZE(data_type);
-
-  dtrace("%p, %p, 0x%X, %" PRNsize_t, file, data, data_type, nmemb);
-
-  while (nbytes > (unsigned long long)(ptr->end - ptr->pos)) {
-    int n;
-
-    memcpy(output, ptr->data + ptr->pos, ptr->end - ptr->pos);
-    output += ptr->end - ptr->pos;
-    nbytes -= ptr->end - ptr->pos;
-    ptr->pos = ptr->end;
-
-    if (ptr->stream_end) {
-      dreturn("%li", (long)(nmemb - nbytes / GD_SIZE(data_type)));
-      return nmemb - nbytes / GD_SIZE(data_type);
-    }
-
-    ptr->bzerror = 0;
-    n = BZ2_bzRead(&ptr->bzerror, ptr->bzfile, ptr->data,
-        GD_BZIP_BUFFER_SIZE);
-
-    if (ptr->bzerror == BZ_OK || ptr->bzerror == BZ_STREAM_END) {
-      ptr->base += ptr->end;
-      ptr->pos = 0;
-      ptr->end = n;
-    } else {
-      dreturn("%i", -1);
-      return -1;
-    }
-
-    /* eof */
-    if (ptr->bzerror != BZ_OK) {
-      ptr->stream_end = 1;
-      break;
-    }
-  }
-
-  if (nbytes > (unsigned long long)(ptr->end - ptr->pos)) {
-    memcpy(output, ptr->data + ptr->pos, ptr->end - ptr->pos);
-    ptr->pos = ptr->end;
-    nbytes -= ptr->end;
-  } else {
-    memcpy(output, ptr->data + ptr->pos, nbytes);
-    ptr->pos += nbytes;
-    nbytes = 0;
-  }
-
-  file->pos = (ptr->base + ptr->pos) / GD_SIZE(data_type);
-
-  dreturn("%li", (long)(nmemb - nbytes / GD_SIZE(data_type)));
-  return nmemb - nbytes / GD_SIZE(data_type);
-}
-
-ssize_t _GD_Bzip2Write(struct gd_raw_file_ *file, const void *data,
-    gd_type_t data_type, size_t nmemb)
-{
-  struct gd_bzdata *ptr = (struct gd_bzdata *)file->edata;
-  ssize_t n;
-
-  dtrace("%p, %p, 0x%X, %" PRNsize_t, file, data, data_type, nmemb);
-
-  n = GD_SIZE(data_type) * nmemb;
-  if (n > INT_MAX)
-    n = INT_MAX;
-
-  BZ2_bzWrite(&ptr->bzerror, ptr->bzfile, (void*)data, (int)n);
-
-  if (ptr->bzerror)
-    n = -1;
-  else {
-    ptr->base += n;
-    n /= GD_SIZE(data_type);
-    file->pos += n;
-  }
-
-  dreturn("%" PRNssize_t, n);
-  return n;
-}
-
 /* This function does nothing */
 int _GD_Bzip2Sync(struct gd_raw_file_ *file gd_unused_)
 {

Modified: trunk/getdata/src/debug.c
===================================================================
--- trunk/getdata/src/debug.c	2014-05-19 19:46:21 UTC (rev 904)
+++ trunk/getdata/src/debug.c	2014-05-22 21:39:16 UTC (rev 905)
@@ -40,7 +40,7 @@
 const char* gd_colsub(void)
 {
   static char buffer[GD_COL_SIZE + 1];
-  strcpy(buffer, gd_colnil());
+  strcpy(buffer, gd_debug_col);
 
   if (gd_col_count > 0)
     gd_debug_col[--gd_col_count] = '\0';

Modified: trunk/getdata/src/encoding.c
===================================================================
--- trunk/getdata/src/encoding.c	2014-05-19 19:46:21 UTC (rev 904)
+++ trunk/getdata/src/encoding.c	2014-05-22 21:39:16 UTC (rev 905)
@@ -195,16 +195,20 @@
 void _GD_InitialiseFramework(void)
 {
   dtracevoid();
+
 #ifdef USE_MODULES
 #ifdef USE_PTHREAD
-  pthread_mutex_lock(&gd_mutex_);
+  if (!framework_initialised) {
+    pthread_mutex_lock(&gd_mutex_);
 #endif
-  if (!framework_initialised) {
-    framework_initialised = 1;
-    lt_dlinit();
+    /* check again */
+    if (!framework_initialised) {
+      framework_initialised = 1;
+      lt_dlinit();
+    }
+#ifdef USE_PTHREAD
+    pthread_mutex_unlock(&gd_mutex_);
   }
-#ifdef USE_PTHREAD
-  pthread_mutex_unlock(&gd_mutex_);
 #endif
 #endif
   dreturnvoid();

Modified: trunk/getdata/src/getdata.h.in
===================================================================
--- trunk/getdata/src/getdata.h.in	2014-05-19 19:46:21 UTC (rev 904)
+++ trunk/getdata/src/getdata.h.in	2014-05-22 21:39:16 UTC (rev 905)
@@ -246,7 +246,7 @@
 } gd_entype_t;
 
 /* GD_NO_ENTRY and GD_ALIAS_ENTRY are not part of this count */
-#define GD_N_ENTYPES 16
+#define GD_N_ENTYPES 19
 
 /* Special types for gd_nentries(3) and gd_entry_list(3) */
 #define GD_ALL_ENTRIES    0

Modified: trunk/getdata/src/gzip.c
===================================================================
--- trunk/getdata/src/gzip.c	2014-05-19 19:46:21 UTC (rev 904)
+++ trunk/getdata/src/gzip.c	2014-05-22 21:39:16 UTC (rev 905)
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008-2011 D. V. Wiebe
+/* Copyright (C) 2008-2011, 2014 D. V. Wiebe
  *
  ***************************************************************************
  *

Modified: trunk/getdata/src/lzma.c
===================================================================
--- trunk/getdata/src/lzma.c	2014-05-19 19:46:21 UTC (rev 904)
+++ trunk/getdata/src/lzma.c	2014-05-22 21:39:16 UTC (rev 905)
@@ -28,6 +28,8 @@
 #define _GD_LzmaOpen libgetdatalzma_LTX_GD_LzmaOpen
 #define _GD_LzmaSeek libgetdatalzma_LTX_GD_LzmaSeek
 #define _GD_LzmaRead libgetdatalzma_LTX_GD_LzmaRead
+#define _GD_LzmaWrite libgetdatalzma_LTX_GD_LzmaWrite
+#define _GD_LzmaSync libgetdatalzma_LTX_GD_LzmaSync
 #define _GD_LzmaClose libgetdatalzma_LTX_GD_LzmaClose
 #define _GD_LzmaSize libgetdatalzma_LTX_GD_LzmaSize
 #endif
@@ -222,6 +224,66 @@
   dreturnvoid();
 }
 
+/* flush the output buffer to the stream */
+static int _GD_LzmaFlush(struct gd_lzmadata *lzd)
+{
+  uint8_t *ptr;
+
+  dtrace("%p", lzd);
+
+  ptr = lzd->data_out;
+  while (NOUT(*lzd) > 0) {
+    ssize_t nw = fwrite(ptr, 1, NOUT(*lzd), lzd->stream);
+    if (nw == 0 && ferror(lzd->stream)) {
+      dreturn("%i", 1);
+      return 1;
+    }
+
+    ptr += nw;
+    lzd->xz.avail_out += nw;
+  }
+
+  /* reset output buffer */
+  lzd->xz.next_out = lzd->data_out;
+
+  dreturn("%i", 0);
+  return 0;
+}
+
+ssize_t _GD_LzmaWrite(struct gd_raw_file_ *file, const void *data,
+    gd_type_t data_type, size_t nmemb)
+{
+  lzma_ret e;
+  size_t n;
+  struct gd_lzmadata *lzd = (struct gd_lzmadata *)file->edata;
+
+  dtrace("%p, %p, 0x%X, %" PRNsize_t, file, data, data_type, nmemb);
+
+  n = nmemb * GD_SIZE(data_type);
+
+  /* We let liblzma read directly from the caller's buffer */
+  lzd->xz.next_in = data;
+  lzd->xz.avail_in = n;
+
+  /* code */
+  while (lzd->xz.avail_in > 0) {
+    e = lzma_code(&lzd->xz, LZMA_RUN);
+    if (e != LZMA_OK) {
+      dreturn("%i", -1);
+      return -1;
+    }
+
+    if (_GD_LzmaFlush(lzd)) {
+      dreturn("%i", -1);
+      return -1;
+    }
+  }
+
+  /* we always write all the input, if successful */
+  dreturn("%" PRNssize_t, (ssize_t)nmemb);
+  return nmemb;
+}
+
 off64_t _GD_LzmaSeek(struct gd_raw_file_* file, off64_t count,
     gd_type_t data_type, unsigned int mode)
 {
@@ -356,66 +418,6 @@
   return nread;
 }
 
-/* flush the output buffer to the stream */
-static int _GD_LzmaFlush(struct gd_lzmadata *lzd)
-{
-  uint8_t *ptr;
-
-  dtrace("%p", lzd);
-
-  ptr = lzd->data_out;
-  while (NOUT(*lzd) > 0) {
-    ssize_t nw = fwrite(ptr, 1, NOUT(*lzd), lzd->stream);
-    if (nw == 0 && ferror(lzd->stream)) {
-      dreturn("%i", 1);
-      return 1;
-    }
-
-    ptr += nw;
-    lzd->xz.avail_out += nw;
-  }
-
-  /* reset output buffer */
-  lzd->xz.next_out = lzd->data_out;
-
-  dreturn("%i", 0);
-  return 0;
-}
-
-ssize_t _GD_LzmaWrite(struct gd_raw_file_ *file, const void *data,
-    gd_type_t data_type, size_t nmemb)
-{
-  lzma_ret e;
-  size_t n;
-  struct gd_lzmadata *lzd = (struct gd_lzmadata *)file->edata;
-
-  dtrace("%p, %p, 0x%X, %" PRNsize_t, file, data, data_type, nmemb);
-
-  n = nmemb * GD_SIZE(data_type);
-
-  /* We let liblzma read directly from the caller's buffer */
-  lzd->xz.next_in = data;
-  lzd->xz.avail_in = n;
-
-  /* code */
-  while (lzd->xz.avail_in > 0) {
-    e = lzma_code(&lzd->xz, LZMA_RUN);
-    if (e != LZMA_OK) {
-      dreturn("%i", -1);
-      return -1;
-    }
-
-    if (_GD_LzmaFlush(lzd)) {
-      dreturn("%i", -1);
-      return -1;
-    }
-  }
-
-  /* we always write all the input, if successful */
-  dreturn("%" PRNssize_t, (ssize_t)nmemb);
-  return nmemb;
-}
-
 int _GD_LzmaClose(struct gd_raw_file_ *file)
 {
   lzma_ret e;

Modified: trunk/getdata/src/slim.c
===================================================================
--- trunk/getdata/src/slim.c	2014-05-19 19:46:21 UTC (rev 904)
+++ trunk/getdata/src/slim.c	2014-05-22 21:39:16 UTC (rev 905)
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008, 2010, 2011 D. V. Wiebe
+/* Copyright (C) 2008, 2010, 2011, 2014 D. V. Wiebe
  *
  ***************************************************************************
  *
@@ -40,7 +40,10 @@
 {
   dtrace("%i, %p, <unused>, <unused>", dirfd, file);
 
-#ifdef HAVE_SLIMDOPEN
+  /* slimdopen in slimlib-2.6.7 and earlier contains a bug resulting in a SEGV,
+   * so disable this for now */
+#if 0
+  /* #ifdef HAVE_SLIMDOPEN */
   {
     int fd = gd_OpenAt(file->D, dirfd, file->name, O_RDONLY | O_BINARY, 0666);
     if (fd < 0) {
@@ -138,7 +141,10 @@
 
   dtrace("%i, %p, 0x%X", dirfd, file, data_type);
 
-#ifdef HAVE_SLIMDRAWSIZE
+  /* slimdrawsize in slimlib-2.6.7 and earlier contains a bug resulting in a
+   * SEGV, so disable this for now */
+#if 0
+  /* #ifdef HAVE_SLIMDRAWSIZE */
   {
     int fd = gd_OpenAt(file->D, dirfd, file->name, O_RDONLY | O_BINARY, 0666);
     if (fd < 0) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





Thread: [Getdata-commits] SF.net SVN: getdata:[905] trunk/getdata (Page 9)

Scientific Database Format

getdata-commits