Changeset 34120

Timestamp:

Jul 5, 2012, 9:12:47 AM (14 years ago)

Author:

eugene

Message:

write out list of files with problems; add option to report missing files

Location:

branches/eam_branches/ipp-20120627/Ohana/src/dvomerge

Files:

• include/dvoverify.h (modified) (2 diffs)
• src/dvoverify.c (modified) (1 diff)
• src/dvoverify_args.c (modified) (4 diffs)
• src/dvoverify_catalogs.c (modified) (7 diffs)
• src/dvoverify_client.c (modified) (1 diff)
• src/dvoverify_utils.c (modified) (2 diffs)

branches/eam_branches/ipp-20120627/Ohana/src/dvomerge/include/dvoverify.h

@@ -34 +34 @@
 int    NNotSorted;
 int    CHECK_TOPLEVEL;
+int    LIST_MISSING;
 
 SkyRegion UserPatch;
@@ -48 +49 @@
 int CheckCatalogIndexes (char *filename,  SkyRegion *region);
 
+void InitFailures ();
+void AddFailures (char *filename);
+char **GetFailures (int *N);

branches/eam_branches/ipp-20120627/Ohana/src/dvomerge/src/dvoverify.c

@@ -50 +50 @@
   dvoverify_catalogs (skylist, &Nbad);
 
+  int i, Nfailures;
+  char **failures = GetFailures (&Nfailures);
+
+  fprintf (stderr, "---- files with errors ---- \n");
+  for (i = 0; i < Nfailures; i++) {
+    fprintf (stderr, "%s\n", failures[i]);
+  }
+
   if (Nbad > 0) {
     fprintf (stderr, "ERROR: %d files are bad\n", Nbad);

branches/eam_branches/ipp-20120627/Ohana/src/dvomerge/src/dvoverify_args.c

@@ -5 +5 @@
   int N;
 
-  VERBOSE = FALSE;
-  CHECKSORTED = FALSE;
   NNotSorted = 0;
 
+  VERBOSE = FALSE;
   if ((N = get_argument (*argc, argv, "-v"))) {
     VERBOSE = TRUE;
@@ -17 +16 @@
     remove_argument (N, argc, argv);
   }
+
+  CHECKSORTED = FALSE;
   if ((N = get_argument (*argc, argv, "-s"))) {
     CHECKSORTED = TRUE;
@@ -23 +24 @@
   if ((N = get_argument (*argc, argv, "-sorted"))) {
     CHECKSORTED = TRUE;
+    remove_argument (N, argc, argv);
+  }
+
+  LIST_MISSING = FALSE;
+  if ((N = get_argument (*argc, argv, "-list-missing"))) {
+    LIST_MISSING = TRUE;
     remove_argument (N, argc, argv);
   }
@@ -126 +133 @@
   }
 
+  LIST_MISSING = FALSE;
+  if ((N = get_argument (*argc, argv, "-list-missing"))) {
+    LIST_MISSING = TRUE;
+    remove_argument (N, argc, argv);
+  }
+
   // restrict to a portion of the sky
   UserPatch.Rmin = 0;

branches/eam_branches/ipp-20120627/Ohana/src/dvomerge/src/dvoverify_catalogs.c

@@ -5 +5 @@
   int i;
   char filename[DVO_MAX_PATH];
+
+  InitFailures ();
 
   if (PARALLEL && !HOST_ID) {
@@ -29 +31 @@
       Nbad ++;
       skipIndexCheck = TRUE;
+      AddFailures (filename);
     }
 
@@ -34 +37 @@
     if (!VerifyTableFile (filename)) {
       Nbad ++;
+      AddFailures (filename);
     }
 
@@ -40 +44 @@
       Nbad ++;
       skipIndexCheck = TRUE;
+      AddFailures (filename);
     }
 
@@ -46 +51 @@
       if (!CheckCatalogIndexes(filename, skylist[0].regions[i])){
         Nbad ++;
+        AddFailures (filename);
       }
     }
@@ -94 +100 @@
 
     char tmpline[DVO_MAX_PATH];
-    if (VERBOSE)     { snprintf (tmpline, DVO_MAX_PATH, "%s -v", command); strcpy (command, tmpline); }
-    if (CHECKSORTED) { snprintf (tmpline, DVO_MAX_PATH, "%s -s", command); strcpy (command, tmpline); }
+    if (VERBOSE)      { snprintf (tmpline, DVO_MAX_PATH, "%s -v", command); strcpy (command, tmpline); }
+    if (CHECKSORTED)  { snprintf (tmpline, DVO_MAX_PATH, "%s -s", command); strcpy (command, tmpline); }
+    if (LIST_MISSING) { snprintf (tmpline, DVO_MAX_PATH, "%s -list-missing", command); strcpy (command, tmpline); }
 
     fprintf (stderr, "command: %s\n", command);
@@ -131 +138 @@
   for (i = 0; i < table->Nhosts; i++) {
     FILE *results = fopen (table->hosts[i].results, "r");
-    myAssert (results, "cannot read result?");
+    if (!results) {
+      fprintf (stderr, "cannot read results for %d: %s\n", i, table->hosts[i].results);
+      continue;
+    }
     fscanf (results, "%*s %d %*s %d", &NbadHost, &NNotSortedHost);
     *Nbad += NbadHost;

branches/eam_branches/ipp-20120627/Ohana/src/dvomerge/src/dvoverify_client.c

@@ -21 +21 @@
   dvoverify_catalogs (skylist, &Nbad);
 
+  // write result to file
   FILE *results = fopen (RESULTS, "w");
   fprintf (results, "Nbad: %d NNotSorted: %d\n", Nbad, NNotSorted);
+
+  int i, Nfailures;
+  char **failures = GetFailures (&Nfailures);
+  fprintf (results, "---- files with errors ---- \n");
+  for (i = 0; i < Nfailures; i++) {
+    fprintf (results, "%s\n", failures[i]);
+  }
   fclose (results);
-
-  // write result to file
 
   if (Nbad > 0) {

branches/eam_branches/ipp-20120627/Ohana/src/dvomerge/src/dvoverify_utils.c

@@ -1 +1 @@
 # include "dvoverify.h"
+
+static int Nfailures = 0;
+static int NFAILURES = 100;
+static char **failures = NULL;
+
+void InitFailures () {
+  ALLOCATE (failures, char *, NFAILURES);
+}
+
+void AddFailures (char *filename) {
+  failures[Nfailures] = strcreate (filename);
+  Nfailures ++;
+  CHECK_REALLOCATE (failures, char *, NFAILURES, Nfailures, 100);
+}
+
+char **GetFailures (int *N) {
+  *N = Nfailures;
+  return failures;
+}
 
 int dvoverify_single (char *filename) {
@@ -46 +65 @@
       case ENOENT:
         if (DEBUG) fprintf (stderr, "file does not exist, skipping %s\n", filename);
+        if (LIST_MISSING) return FALSE;
         return TRUE;
       case ENOMEM: