Changeset 28241 for trunk/Ohana/src/opihi

Timestamp:

Jun 6, 2010, 4:06:31 PM (16 years ago)

Author:

eugene

Message:

merging changes from branches/eam_branches/Ohana.20100606: re-work the off_t print/scan format; fix and test NAN implementation in gnu89 context; fix and test BYTE_SWAP for libohana

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/opihi/cmd.data/extract.c (modified) (1 diff)
• src/opihi/cmd.data/matrix.c (modified) (1 diff)
• src/opihi/cmd.data/rd.c (modified) (1 diff)
• src/opihi/cmd.data/rdseg.c (modified) (1 diff)
• src/opihi/cmd.data/rebin.c (modified) (1 diff)
• src/opihi/dvo/avextract.c (modified) (1 diff)
• src/opihi/dvo/avmatch.c (modified) (1 diff)
• src/opihi/dvo/cmatch.c (modified) (1 diff)
• src/opihi/dvo/cmpread.c (modified) (3 diffs)
• src/opihi/dvo/detrend.c (modified) (2 diffs)
• src/opihi/dvo/fitcolors.c (modified) (1 diff)
• src/opihi/dvo/fitsed.c (modified) (1 diff)
• src/opihi/dvo/gstar.c (modified) (1 diff)
• src/opihi/dvo/imrough.c (modified) (3 diffs)
• src/opihi/dvo/imsearch.c (modified) (2 diffs)
• src/opihi/dvo/mextract.c (modified) (1 diff)
• src/opihi/dvo/mmextract.c (modified) (1 diff)
• src/opihi/pcontrol/StartHost.c (modified) (1 diff)
• src/opihi/pcontrol/StopHosts.c (modified) (1 diff)

trunk/Ohana/src/opihi/cmd.data/extract.c

@@ -70 +70 @@
     if ((out[0].header.Naxis[1] != Ny) || (out[0].header.Naxis[0] != Nx)) {
       gprint (GP_ERR, "matrix sizes mis-matched\n");
-      gprint (GP_ERR, "%d x %d  vs  %lld x %lld\n", Nx, Ny, 
-              (long long) out[0].header.Naxis[0], (long long) out[0].header.Naxis[1]);
+      gprint (GP_ERR, "%d x %d  vs  "OFF_T_FMT" x "OFF_T_FMT"\n", Nx, Ny, 
+               out[0].header.Naxis[0],  out[0].header.Naxis[1]);
       return (FALSE);
     }

trunk/Ohana/src/opihi/cmd.data/matrix.c

@@ -23 +23 @@
 
     if (bufB[0].matrix.Naxis[0] != bufC[0].matrix.Naxis[1]) {
-      gprint (GP_ERR, "size mis-match in matrices: (%lld x %lld) * (%lld x %lld)\n", 
-              (long long) bufB[0].matrix.Naxis[0], (long long) bufB[0].matrix.Naxis[1], 
-              (long long) bufC[0].matrix.Naxis[0], (long long) bufC[0].matrix.Naxis[1]);
+      gprint (GP_ERR, "size mis-match in matrices: ("OFF_T_FMT" x "OFF_T_FMT") * ("OFF_T_FMT" x "OFF_T_FMT")\n", 
+               bufB[0].matrix.Naxis[0],  bufB[0].matrix.Naxis[1], 
+               bufC[0].matrix.Naxis[0],  bufC[0].matrix.Naxis[1]);
       return (FALSE);
     }

trunk/Ohana/src/opihi/cmd.data/rd.c

@@ -222 +222 @@
   buf[0].unsign = buf[0].header.unsign;
 
-  gprint (GP_LOG, "read %lld bytes from %s into buffer %s\n", 
-          (long long) buf[0].header.datasize + buf[0].matrix.datasize, argv[2], argv[1]);
+  gprint (GP_LOG, "read "OFF_T_FMT" bytes from %s into buffer %s\n", 
+           buf[0].header.datasize + buf[0].matrix.datasize, argv[2], argv[1]);
 
   blank = 0xffff;

trunk/Ohana/src/opihi/cmd.data/rdseg.c

@@ -62 +62 @@
   buf[0].bzero  = buf[0].header.bzero;     /* store the original values */
   buf[0].unsign = buf[0].header.unsign;
-  gprint (GP_LOG, "read %lld bytes from %s into buffer %s\n", (long long) buf[0].header.datasize + buf[0].matrix.datasize, argv[2], argv[1]);
+  gprint (GP_LOG, "read "OFF_T_FMT" bytes from %s into buffer %s\n",  buf[0].header.datasize + buf[0].matrix.datasize, argv[2], argv[1]);
 
   gfits_scan (&buf[0].header, "BLANK", "%d", 1, &blank);

trunk/Ohana/src/opihi/cmd.data/rebin.c

@@ -63 +63 @@
     }      
   }
