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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 671
          http://getdata.svn.sourceforge.net/getdata/?rev=671&view=rev
Author:   ketiltrout
Date:     2012-03-14 19:54:48 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
* Don't sync, just close in gd_{close,discard,uninclude}.
* Added gd_raw_close() + bindings.
* Fix initialisation of file->pos in SIE encoding.
* Write SIE /encoding.
* Fix perl build to fix dependency tracking.

Modified Paths:
--------------
    trunk/getdata/ChangeLog
    trunk/getdata/bindings/cxx/dirfile.cpp
    trunk/getdata/bindings/cxx/getdata/dirfile.h
    trunk/getdata/bindings/cxx/test/big_test.cpp
    trunk/getdata/bindings/f77/fgetdata.c
    trunk/getdata/bindings/f77/fgetdata.h
    trunk/getdata/bindings/f77/getdata.f.in
    trunk/getdata/bindings/f77/getdata.f90.in
    trunk/getdata/bindings/f77/test/big_test.f
    trunk/getdata/bindings/f77/test/big_test95.f90
    trunk/getdata/bindings/idl/getdata.c
    trunk/getdata/bindings/idl/test/big_test.pro
    trunk/getdata/bindings/perl/Build.PL.in
    trunk/getdata/bindings/perl/simple_funcs.xsin
    trunk/getdata/bindings/perl/t/big_test.t
    trunk/getdata/bindings/python/pydirfile.c
    trunk/getdata/bindings/python/test/big_test.py
    trunk/getdata/configure.ac
    trunk/getdata/doc/list.tests
    trunk/getdata/src/close.c
    trunk/getdata/src/flush.c
    trunk/getdata/src/getdata.h.in
    trunk/getdata/src/include.c
    trunk/getdata/src/internal.h
    trunk/getdata/src/sie.c

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

--- trunk/getdata/ChangeLog	2012-03-12 22:35:14 UTC (rev 670)
+++ trunk/getdata/ChangeLog	2012-03-14 19:54:48 UTC (rev 671)
@@ -1,3 +1,28 @@
+2012-03-14   D. V. Wiebe <ge...@ke...> svn:671
+	* src/flush.c (_GD_FlushFragment): Write SIE encoding directives.
+
+	* src/sie.c (_GD_SampIndOpen): Initialise file->pos to 0 to avoid issues
+	with _GD_GetFilePos.
+	* src/sie.c (_GD_SampIndSeek): Don't short circuit if no record is loaded.
+
+	* src/flush.c (_GD_Flush _GD_SyncOrClose): Make syncing optional with a new
+	parameter (syn).
+	* src/flush.c (gd_raw_close): Added.
+	* src/clsoe.c (_GD_ShutdownDirfile) src/include.c (gd_uninclude): Don't
+	sync, just close raw files.
+
+	* bindings/python/pydirfile.c (gdpy_dirfile_raw_close)
+	bindings/cxx/dirfile.cpp (Dirfile::RawClose) bindings/perl/simple_funcs.xsin
+	(raw_close) bindings/f77/fgetdata.c (GDRCLO) bindings/f77/getdata.f90.in
+	(fgd_raw_close): Added.
+	* bindings/idl/getdata.c (gdidl_flush): Add /NOSYNC.
+	* bindings/python/test/big_test.py bindings/cxx/test/big_test.cpp
+	bindings/perl/t/big_test.t bindings/f77/test/big_test.f
+	bindings/f77/test/big_test95.f90: Added test 233.
+
+	* bindings/perl/Build.PL.in: subclass Module::Build to properly handle
+	simple_funcs.xs dependency tracking.
+
 2012-03-06   D. V. Wiebe <ge...@ke...> svn:667
 	* src/errors.c: Change prefix on verbose output to "libgetdata".
 

Modified: trunk/getdata/bindings/cxx/dirfile.cpp
===================================================================
--- trunk/getdata/bindings/cxx/dirfile.cpp	2012-03-12 22:35:14 UTC (rev 670)
+++ trunk/getdata/bindings/cxx/dirfile.cpp	2012-03-14 19:54:48 UTC (rev 671)
@@ -511,6 +511,11 @@
   return gd_sync(D, field_code);
 }
 
