Changeset 1649

Timestamp:

21/10/11 04:12:06 (7 months ago)

Author:

Freddie Akeroyd

Message:

XML now working with int64 dimensions. Refs #258

Location:

trunk/src

Files:

• napi4.c (modified) (2 diffs)
• nxdataset.c (modified) (8 diffs)
• nxdataset.h (modified) (2 diffs)
• nxxml.c (modified) (11 diffs)

trunk/src/napi4.c

@@ -742 +742 @@
         sprintf (pBuffer,
                  "ERROR: invalid dimension %d, value %lld given for SDS %s",
-                 i, dimensions[i], name);
+                 i, (long long)dimensions[i], name);
         NXReportError( pBuffer);
         return NX_ERROR;
@@ -873 +873 @@
         sprintf (pBuffer,
                  "ERROR: invalid dimension %d, value %lld given for SDS %s",
-                 i, dimensions[i], name);
+                 i, (long long)dimensions[i], name);
         NXReportError( pBuffer);
         return NX_ERROR;

trunk/src/nxdataset.c

@@ -36 +36 @@
 pNXDS createNXDataset(int rank, int typecode, int64_t dim[]){
   pNXDS pNew = NULL;
-  int i, length;
+  int64_t length;
+  int i;
 
   pNew = (pNXDS)malloc(sizeof(NXDS));
@@ -43 +44 @@
   }
 
-  pNew->dim = (int *)malloc(rank*sizeof(int));
+  pNew->dim = (int64_t *)malloc(rank*sizeof(int64_t));
   for(i = 0, length = 1; i < rank; i++){
     length *= dim[i];
@@ -73 +74 @@
     return NULL;
   }
