Changeset 32341

Timestamp:

Sep 6, 2011, 11:03:30 AM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20110710/Ohana/src

Files:

• opihi/pantasks/TaskOps.c (modified) (1 diff)
• opihi/pantasks/ipptool2book.c (modified) (9 diffs)
• tools/src/roc.c (modified) (5 diffs)

branches/eam_branches/ipp-20110710/Ohana/src/opihi/pantasks/TaskOps.c

@@ -471 +471 @@
   NewTask[0].Nfailure = 0;
   NewTask[0].Ntimeout = 0;
+  NewTask[0].Nskipexec = 0;
 
   /* jobs timing statistics */

branches/eam_branches/ipp-20110710/Ohana/src/opihi/pantasks/ipptool2book.c

@@ -69 +69 @@
     gprint (GP_ERR, "USAGE: ipptool2book (queue) (book) [-uniq] [-key key[:key..]]\n");
     FREEKEYS;
-    return (FALSE);
+    return (TRUE);
   }
 
@@ -76 +76 @@
     gprint (GP_ERR, "queue %s not found\n", argv[1]);
     FREEKEYS;
-    return (FALSE);
+    return (TRUE);
   }
     
@@ -108 +108 @@
     free (line);
     FREEKEYS;
-    return FALSE;
+    return (TRUE);
   }
   free (line);
@@ -120 +120 @@
         gprint (GP_ERR, "ERROR: unterminated metadata\n");
         FREEKEYS;
-        return (FALSE);
+        return (TRUE);
       }
       FREEKEYS;
@@ -145 +145 @@
         free (bookName);
         FREEKEYS;
-        return (FALSE);
+        return (TRUE);
       }
       free (tmpword);
@@ -155 +155 @@
         free (bookName);
         FREEKEYS;
-        return FALSE;
+        return TRUE;
       }
       onPage = TRUE;
@@ -179 +179 @@
             gprint (GP_ERR, "ERROR: missing key %s for ID\n", keys[i]);
             FREEKEYS;
-            return (FALSE);
+            return (TRUE);
           }
           if (i > 0) strcat (pagename, ":");
@@ -221 +221 @@
       free (bookName);
       FREEKEYS;
-      return (FALSE);
+      return (TRUE);
     }
     BookSetWord (page, tmpword, tmpvalue);
@@ -229 +229 @@
   }    
   FREEKEYS;
-  return (FALSE);
+  return (TRUE);
 }
 

branches/eam_branches/ipp-20110710/Ohana/src/tools/src/roc.c

@@ -4 +4 @@
 # include <regex.h>
 
-# define myAssert(LOGIC,...) { if (!(LOGIC)) { fprintf (stderr, __VA_ARGS__); abort(); } }
+# define myAssert(LOGIC,...) { if (!(LOGIC)) { fprintf (stderr, __VA_ARGS__); exit(4); } }
 
 # define ROC_HEADER_SIZE  0x1000
@@ -198 +198 @@
 
   target = fopen(targetName, "r");
-  myAssert (target, "failed to open output");
+  myAssert (target, "failed to open rocfile");
   
   ALLOCATE (line, char, 1024);
@@ -368 +368 @@
   for (i = 0; i < Ninput; i++) {
     input[i] = fopen(inputName[i], "r");
-    myAssert (input[i], "failed to open file %s in %s\n",inputName[i],targetName);
+    myAssert (input[i], "failed to open input: %d data file: %s in %s\n",i,inputName[i],targetName);
   }
 
@@ -381 +381 @@
       Nread = MIN (ROC_BLOCKSIZE, sizes[i] - bytes_read[i]);
       Nbytes = fread (inputData[i], 1, Nread, input[i]);
-      myAssert (Nbytes == Nread, "failed to read data file: %s read: %d expect: %d prev_read: %d block: %d in %s\n",inputName[i],Nbytes,Nread,(int) bytes_read[i],n,targetName);
+      myAssert (Nbytes == Nread, "failed to read input: %d data file: %s read: %d expect: %d prev_read: %d block: %d in %s\n",i,inputName[i],Nbytes,Nread,(int) bytes_read[i],n,targetName);
       if (Nread < ROC_BLOCKSIZE) {
         // if we have reached the end of the file, fill in the rest with NULLs
@@ -442 +442 @@
   fprintf (stderr, "USAGE: roc [mode]\n");
   fprintf (stderr, " -create (target) (input) (input) (input) ... [options]\n");
-  fprintf (stderr, " -repair (target) (file #) (output\n");
+  fprintf (stderr, " -repair (target) (file #) (output)\n");
   fprintf (stderr, " -validate (target)\n");
   fprintf (stderr, " -insert (target) (input)\n");