+int Dirfile::RawClose(const char* field_code) const
+{
+  return gd_raw_close(D, field_code);
+}
+
 int Dirfile::UnHide(const char* field_code) const
 {
   return gd_unhide(D, field_code);

Modified: trunk/getdata/bindings/cxx/getdata/dirfile.h
===================================================================
--- trunk/getdata/bindings/cxx/getdata/dirfile.h	2012-03-12 22:35:14 UTC (rev 670)
+++ trunk/getdata/bindings/cxx/getdata/dirfile.h	2012-03-14 19:54:48 UTC (rev 671)
@@ -227,6 +227,8 @@
 
       size_t PutString(const char *field_code, const char *data_in) const;
 
+      int RawClose(const char *field_code = NULL) const;
+
       GetData::RawEntry *Reference(const char* field_code = NULL) const;
 
       const char *ReferenceFilename();

Modified: trunk/getdata/bindings/cxx/test/big_test.cpp
===================================================================
--- trunk/getdata/bindings/cxx/test/big_test.cpp	2012-03-12 22:35:14 UTC (rev 670)
+++ trunk/getdata/bindings/cxx/test/big_test.cpp	2012-03-14 19:54:48 UTC (rev 671)
@@ -1639,6 +1639,9 @@
   CHECK_OK2(232, 3);
   CHECK_STRING2(232, 4, str, "test3 test4");
 
+  // 233: gd_raw_close check
+  d->RawClose("data");
+  CHECK_OK(233);
 
 
 
@@ -1646,6 +1649,7 @@
 
 
 
+
   // ===================================================================
   d->Discard();
   delete d;

Modified: trunk/getdata/bindings/f77/fgetdata.c
===================================================================
--- trunk/getdata/bindings/f77/fgetdata.c	2012-03-12 22:35:14 UTC (rev 670)
+++ trunk/getdata/bindings/f77/fgetdata.c	2012-03-14 19:54:48 UTC (rev 671)
@@ -3765,6 +3765,24 @@
   dreturnvoid();
 }
 