-  pNew->dim = (int *)malloc(sizeof(int));
+  pNew->dim = (int64_t *)malloc(sizeof(int64_t));
   pNew->u.cPtr = strdup(name);
   if(pNew->dim == NULL || pNew->u.ptr == NULL){
@@ -160 +161 @@
   This calculates an arbitray address in C storage order
   -----------------------------------------------------------------------*/
-static int calculateAddress(pNXDS dataset, int pos[]){
-  int result, mult;
+static int64_t calculateAddress(pNXDS dataset, int64_t pos[]){
+  int64_t result, mult;
   int i, j;
 
@@ -177 +178 @@
 }
 /*-----------------------------------------------------------------------*/
-double getNXDatasetValue(pNXDS dataset, int pos[]){
-  int address;
+double getNXDatasetValue(pNXDS dataset, int64_t pos[]){
+  int64_t address;
  
   if(dataset == NULL){
@@ -191 +192 @@
 }
 /*----------------------------------------------------------------------*/
-double getNXDatasetValueAt(pNXDS dataset, int address){
+double getNXDatasetValueAt(pNXDS dataset, int64_t address){
   double value;
 
@@ -264 +265 @@
 }
 /*----------------------------------------------------------------------*/
-int   putNXDatasetValue(pNXDS dataset, int pos[], double value){
-  int address;
+int   putNXDatasetValue(pNXDS dataset, int64_t pos[], double value){
+  int64_t address;
 
   if(dataset == NULL){
@@ -278 +279 @@
 }
   /*---------------------------------------------------------------------*/
-int putNXDatasetValueAt(pNXDS dataset, int address, double value){
+int putNXDatasetValueAt(pNXDS dataset, int64_t address, double value){
   /*
     this code is dangerous, it casts without checking the data range.

trunk/src/nxdataset.h

@@ -19 +19 @@
                    int rank;
                    int type;
-                   int *dim;
+                   int64_t *dim;
                    char *format;
                    union {
@@ -65 +65 @@
 int   getNXDatasetByteLength(pNXDS dataset);
 
-double getNXDatasetValue(pNXDS dataset, int pos[]);
-double getNXDatasetValueAt(pNXDS dataset, int address);
+double getNXDatasetValue(pNXDS dataset, int64_t pos[]);
+double getNXDatasetValueAt(pNXDS dataset, int64_t address);
 char  *getNXDatasetText(pNXDS dataset);
 
-int   putNXDatasetValue(pNXDS dataset, int pos[], double value);
-int   putNXDatasetValueAt(pNXDS dataset, int address, double value);
+int   putNXDatasetValue(pNXDS dataset, int64_t pos[], double value);
+int   putNXDatasetValueAt(pNXDS dataset, int64_t address, double value);
 
 #endif

trunk/src/nxxml.c

@@ -394 +394 @@
   if(rank > 1 || datatype == NX_CHAR || dimensions[0] > 1) {
     strcat(typestring,"[");
-    snprintf(pNumber,19,"%lld",dimensions[0]);
+    snprintf(pNumber,19,"%lld", (long long)dimensions[0]);
     strncat(typestring,pNumber,130-strlen(typestring));
     for(i = 1; i < rank; i++){
-      snprintf(pNumber,19,",%d",dimensions[i]);
+      snprintf(pNumber,19,",%lld", (long long)dimensions[i]);
       strncat(typestring,pNumber,130-strlen(typestring));
     }
@@ -415 +415 @@
   char *typestring;
   int i, ndata; 
-  static int one = 1;
+  static int64_t one = 1;
 
   xmlHandle = (pXMLNexus)fid;
@@ -762 +762 @@
   mxml_node_t *current = NULL;
   pNXDS dataset;
-  int i, length, type, rank, dim[NX_MAXRANK];
+  int i, length, type, rank; 
+  int64_t dim[NX_MAXRANK];
   char *pPtr = NULL;
 
@@ -862 +863 @@
   mxml_node_t *current = NULL;
   pNXDS dataset;
-  int i, length, type, rank, dim[NX_MAXRANK];
+  int i, length, type, rank; 
+  int64_t dim[NX_MAXRANK];
 
   xmlHandle = (pXMLNexus)fid;
@@ -958 +960 @@
   the addressing and type conversion implemented in nxdataset
 ---------------------------------------------------------------------*/ 
-static pNXDS makeSlabData(pNXDS dataset, void *data, int size[]){
+static pNXDS makeSlabData(pNXDS dataset, void *data, int64_t size[]){
   pNXDS slabData = NULL;
   int rank, i;
@@ -969 +971 @@
   rank = getNXDatasetRank(dataset);
   slabData->rank = rank;
-  slabData->dim = (int *)malloc(rank*sizeof(int));
+  slabData->dim = (int64_t *)malloc(rank*sizeof(int64_t));
   for(i = 0; i < rank; i++){
     slabData->dim[i] = size[i];
@@ -982 +984 @@
 ----------------------------------------------------------------------*/
 static void putSlabData(pNXDS dataset, pNXDS slabData, int dim,
-                        int start[], 
-                        int sourcePos[],int targetPos[]){
-  int i, rank, length;
+                        int64_t start[], 
+                        int64_t sourcePos[],int64_t targetPos[]){
+  int64_t i, rank, length;
 
   rank = getNXDatasetRank(slabData);
@@ -1008 +1010 @@
  -----------------------------------------------------------------------*/
 static int checkAndExtendDataset(mxml_node_t *node, pNXDS dataset, 
-                                 int start[], int size[]){
-  int dim0, byteLength;
+                                 int64_t start[], int64_t size[]){
+  int64_t dim0, byteLength;
   void *oldData = NULL;
   char *typestring = NULL;
@@ -1049 +1051 @@
   mxml_node_t *current = NULL;
   pNXDS dataset, slabData;
-  int sourcePos[NX_MAXRANK], targetPos[NX_MAXRANK], status;
+  int64_t sourcePos[NX_MAXRANK], targetPos[NX_MAXRANK];
+  int status;
 
   xmlHandle = (pXMLNexus)fid;
@@ -1097 +1100 @@
 ----------------------------------------------------------------------*/
 static void getSlabData(pNXDS dataset, pNXDS slabData, int dim,
-                        int start[], 
-                        int sourcePos[],int targetPos[]){
-  int i, rank, length;
+                        int64_t start[], 
+                        int64_t sourcePos[],int64_t targetPos[]){
+  int64_t i, rank, length;
 
   rank = getNXDatasetRank(slabData);
@@ -1126 +1129 @@
   mxml_node_t *current = NULL;
   pNXDS dataset, slabData;
-  int sourcePos[NX_MAXRANK], targetPos[NX_MAXRANK];
+  int64_t sourcePos[NX_MAXRANK], targetPos[NX_MAXRANK];
 
   xmlHandle = (pXMLNexus)fid;