Changeset 1738 for trunk

Timestamp:

07/11/11 13:42:20 (7 months ago)

Author:

Freddie Akeroyd

Message:

Add NXreopen() function to create a second NXhandle referencing the same file that can be used by e.g. a second thread
Refs #298

Location:

trunk

Files:

• include/napi.h (modified) (3 diffs)
• include/napi5.h (modified) (1 diff)
• src/napi.c (modified) (1 diff)
• src/napi4.c (modified) (1 diff)
• src/napi5.c (modified) (2 diffs)
• src/nxxml.c (modified) (1 diff)

trunk/include/napi.h

@@ -198 +198 @@
 
 #    define NXopen              MANGLE(nxiopen)
+#    define NXreopen            MANGLE(nxireopen)
 #    define NXclose             MANGLE(nxiclose)
 #    define NXmakegroup         MANGLE(nximakegroup)
@@ -298 +299 @@
 extern  NXstatus  NXopen(CONSTCHAR * filename, NXaccess access_method, NXhandle* pHandle);
 
+  /** 
+   * Opens an existing NeXus file a second time for e.g. access from another thread.
+   * \return NX_OK on success, NX_ERROR in the case of an error.   
+   * \ingroup c_init
+   */
+extern  NXstatus  NXreopen(NXhandle pOrigHandle, NXhandle* pNewHandle);
+
   /**
    * close a NeXus file
@@ -888 +896 @@
         NXhandle pNexusData;   
         int stripFlag;
+        NXstatus ( *nxreopen)(NXhandle pOrigHandle, NXhandle* pNewHandle);
         NXstatus ( *nxclose)(NXhandle* pHandle);
         NXstatus ( *nxflush)(NXhandle* pHandle);

trunk/include/napi5.h

@@ -9 +9 @@
 
 extern  NXstatus  NX5open(CONSTCHAR *filename, NXaccess access_method, NXhandle* pHandle);
+extern  NXstatus  NX5reopen(NXhandle pOrigHandle, NXhandle* pNewHandle);
+
 extern  NXstatus  NX5close(NXhandle* pHandle);
 extern  NXstatus  NX5flush(NXhandle* pHandle);

trunk/src/napi.c

@@ -567 +567 @@
 }
 
+
+NXstatus  NXreopen(NXhandle pOrigHandle, NXhandle* pNewHandle)
+{
+      pFileStack newFileStack;
+          pFileStack origFileStack = (pFileStack)pOrigHandle;
+        pNexusFunction fOrigHandle = NULL, fNewHandle = NULL;
+          *pNewHandle = NULL;
+          newFileStack = makeFileStack();
+          if(newFileStack == NULL){
+          NXReportError ("ERROR: no memory to create filestack");
+          return NX_ERROR;
+      }
+          // The code below will only open the last file on a stack
+          // for the moment raise an error, but this behaviour may be OK
+          if (fileStackDepth(origFileStack) > 0)    
+          {
+                NXReportError (
+          "ERROR: handle stack referes to many files - cannot reopen");
+                  return NX_ERROR;
+          }
+          fOrigHandle = peekFileOnStack(origFileStack);
+          if (fOrigHandle->nxreopen == NULL)
+          {
+                NXReportError (
+          "ERROR: NXreopen not implemented for this underlying file format");
+                  return NX_ERROR;
+          }
+          fNewHandle = (NexusFunction*)malloc(sizeof(NexusFunction));
+          memcpy(fNewHandle, fOrigHandle, sizeof(NexusFunction));
+          LOCKED_CALL(fNewHandle->nxreopen( fOrigHandle->pNexusData, &(fNewHandle->pNexusData) ));
+          pushFileStack( newFileStack, fNewHandle, peekFilenameOnStack(origFileStack) );
+          *pNewHandle = newFileStack;
+          return NX_OK;
+}
+
+
 /* ------------------------------------------------------------------------- */
 

trunk/src/napi4.c

@@ -1950 +1950 @@
 {
       fHandle->nxclose=NX4close;
+          fHandle->nxreopen=NULL;
       fHandle->nxflush=NX4flush;
       fHandle->nxmakegroup=NX4makegroup;

trunk/src/napi5.c

@@ -115 +115 @@
    ---------------------------------------------------------------------*/
 
-  NXstatus  NX5open(CONSTCHAR *filename, NXaccess am, 
+  NXstatus  NX5reopen(NXhandle pOrigHandle, NXhandle* pNewHandle)  
+{
+        pNexusFile5 pNew = NULL, pOrig = NULL;
+    *pNewHandle = NULL;
+       pOrig = (pNexusFile5)pOrigHandle;
+    pNew = (pNexusFile5) malloc (sizeof (NexusFile5));
+    if (!pNew) {
+      NXReportError ("ERROR: no memory to create File datastructure");
+      return NX_ERROR;
+    }
+    memset (pNew, 0, sizeof (NexusFile5));
+    pNew->iFID = H5Freopen (pOrig->iFID);
+    if (pNew->iFID <= 0) {
+        NXReportError ("cannot clone file");
+                free (pNew);
+      return NX_ERROR;
+       }
+       strcpy(pNew->iAccess, pOrig->iAccess);
+    pNew->iNXID = NX5SIGNATURE;
+    pNew->iStack5[0].iVref = 0;    /* root! */
+    *pNewHandle = (NXhandle)pNew;
+    return NX_OK;
+}
+
+NXstatus  NX5open(CONSTCHAR *filename, NXaccess am, 
                                  NXhandle* pHandle)
   {
@@ -2199 +2223 @@
 void NX5assignFunctions(pNexusFunction fHandle)
 {
-
+                
       fHandle->nxclose=NX5close;
+      fHandle->nxreopen=NX5reopen;
       fHandle->nxflush=NX5flush;
       fHandle->nxmakegroup=NX5makegroup;

trunk/src/nxxml.c

@@ -1939 +1939 @@
 void NXXassignFunctions(pNexusFunction fHandle){
       fHandle->nxclose=NXXclose;
+          fHandle->nxreopen=NULL;
       fHandle->nxflush=NXXflush;
       fHandle->nxmakegroup=NXXmakegroup;