Destroy of resources in array.

pioExamples/compareResourcesArray.c

@@ -19,6 +19,8 @@ extern void   reshPackBufferCreate  ( char **, int *, MPI_Comm );
 extern void   reshPackBufferDestroy ( char ** );
 extern void   rpcUnpackResources    ( char *, int, MPI_Comm );
 
+extern void arrayDestroy ( void );
+
 #define nlon 12 // Number of longitudes
 #define nlat  6 // Number of latitudes 
 #define nlev  5 // Number of levels    
@@ -144,15 +146,13 @@ void modelRun ()
   namespaceSetActive ( 0 ); 
   free ( recvBuffer );  
   reshPackBufferDestroy ( &sendBuffer );
-  xdebug ();
   differ = reshArrayCompare ( 0, 1 );
-  printf ( "###### The resource arrays %s.\n", differ ? "differ" : "are equal" );
-  xdebug ();
+  printf ( "The resource arrays %s.\n", differ ? "differ" : "are equal" );
   reshArrayPrint ( "reshArrayModel" );
-
+  
   // Close the output stream
   streamClose(streamID);
-		    
+  
   // Destroy the objects
   
   vlistDestroy(vlistID);

src/namespace.c

@@ -56,12 +56,12 @@ int namespaceIdxEncode2 ( int nsp, int idx )
 }
 
 
-namespaceTuple_t namespaceIdxDecode ( int code )
+namespaceTuple_t namespaceResHDecode ( int resH )
 {
   namespaceTuple_t tin;
 
-  tin.idx = code & idxmask;
-  tin.nsp = (int)(((unsigned)( code & nspmask )) >> idxbits);
+  tin.idx = resH & idxmask;
+  tin.nsp = (int)(((unsigned)( resH & nspmask )) >> idxbits);
 
   return tin;
 }

src/namespace.h

@@ -12,7 +12,7 @@ int              namespaceGetNumber    ( void );
 int              namespaceGetActive    ( void );
 int              namespaceIdxEncode    ( namespaceTuple_t );
 int              namespaceIdxEncode2   ( int, int );
-namespaceTuple_t namespaceIdxDecode    ( int );
+namespaceTuple_t namespaceResHDecode   ( int );
 int              namespaceHasLocalFile ( int );
 void             namespaceCleanup      ( void );
 int              namespaceAdaptKey     ( int, int );

src/resource_handle.c

@@ -109,21 +109,30 @@ void arrayInitPointer ( void )
 /**************************************************************/
 
 
-static
 void arrayDestroy ( void )
 {
-  int i;
-
+  node * node;
+  int i, j, nspTemp = namespaceGetActive ();
+  
   if ( arrayResources )
     {
       for ( i = 0; i < namespaceGetNumber (); i++ )
-        if (  arrayResources[i] )
-          free ( arrayResources[i] );
-      free ( arrayResources );
+	{
+	  namespaceSetActive ( i );  
+	  for ( j = 0; j < arraySizeAllocated[i]; j++ )
+	    {
+	      node = arrayResources[i] + j;
+	      if ( node->ptr )
+		node->ops->valDestroy ( node->ptr );
+	    }
+	}
+      free ( arrayResources[i] );
     }
-
+  free ( arrayResources );
+  
   if ( freeListHead ) free ( freeListHead );
   if ( arraySizeAllocated ) free ( arraySizeAllocated );
+  namespaceSetActive ( nspTemp );    
 }
 
 
@@ -226,7 +235,7 @@ void reshRemove ( cdiResH idx, resOps * ops )
 
   nsp = namespaceGetActive ();
 
-  nspT = namespaceIdxDecode ( idx );
+  nspT = namespaceResHDecode ( idx );
 
   assert ( nspT.nsp == nsp &&
            nspT.idx >= 0 &&
@@ -259,7 +268,7 @@ void *reshGetVal ( cdiResH idx, resOps * ops  )
 
   nsp = namespaceGetActive ();
 
-  nspT = namespaceIdxDecode ( idx );
+  nspT = namespaceResHDecode ( idx );
 
   assert ( arrayInit &&
            nspT.nsp == nsp &&
@@ -452,7 +461,7 @@ void reshSetStatus ( cdiResH idx, resOps * ops, int status )
 
   nsp = namespaceGetActive ();
 
-  nspT = namespaceIdxDecode ( idx );
+  nspT = namespaceResHDecode ( idx );
 
   assert ( arrayInit &&
            nspT.nsp == nsp &&
@@ -485,7 +494,7 @@ int reshGetStatus ( cdiResH idx, resOps * ops )
 
   nsp = namespaceGetActive ();
 
-  nspT = namespaceIdxDecode ( idx );
+  nspT = namespaceResHDecode ( idx );
 
   assert ( arrayInit &&
            nspT.nsp == nsp &&
@@ -528,7 +537,7 @@ int reshArrayCompare ( int nsp0, int nsp1 )
 {
   const int equal  = 0;
   const int differ = -1;
-  int i;
+  int i, valCompare;
   node * node0, * node1;
 
   assert ( arrayInit && 
@@ -545,30 +554,28 @@ int reshArrayCompare ( int nsp0, int nsp1 )
 	      xdebug ();
 	      return differ;
 	    }
+
 	  node1 = arrayResources[nsp1] + i;
 	  if ( !node1->ptr )
 	    {
 	      xdebug ();
 	      return differ;
 	    }
+
 	  assert ( node0->ops && node1->ops );
 	  if ( node0->ops != node1->ops )
 	    {
 	      xdebug ();
 	      return differ;
 	    }
-	  if ( node0->ops->valCompare 
-	       (( void * ) node0->ptr, ( void * ) node1->ptr ) != equal )
-	    {
-	      printf ( "type %d, values idx0=%d and idx1=%d differ\n", 
-		       node0->ops->valTxCode (), node0->idx, node1->idx );
-	      return differ;
-	    }
-	  else 
-	    {
-	      printf ( "type %d, values idx0=%d and idx1=%d are equal\n", 
-		       node0->ops->valTxCode (), node0->idx, node1->idx );
-	    }
+
+	  valCompare =  node0->ops->valCompare ( node0->ptr, node1->ptr );
+	  printf ( "type %d, values idx0=%d and idx1=%d %s\n", 
+		   node0->ops->valTxCode (), 
+		   node0->idx, 
+		   node1->idx,
+		   valCompare == equal ? "are equal" : "differ" );
+	  if ( valCompare != equal ) return differ;
 	}
       else if ( arrayResources[nsp1][i].ptr )
 	return differ;