-  if (VERBOSE) gprint (GP_LOG, "rebin %s to %s (%lld,%lld to %d,%d)\n", argv[1], argv[2], (long long) in[0].header.Naxis[0], (long long) in[0].header.Naxis[1], nx, ny);
+  if (VERBOSE) gprint (GP_LOG, "rebin %s to %s ("OFF_T_FMT","OFF_T_FMT" to %d,%d)\n", argv[1], argv[2],  in[0].header.Naxis[0],  in[0].header.Naxis[1], nx, ny);
 
   Nx = in[0].header.Naxis[0];

trunk/Ohana/src/opihi/dvo/avextract.c

@@ -103 +103 @@
     catalog.Nsecfilt = 0;
 
-    if (VERBOSE) gprint (GP_ERR, "trying %s (%lld of %lld)\n", catalog.filename, (long long) i, (long long) skylist[0].Nregions);
+    if (VERBOSE) gprint (GP_ERR, "trying %s ("OFF_T_FMT" of "OFF_T_FMT")\n", catalog.filename,  i,  skylist[0].Nregions);
       
     // an error exit status here is a significant error

trunk/Ohana/src/opihi/dvo/avmatch.c

@@ -102 +102 @@
     catalog.Nsecfilt = 0;
 
-    if (VERBOSE) gprint (GP_ERR, "trying %s (%lld of %lld)\n", catalog.filename, (long long) i, (long long) skylist[0].Nregions);
+    if (VERBOSE) gprint (GP_ERR, "trying %s ("OFF_T_FMT" of "OFF_T_FMT")\n", catalog.filename,  i,  skylist[0].Nregions);
       
     // an error exit status here is a significant error

trunk/Ohana/src/opihi/dvo/cmatch.c

@@ -37 +37 @@
   }
   dvo_catalog_unlock (&catalog1);
-  gprint (GP_ERR, "read %lld stars from phot catalog file %s\n", (long long) catalog1.Naverage, filename);
+  gprint (GP_ERR, "read "OFF_T_FMT" stars from phot catalog file %s\n",  catalog1.Naverage, filename);
 
   /* this is for loading from a text file, presumably hstgsc or usno

trunk/Ohana/src/opihi/dvo/cmpread.c

@@ -65 +65 @@
 
   /* find expected number of stars */