+/* gd_raw_close wrapper */
+void F77_FUNC(gdrclo, GDRCLO) (const int* dirfile, const char* field_code,
+    const int* field_code_l)
+{
+  dtrace("%i, %p, %i", *dirfile, field_code, *field_code_l);
+
+  if (field_code_l == 0)
+    gd_sync(_GDF_GetDirfile(*dirfile), NULL);
+  else {
+    char *out = (char *)malloc(*field_code_l + 1);
+    gd_raw_close(_GDF_GetDirfile(*dirfile), _GDF_CString(out, field_code,
+          *field_code_l));
+    free(out);
+  }
+
+  dreturnvoid();
+}
+
 void F77_FUNC(gdtoke, GDTOKE) (char *toke, int *toke_l, const int *dirfile,
     const char *string, const int *string_l, const int *n)
 {

Modified: trunk/getdata/bindings/f77/fgetdata.h
===================================================================
--- trunk/getdata/bindings/f77/fgetdata.h	2012-03-12 22:35:14 UTC (rev 670)
+++ trunk/getdata/bindings/f77/fgetdata.h	2012-03-14 19:54:48 UTC (rev 671)
@@ -620,6 +620,9 @@
 void F77_FUNC(gdsync, GDSYNC) (const int* dirfile, const char* field_code,
     const int* field_code_l);
 
+void F77_FUNC(gdrclo, GDRCLO) (const int* dirfile, const char* field_code,
+    const int* field_code_l);
+
 void F77_FUNC(gdinca, GDINCA) (const int* dirfile, const char* file,
     const int* file_l, const int* fragment_index, const char* prefix,
     const int* prefix_l, const char* suffix, const int* suffix_l,

Modified: trunk/getdata/bindings/f77/getdata.f.in
===================================================================
--- trunk/getdata/bindings/f77/getdata.f.in	2012-03-12 22:35:14 UTC (rev 670)
+++ trunk/getdata/bindings/f77/getdata.f.in	2012-03-14 19:54:48 UTC (rev 671)
@@ -328,6 +328,8 @@
       EXTERNAL GDPTST
 C     Corresponding to gd_putdata(3)
       EXTERNAL GDPUTD
+C     Corresponding to gd_raw_close(3)
+      EXTERNAL GDRCLO
 C     Corresponding to gd_reference(3)
       EXTERNAL GDREFE
 C     Correpsonding to gd_rename(3)

Modified: trunk/getdata/bindings/f77/getdata.f90.in
===================================================================
--- trunk/getdata/bindings/f77/getdata.f90.in	2012-03-12 22:35:14 UTC (rev 670)
+++ trunk/getdata/bindings/f77/getdata.f90.in	2012-03-14 19:54:48 UTC (rev 671)
@@ -2734,6 +2734,13 @@
   call gdsync(dirfile, TRIM(field_code), LEN_TRIM(field_code))
 end subroutine
 
+subroutine fgd_raw_close (dirfile, field_code)
+  integer, intent(in) :: dirfile
+  character (len=*), intent(in) :: field_code
+
+  call gdrclo(dirfile, TRIM(field_code), LEN_TRIM(field_code))
+end subroutine
+
 subroutine fgd_fragment_affixes (prefix, pl, suffix, sl, dirfile, &
 fragment_index)
   character(len=*), intent(out) :: prefix, suffix

Modified: trunk/getdata/bindings/f77/test/big_test.f
===================================================================
--- trunk/getdata/bindings/f77/test/big_test.f	2012-03-12 22:35:14 UTC (rev 670)
+++ trunk/getdata/bindings/f77/test/big_test.f	2012-03-14 19:54:48 UTC (rev 671)
@@ -2070,6 +2070,9 @@
       CALL CHKIN2(ne, 232, 5, l, slen)
       CALL CHKST2(ne, 232, 6, str, 'test3 test4')
 
+C     233: GDRCLO check
+      CALL GDRCLO(d, 'data', 4)
+      CALL CHKEOK(ne, 233, d)
 
 
 
@@ -2078,6 +2081,7 @@
 
 
 
+
 C     ===============================================================
 C     Cleanup
       CALL GDDSCD(d)

Modified: trunk/getdata/bindings/f77/test/big_test95.f90
===================================================================
--- trunk/getdata/bindings/f77/test/big_test95.f90	2012-03-12 22:35:14 UTC (rev 670)
+++ trunk/getdata/bindings/f77/test/big_test95.f90	2012-03-14 19:54:48 UTC (rev 671)
@@ -2504,6 +2504,10 @@
   call check_int2(ne, 232, 5, l, slen)
   call check_str2(ne, 232, 6, str, 'test3 test4')
 
+! 233: fgd_raw_close check
+  call fgd_raw_close(d, 'data')
+  call check_ok(ne, 233, d)
+
  
 
 

Modified: trunk/getdata/bindings/idl/getdata.c
===================================================================
--- trunk/getdata/bindings/idl/getdata.c	2012-03-12 22:35:14 UTC (rev 670)
+++ trunk/getdata/bindings/idl/getdata.c	2012-03-14 19:54:48 UTC (rev 671)
@@ -3055,6 +3055,7 @@
     { "FIELD_CODE", IDL_TYP_STRING, 1, 0, IDL_KW_OFFSETOF(field_code_x),
       IDL_KW_OFFSETOF(field_code) },
     { "NOCLOSE", IDL_TYP_INT, 1, 0, 0, IDL_KW_OFFSETOF(noclose) },
+    { "NOSYNC", IDL_TYP_INT, 1, 0, 0, IDL_KW_OFFSETOF(noclose) },
     { NULL }
   };
 
@@ -3065,8 +3066,12 @@
   if (kw.field_code_x)
     field_code = IDL_STRING_STR(&kw.field_code);
 
-  if (kw.noclose)
+  if (kw.noclose && kw.nosync)
+    idl_kw_abort("nothing to do");
+  else if (kw.noclose)
     gd_sync(D, field_code);
+  else if (kw.nosync)
+    gd_raw_close(D, field_code);
   else
     gd_flush(D, field_code);
 

Modified: trunk/getdata/bindings/idl/test/big_test.pro
===================================================================
--- trunk/getdata/bindings/idl/test/big_test.pro	2012-03-12 22:35:14 UTC (rev 670)
+++ trunk/getdata/bindings/idl/test/big_test.pro	2012-03-14 19:54:48 UTC (rev 671)
@@ -1341,6 +1341,10 @@
 nume += check_ok2(232, 3 ,d)
 nume += check_simple2(232, 4, str, "test3 test4")
 
+; 233: gd_raw_close check
+gd_flush, d, field_code='data', /nosync
+nume += check_ok(233, d)
+
  
 
 

Modified: trunk/getdata/bindings/perl/Build.PL.in
===================================================================
--- trunk/getdata/bindings/perl/Build.PL.in	2012-03-12 22:35:14 UTC (rev 670)
+++ trunk/getdata/bindings/perl/Build.PL.in	2012-03-14 19:54:48 UTC (rev 671)
@@ -1,7 +1,24 @@
 # @configure_input@
 
 use Module::Build;
-my $build = Module::Build->new(
+
+# divert up_to_date to allow consideration of simple_funcs.xs... is there an
+# easier way to do this?
+my $class = Module::Build->subclass(
+  class => "GetData::Build",
+  code => <<'SUBCLASS' );
+
+sub up_to_date {
+  my ($self, $source, $derived) = @_;
+
+  if ($source eq "lib/GetData.xs") {
+    return 0 if (not $self->up_to_date("lib/simple_funcs.xs", $derived));
+  }
+  return $self->SUPER::up_to_date($source, $derived);
+}
+SUBCLASS
+
+my $build = $class->new(
   dist_abstract => "Perl bindings to the GetData library",
   dist_author => 'The GetData Project <@PACKAGE_BUGREPORT@>',
   dist_version_from => "GetData.pm",

Modified: trunk/getdata/bindings/perl/simple_funcs.xsin
===================================================================
--- trunk/getdata/bindings/perl/simple_funcs.xsin	2012-03-12 22:35:14 UTC (rev 670)
+++ trunk/getdata/bindings/perl/simple_funcs.xsin	2012-03-14 19:54:48 UTC (rev 671)
@@ -152,3 +152,4 @@
 int madd_mplex(DIRFILE *dirfile, const char *parent, const char *field_code,
     const char *in_field, const char *count_field, gd_count_t count_val,
     gd_count_t count_max)
+int raw_close(DIRFILE *dirfile, const char *field_code)

Modified: trunk/getdata/bindings/perl/t/big_test.t
===================================================================
--- trunk/getdata/bindings/perl/t/big_test.t	2012-03-12 22:35:14 UTC (rev 670)
+++ trunk/getdata/bindings/perl/t/big_test.t	2012-03-14 19:54:48 UTC (rev 671)
@@ -22,7 +22,7 @@
 use GetData;
 use Math::Complex;
 use strict;
-use Test::More tests => 1265;
+use Test::More tests => 1266;
 
 my $ne = 0;
 my ($s, @a, %h);
@@ -1661,6 +1661,9 @@
 CheckOK(232);
 CheckSArray(232, \@a, "test1 test2", "test3 test4", "test5");
 
+# 233: gd_raw_close check
+$s = $_->raw_close('data');
+CheckOK(233);
 
 
 
@@ -1668,5 +1671,7 @@
 
 
 
+
+
 $d = $_ = undef;
 system "rm -rf dirfile";

Modified: trunk/getdata/bindings/python/pydirfile.c
===================================================================
--- trunk/getdata/bindings/python/pydirfile.c	2012-03-12 22:35:14 UTC (rev 670)
+++ trunk/getdata/bindings/python/pydirfile.c	2012-03-14 19:54:48 UTC (rev 671)
@@ -909,6 +909,30 @@
   return Py_None;
 }
 
+static PyObject* gdpy_dirfile_raw_close(struct gdpy_dirfile_t* self,
+    PyObject* args, PyObject* keys)
+{
+  dtrace("%p, %p, %p", self, args, keys);
+
+  char* keywords[] = { "field_code", NULL };
+  const char* field_code = NULL;
+
+  if (!PyArg_ParseTupleAndKeywords(args, keys, "|s:pygetdata.dirfile.raw_close",
+        keywords, &field_code))
+  {
+    dreturn("%p", NULL);
+    return NULL;
+  }
+
+  gd_raw_close(self->D, field_code);
+
+  PYGD_CHECK_ERROR(self->D, NULL);
+
+  Py_INCREF(Py_None);
+  dreturn("%p", Py_None);
+  return Py_None;
+}
+
 static PyObject* gdpy_dirfile_include(struct gdpy_dirfile_t* self,
     PyObject* args, PyObject* keys)
 {
@@ -2532,10 +2556,8 @@
   },
   {"flush", (PyCFunction)gdpy_dirfile_flush, METH_VARARGS | METH_KEYWORDS,
     "flush([field_code])\n\n"
-      "Flush pending writes to the specified field to disk.  This does\n"
-      "not flush pending metadata changes.  For that, use metaflush.\n"
-      "However, if field_code is omitted, all data *and* metadata will be\n"
-      "written to disk.  See gd_flush(3)."
+      "Equivalent to sync([field_code]) && raw_close([field_code]).\n"
+      "See gd_flush(3)."
   },
   {"bof", (PyCFunction)gdpy_dirfile_getbof, METH_VARARGS | METH_KEYWORDS,
     "bof(field_code)\n\n"
@@ -2954,9 +2976,19 @@
   },
   {"sync", (PyCFunction)gdpy_dirfile_sync, METH_VARARGS | METH_KEYWORDS,
     "sync([field_code])\n\n"
-      "This is similar to using Flush, but without closing the affected\n"
-      "files.  See gd_sync(3)."
+      "Flush pending writes to the specified field to disk.  This does\n"
+      "not flush pending metadata changes.  For that, use metaflush.\n"
+      "However, if field_code is omitted, all data *and* metadata will be\n"
+      "written to disk.  See gd_sync(3)."
   },
+  {"raw_close", (PyCFunction)gdpy_dirfile_raw_close,
+    METH_VARARGS | METH_KEYWORDS,
+    "raw_close([field_code])\n\n"
+      "Close any open raw data files associated with field_code, freeing\n"
+      /* ------- handy ruler ---------------------------------------------| */
+      "resources which may be used for other purposes.  If field_code is\n"
+      "omitted, all open raw data files are closed.  See gd_raw_close(3)."
+  },
   {"naliases", (PyCFunction)gdpy_dirfile_naliases, METH_VARARGS | METH_KEYWORDS,
     "naliases(field_code)\n\n"
       "This function returns the number of aliases defined for the specified\n"
@@ -3005,7 +3037,6 @@
   },
   {"tokenise", (PyCFunction)gdpy_dirfile_tokenise, METH_VARARGS | METH_KEYWORDS,
     "tokenise([string])\n\n"
-      /* ------- handy ruler ---------------------------------------------| */
       "If 'string' is given, runs the GetData tokeniser on 'string' and\n"
       "returns the first token.  If 'string' is not given, returns\n"
       "subsequent tokens (one per call) of the last string that was\n"

Modified: trunk/getdata/bindings/python/test/big_test.py
===================================================================
--- trunk/getdata/bindings/python/test/big_test.py	2012-03-12 22:35:14 UTC (rev 670)
+++ trunk/getdata/bindings/python/test/big_test.py	2012-03-14 19:54:48 UTC (rev 671)
@@ -1915,6 +1915,13 @@
 except:
   CheckOK2(232, 3)
 CheckSimple2(232, 4, str, "test3 test4")
+
+# 233: gd_raw_close check
+try:
+  d.raw_close('data')
+except:
+  CheckOK(233)
+
  
 
 

Modified: trunk/getdata/configure.ac
===================================================================
--- trunk/getdata/configure.ac	2012-03-12 22:35:14 UTC (rev 670)
+++ trunk/getdata/configure.ac	2012-03-14 19:54:48 UTC (rev 671)
@@ -959,8 +959,8 @@
 AC_CONFIG_FILES([man/gd_alter_endianness.3])
 AC_CONFIG_FILES([man/gd_alter_frameoffset.3])
 AC_CONFIG_FILES([src/Makefile])
-dnl This doubling allows us to build getdata.h as a normal AC_CONFIG_FILE, but use
-dnl AC_CONFIG_HEADERS to check whether it has changed.
+dnl This doubling allows us to build getdata.h as a normal AC_CONFIG_FILE, but
+dnl use AC_CONFIG_HEADERS to check whether it has changed.
 AC_CONFIG_FILES([src/getdata.ah:src/getdata.h.in])
 AC_CONFIG_HEADERS([src/getdata.h:src/getdata.ah], [chmod a-w src/getdata.h])
 AC_CONFIG_FILES([src/getdata.pc])

Modified: trunk/getdata/doc/list.tests
===================================================================
--- trunk/getdata/doc/list.tests	2012-03-12 22:35:14 UTC (rev 670)
+++ trunk/getdata/doc/list.tests	2012-03-14 19:54:48 UTC (rev 671)
@@ -244,3 +244,4 @@
 230 F9CIpP gd_madd_mplex
 231 F9CIpP gd_alter_mplex
 232 F9CIpP gd_tokenise
+233 F9CIpP gd_raw_close

Modified: trunk/getdata/src/close.c
===================================================================
--- trunk/getdata/src/close.c	2012-03-12 22:35:14 UTC (rev 670)
+++ trunk/getdata/src/close.c	2012-03-14 19:54:48 UTC (rev 671)
@@ -85,7 +85,7 @@
 
   for(i = 0; i < D->n_entries; ++i)
     if (D->entry[i]->field_type == GD_RAW_ENTRY)
-      _GD_Flush(D, D->entry[i], 1);
+      _GD_Flush(D, D->entry[i], 0, 1);
 
   if (D->error) {
     dreturn("%i", 1);

Modified: trunk/getdata/src/flush.c
===================================================================
--- trunk/getdata/src/flush.c	2012-03-12 22:35:14 UTC (rev 670)
+++ trunk/getdata/src/flush.c	2012-03-14 19:54:48 UTC (rev 671)
@@ -22,11 +22,11 @@
 
 #define GD_MAX_PRETTY_FIELD_WIDTH 80
 
-void _GD_Flush(DIRFILE* D, gd_entry_t *E, int clo)
+void _GD_Flush(DIRFILE *D, gd_entry_t *E, int syn, int clo)
 {
   int i;
 
-  dtrace("%p, %p, %i", D, E, clo);
+  dtrace("%p, %p, %i, %i", D, E, syn, clo);
 
   if (++D->recurse_level >= GD_MAX_RECURSE_LEVEL) {
     _GD_SetError(D, GD_E_RECURSE_LEVEL, GD_E_RECURSE_CODE, NULL, 0, E->field);
@@ -41,13 +41,15 @@
           ((_gd_ef[E->e->u.raw.file[0].subenc].flags & GD_EF_OOP) &&
            (E->e->u.raw.file[1].idata >= 0)))
       {
-        if ((D->flags & GD_ACCMODE) == GD_RDWR &&
+        if (syn && (D->flags & GD_ACCMODE) == GD_RDWR &&
             (E->e->u.raw.file[0].mode & GD_FILE_WRITE) &&
             _gd_ef[E->e->u.raw.file[0].subenc].sync != NULL &&
             (*_gd_ef[E->e->u.raw.file[0].subenc].sync)(E->e->u.raw.file))
+        {
           _GD_SetError(D, GD_E_RAW_IO, 0, E->e->u.raw.file[0].name, errno,
               NULL);
-        else if (clo && _GD_FiniRawIO(D, E, E->fragment_index, GD_FINIRAW_KEEP))
+        } else if (clo && _GD_FiniRawIO(D, E, E->fragment_index,
+              GD_FINIRAW_KEEP))
         {
           _GD_SetError(D, GD_E_RAW_IO, 0, E->e->u.raw.file[0].name, errno,
               NULL);
@@ -56,13 +58,13 @@
       break;
     case GD_LINCOM_ENTRY:
       for (i = 2; i < E->EN(lincom,n_fields); ++i)
-        _GD_Flush(D, E->e->entry[i], clo);
+        _GD_Flush(D, E->e->entry[i], syn, clo);
       /* fallthrough */
     case GD_MULTIPLY_ENTRY:
     case GD_DIVIDE_ENTRY:
     case GD_WINDOW_ENTRY:
     case GD_MPLEX_ENTRY:
-      _GD_Flush(D, E->e->entry[1], clo);
+      _GD_Flush(D, E->e->entry[1], syn, clo);
       /* fallthrough */
     case GD_LINTERP_ENTRY:
     case GD_BIT_ENTRY:
@@ -70,7 +72,7 @@
     case GD_POLYNOM_ENTRY:
     case GD_SBIT_ENTRY:
     case GD_RECIP_ENTRY:
-      _GD_Flush(D, E->e->entry[0], clo);
+      _GD_Flush(D, E->e->entry[0], syn, clo);
     case GD_CONST_ENTRY:
     case GD_CARRAY_ENTRY:
     case GD_STRING_ENTRY:
@@ -688,8 +690,14 @@
       case GD_TEXT_ENCODED:
         fputs("/ENCODING text\n", stream);
         break;
+      case GD_SIE_ENCODED:
+        fputs("/ENCODING sie\n", stream);
+        break;
       case 0:
         break;
+      case GD_ZZIP_ENCODED:
+      case GD_ZZSLIM_ENCODED:
+        /* XXX do something here ... ? */
       default:
         fprintf(stream, "/ENCODING unknown # (%lx)\n", D->fragment[i].encoding);
         break;
@@ -842,14 +850,14 @@
   return (D->error == GD_E_OK) ? 0 : -1;
 }
 
-static int _GD_SyncOrClose(DIRFILE* D, const char* field_code, int clo)
+static int _GD_SyncOrClose(DIRFILE* D, const char* field_code, int syn, int clo)
 {
   unsigned int i;
   int repr;
   char *simple_field_code;
   gd_entry_t *E;
 
-  dtrace("%p, \"%s\", %i", D, field_code, clo);
+  dtrace("%p, \"%s\", %i, %i", D, field_code, syn, clo);
 
   _GD_ClearError(D);
 
@@ -860,14 +868,14 @@
     if (!D->error)
       for (i = 0; i < D->n_entries; ++i)
         if (D->entry[i]->field_type == GD_RAW_ENTRY)
-          _GD_Flush(D, D->entry[i], clo);
+          _GD_Flush(D, D->entry[i], syn, clo);
   } else {
     /* discard representation */
     E = _GD_FindFieldAndRepr(D, field_code, &simple_field_code, &repr, NULL, 1,
         1);
 
     if (!D->error)
-      _GD_Flush(D, E, clo);
+      _GD_Flush(D, E, syn, clo);
 
     if (field_code != simple_field_code)
       free(simple_field_code);
@@ -883,19 +891,31 @@
 
   dtrace("%p, \"%s\"", D, field_code);
 
-  ret = _GD_SyncOrClose(D, field_code, 0);
+  ret = _GD_SyncOrClose(D, field_code, 1, 0);
 
   dreturn("%i", ret);
   return ret;
 }
 
+int gd_raw_close(DIRFILE *D, const char *field_code)
+{
+  int ret;
+
+  dtrace("%p, \"%s\"", D, field_code);
+
+  ret = _GD_SyncOrClose(D, field_code, 0, 1);
+
+  dreturn("%i", ret);
+  return ret;
+}
+
 int gd_flush(DIRFILE *D, const char *field_code)
 {
   int ret;
 
   dtrace("%p, \"%s\"", D, field_code);
 
-  ret = _GD_SyncOrClose(D, field_code, 1);
+  ret = _GD_SyncOrClose(D, field_code, 1, 1);
 
   dreturn("%i", ret);
   return ret;

Modified: trunk/getdata/src/getdata.h.in
===================================================================
--- trunk/getdata/src/getdata.h.in	2012-03-12 22:35:14 UTC (rev 670)
+++ trunk/getdata/src/getdata.h.in	2012-03-14 19:54:48 UTC (rev 671)
@@ -943,6 +943,9 @@
 extern DIRFILE *gd_open(const char *dirfilename,
     unsigned long int flags) gd_nonnull ((1));
 
+extern int gd_raw_close(DIRFILE *dirfile,
+    const char *field_code) gd_nonnull ((1));
+
 extern int gd_rename(DIRFILE *dirfile, const char *old_code,
     const char *new_name, unsigned flags) gd_nonnull ((1,2,3));
 

Modified: trunk/getdata/src/include.c
===================================================================
--- trunk/getdata/src/include.c	2012-03-12 22:35:14 UTC (rev 670)
+++ trunk/getdata/src/include.c	2012-03-14 19:54:48 UTC (rev 671)
@@ -463,7 +463,7 @@
     if (D->entry[i]->field_type == GD_RAW_ENTRY &&
         _GD_ContainsFragment(f, nf, D->entry[i]->fragment_index))
     {
-      _GD_Flush(D, D->entry[i], 1);
+      _GD_Flush(D, D->entry[i], 0, 1);
     }
 
   /* flush the fragment's metadata, if requested */

Modified: trunk/getdata/src/internal.h
===================================================================
--- trunk/getdata/src/internal.h	2012-03-12 22:35:14 UTC (rev 670)
+++ trunk/getdata/src/internal.h	2012-03-14 19:54:48 UTC (rev 671)
@@ -1003,7 +1003,7 @@
 #define _GD_FileSwapBytes(D,i) ((D)->fragment[i].byte_sex & GD_BIG_ENDIAN)
 #endif
 int _GD_FiniRawIO(DIRFILE*, const gd_entry_t*, int, int);
-void _GD_Flush(DIRFILE *restrict, gd_entry_t *restrict, int);
+void _GD_Flush(DIRFILE *restrict, gd_entry_t *restrict, int, int);
 void _GD_FlushMeta(DIRFILE* D, int fragment, int force);
 void _GD_FreeE(DIRFILE *restrict, gd_entry_t *restrict, int);
 off64_t _GD_GetEOF(DIRFILE *restrict, const gd_entry_t *restrict,

Modified: trunk/getdata/src/sie.c
===================================================================
--- trunk/getdata/src/sie.c	2012-03-12 22:35:14 UTC (rev 670)
+++ trunk/getdata/src/sie.c	2012-03-14 19:54:48 UTC (rev 671)
@@ -91,7 +91,7 @@
   }
 
   file->mode = mode;
-  file->pos = -1;
+  file->pos = 0;
   dreturn("%i", 0);
   return 0;
 }
@@ -140,7 +140,7 @@
 
   dtrace("%p, %llx, 0x%X, 0x%X", file, (long long)sample, data_type, mode);
 
-  if (file->pos == sample) {
+  if (file->pos == sample && f->p >= 0) {
     dreturn("%lli", (long long)sample);
     return sample;
   }

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:[671] trunk/getdata (Page 5)

Scientific Database Format

getdata-commits