-  if (!gfits_scan (&header, "NSTARS", "%lld", 1, (long long *) &Nstars)) {
+  if (!gfits_scan (&header, "NSTARS", OFF_T_FMT, 1,  &Nstars)) {
     gprint (GP_ERR, "ERROR: can't get NSTARS from header\n");
     gfits_free_header (&header);
@@ -77 +77 @@
     /* allocate space for stars */
     gprint (GP_ERR, "reading from TEXT cmp file %s\n", argv[2]);
-    if (!gfits_scan (&header, "NSTARS", "%lld", 1, (long long *) &Nstars)) {
+    if (!gfits_scan (&header, "NSTARS", OFF_T_FMT, 1,  &Nstars)) {
       gprint (GP_ERR, "ERROR: failed to find NSTARS\n");
       exit (1);
@@ -139 +139 @@
   free (stars);
   gfits_free_header (&header);
-  gprint (GP_ERR, "loaded %lld objects\n", (long long) Nstars);
+  gprint (GP_ERR, "loaded "OFF_T_FMT" objects\n",  Nstars);
   return (TRUE);
 }

trunk/Ohana/src/opihi/dvo/detrend.c

@@ -137 +137 @@
 
   /* load existing data from database */
-  gfits_scan (&header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
+  gfits_scan (&header, "NIMAGES", OFF_T_FMT, 1,  &Nimage);
   ALLOCATE (pimage, RegImage, Nimage);
   status = fread (pimage, sizeof(RegImage), Nimage, f);
@@ -143 +143 @@
 
   if (status != Nimage) {
-    gprint (GP_ERR, "ERROR: header and data in dB don't match (%lld vs %lld)\n", (long long) Nimage, (long long) status);
+    gprint (GP_ERR, "ERROR: header and data in dB don't match ("OFF_T_FMT" vs "OFF_T_FMT")\n",  Nimage,  status);
     gfits_free_header (&header);
     free (pimage);

trunk/Ohana/src/opihi/dvo/fitcolors.c

@@ -174 +174 @@
     // the selection criteria
   }
-  gprint (GP_ERR, "using %lld possible regions\n", (long long) skylist[0].Nregions);
+  gprint (GP_ERR, "using "OFF_T_FMT" possible regions\n",  skylist[0].Nregions);
 
   /* vectors to save data */

trunk/Ohana/src/opihi/dvo/fitsed.c

@@ -185 +185 @@
   /* loop over regions, extract data for each region */
   // XXX add interrupt checks
-  gprint (GP_ERR, "using %lld possible regions\n", (long long) skylist[0].Nregions);
+  gprint (GP_ERR, "using "OFF_T_FMT" possible regions\n",  skylist[0].Nregions);
   for (k = 0; k < skylist[0].Nregions; k++) {
     /* lock, load, unlock catalog */

trunk/Ohana/src/opihi/dvo/gstar.c

@@ -159 +159 @@
       k = N1[i];
       if (!QUIET) {
-        gprint (GP_LOG, "star: %lld\n", (long long) i);
+        gprint (GP_LOG, "star: "OFF_T_FMT"\n",  i);
         gprint (GP_LOG, "%11.7f ", catalog.average[k].R);
         gprint (GP_LOG, "%11.7f ", catalog.average[k].D);

trunk/Ohana/src/opihi/dvo/imrough.c

@@ -267 +267 @@
     
     /* load existing data from database */
-    gfits_scan (&header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
+    gfits_scan (&header, "NIMAGES", OFF_T_FMT, 1,  &Nimage);
     ALLOCATE (image, RegImage, Nimage);
     status = fread (image, sizeof(RegImage), Nimage, f);
@@ -273 +273 @@
     
     if (status != Nimage) {
-      gprint (GP_ERR, "ERROR: header and data in dB don't match (%lld vs %d)\n", (long long) Nimage, status);
+      gprint (GP_ERR, "ERROR: header and data in dB don't match ("OFF_T_FMT" vs %d)\n",  Nimage, status);
       gfits_free_header (&header);
       free (image);
@@ -304 +304 @@
   /* convert to internal format */
   image = (RegImage *) table.buffer;
-  gfits_scan (table.header, "NAXIS2", "%lld", 1, (long long *) &Nimage);
+  gfits_scan (table.header, "NAXIS2", OFF_T_FMT, 1,  &Nimage);
   gfits_convert_RegImage (image, sizeof (RegImage), Nimage);
 

trunk/Ohana/src/opihi/dvo/imsearch.c

@@ -106 +106 @@
 
   /* load existing data from database */
-  gfits_scan (&header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
+  gfits_scan (&header, "NIMAGES", OFF_T_FMT, 1,  &Nimage);
   ALLOCATE (pimage, RegImage, Nimage);
   status = fread (pimage, sizeof(RegImage), Nimage, f);
   fclose (f);
   if (status != Nimage) {
-    gprint (GP_ERR, "ERROR: header and data in dB don't match (%lld vs %lld)\n", (long long) Nimage, (long long) status);
+    gprint (GP_ERR, "ERROR: header and data in dB don't match ("OFF_T_FMT" vs "OFF_T_FMT")\n",  Nimage,  status);
     gfits_free_header (&header);
     free (pimage);
@@ -131 +131 @@
     obstime[strlen(obstime)-1] = 0;
 
-    gprint (GP_LOG, "%5lld %6s %6s %2d %2d   ", (long long) i, get_type_name(pimage[i].type), get_mode_name(pimage[i].mode), pimage[i].ccd, pimage[i].type);
+    gprint (GP_LOG, OFF_T_FMT" %6s %6s %2d %2d   ",  i, get_type_name(pimage[i].type), get_mode_name(pimage[i].mode), pimage[i].ccd, pimage[i].type);
     gprint (GP_LOG, "%s %s  ", pimage[i].pathname, pimage[i].filename);
     gprint (GP_LOG, "%s %s %f %s\n", pimage[i].filter, pimage[i].instrument, pimage[i].exptime, obstime);

trunk/Ohana/src/opihi/dvo/mextract.c

@@ -120 +120 @@
     catalog.Nsecfilt = Nsecfilt;
 
-    if (VERBOSE) gprint (GP_ERR, "trying %s (%lld of %lld)\n", catalog.filename, (long long) i, (long long) skylist[0].Nregions);
+    if (VERBOSE) gprint (GP_ERR, "trying %s ("OFF_T_FMT" of "OFF_T_FMT")\n", catalog.filename,  i,  skylist[0].Nregions);
       
     // an error exit status here is a significant error

trunk/Ohana/src/opihi/dvo/mmextract.c

@@ -186 +186 @@
     catalog.Nsecfilt = Nsecfilt;
 
-    if (VERBOSE) gprint (GP_ERR, "trying %s (%lld of %lld)\n", catalog.filename, (long long) i, (long long) skylist[0].Nregions);
+    if (VERBOSE) gprint (GP_ERR, "trying %s ("OFF_T_FMT" of "OFF_T_FMT")\n", catalog.filename,  i,  skylist[0].Nregions);
       
     // an error exit status here is a significant error

trunk/Ohana/src/opihi/pcontrol/StartHost.c

@@ -14 +14 @@
   if (VarConfig ("SHELL", "%s", shell)     == NULL) strcpy (shell, "pclient");
 
-#ifndef __APPLE__
-  if (VerboseMode()) gprint (GP_ERR, "starting host within thread %lld\n", (long long) pthread_self());
-#endif
+  if (VerboseMode()) gprint (GP_ERR, "starting host within thread\n");
+
   pid = rconnect (command, host[0].hostname, shell, stdio);
   if (!pid) {     

trunk/Ohana/src/opihi/pcontrol/StopHosts.c

@@ -128 +128 @@
   int i, result, waitstatus;
 
-#ifndef __APPLE__
-  if (VerboseMode()) gprint (GP_ERR, "harvesting within thread %lld\n", (long long) pthread_self());
-#endif
+  if (VerboseMode()) gprint (GP_ERR, "harvesting within thread\n");
   if (VerboseMode()) gprint (GP_ERR, "child process %d is down, wait for exit status\n", pid);