Changeset 30614

Timestamp:

Feb 13, 2011, 11:28:01 AM (15 years ago)

Author:

eugene

Message:

add += and -= to opihi; allow 0 length vectors; fix mem leak in some binary math operations; check and handle some error cases in command.c

Location:

trunk/Ohana/src/opihi

Files:

• doc/image-graph-overlay.txt (copied) (copied from branches/eam_branches/ipp-20101205/Ohana/src/opihi/doc/image-graph-overlay.txt )
• include/dvoshell.h (modified) (3 diffs)
• include/shell.h (modified) (1 diff)
• lib.shell/VectorOps.c (modified) (1 diff)
• lib.shell/command.c (modified) (5 diffs)
• lib.shell/expand_vars.c (modified) (1 diff)
• lib.shell/parse.c (modified) (10 diffs)
• lib.shell/stack_math.c (modified) (4 diffs)

trunk/Ohana/src/opihi/include/dvoshell.h

@@ -107 +107 @@
       MEAS_XCCD_ERR, 
       MEAS_YCCD_ERR, 
+      MEAS_POS_SYS_ERR, 
       MEAS_XMOSAIC, 
       MEAS_YMOSAIC, 
@@ -116 +117 @@
       MEAS_IMAGE_ID, 
       MEAS_PSF_QF, 
+      MEAS_PSF_QF_PERFECT, 
       MEAS_PSF_CHISQ, 
       MEAS_PSF_NDOF,
@@ -218 +220 @@
       IMAGE_Y_UL_FP,
       IMAGE_Y_UR_FP,
+      IMAGE_X_ERR_SYS,
+      IMAGE_Y_ERR_SYS,
+      IMAGE_MAG_ERR_SYS,
+      IMAGE_NFIT_PHOTOM,
+      IMAGE_NFIT_ASTROM,
+      IMAGE_NLINK_PHOTOM,
+      IMAGE_NLINK_ASTROM
 };
 

trunk/Ohana/src/opihi/include/shell.h

@@ -76 +76 @@
 char         *expand_vars               PROTO((char *line));
 char         *expand_vectors            PROTO((char *line));
-char         *parse                     PROTO((char *line));
+char         *parse                     PROTO((int *status, char *line));
 char        **parse_commands            PROTO((char *, int *));
 void          welcome                   PROTO((void));

trunk/Ohana/src/opihi/lib.shell/VectorOps.c

@@ -178 +178 @@
   vec[0].Nelements = Nelements;
   if (type == OPIHI_FLT) {
-    REALLOCATE (vec[0].elements.Flt, opihi_flt, Nelements);
+    REALLOCATE (vec[0].elements.Flt, opihi_flt, MAX(1, Nelements));
     vec[0].type = OPIHI_FLT;
   } else {
-    REALLOCATE (vec[0].elements.Int, opihi_int, Nelements);
+    REALLOCATE (vec[0].elements.Int, opihi_int, MAX(1, Nelements));
     vec[0].type = OPIHI_INT;
   }

trunk/Ohana/src/opihi/lib.shell/command.c

@@ -10 +10 @@
   Command *cmd;
 
-  // rawline = NULL;
-  rawline = strcreate (line);
+  // the input line is never NULL
+  if (!line) { fprintf (stderr, "programming error\n"); abort(); }
+
+  rawline = strcreate (line);  // used for error messages which should echo the unparsed line
 
   /* force a space between ! and first word: !ls becomes ! ls */
@@ -22 +24 @@
   /* expand anything of the form $fred or $fred$sam, etc */ 
   line = expand_vars (line);     /* line is freed here, new one allocated */
+  if (!line) goto escape;
+
   /* expand anything of the form fred[N] */ 
   line = expand_vectors (line);  /* line is freed here, new one allocated */
+  if (!line) goto escape;
 
   // print the line with the variables and vectors expanded, but before evaluating 
@@ -29 +34 @@
   if (VERBOSE_SHELL == OPIHI_VERBOSE_ON) gprint (GP_ERR, "opihi: %s\n", line);
 
-  /* solve math expresions, assign variable, if needed */
-  line = parse (line);        /* line is freed here, new one allocated */
-  /* any entry in line of the form {foo} returns value or tmp vector / buffer */
+  /* solve math expresions, assign variable, if needed.  any entry in line of the form {foo}
+   * returns value or tmp vector / buffer */
+  line = parse (&status, line);        /* line is freed here, new one allocated */
+  if (!status) goto escape;
 
   /* we may have reallocated line, return new pointer */
@@ -39 +45 @@
   if (argc == 0) {
       FREE (rawline);
+      set_int_variable ("STATUS", TRUE);
       return (TRUE);  /* empty command or assignment */
   }
@@ -74 +81 @@
   FREE (rawline);
   return (status);
+
+ escape:
+  set_int_variable ("STATUS", FALSE);
+
+  # if (DEBUG) 
+  gprint (GP_ERR, "command: %s, status: %d\n", line, FALSE);
+  # endif
+
+  FREE (rawline);
+
+  if (VERBOSE_SHELL != OPIHI_VERBOSE_OFF) gprint (GP_ERR, "error on line: %s\n", rawline);
+
+  // return the current value of line, in case it was modified
+  *outline = line;
+  return FALSE;
 }
 

trunk/Ohana/src/opihi/lib.shell/expand_vars.c

@@ -64 +64 @@
     /* variable assignment (skip these variables) */
     if ((L == line) && (V1 != NULL)) {
-      if ((*V1 == '=') || !strcmp (V1, "++") || !strcmp (V1, "--")) {
+      int isAssignment;
+
+      isAssignment = FALSE;
+      isAssignment |= (V1[0] == '=');
+      isAssignment |= (V1[0] == '+') && (V1[1] == '=');
+      isAssignment |= (V1[0] == '-') && (V1[1] == '=');
+      isAssignment |= (V1[0] == '+') && (V1[1] == '+');
+      isAssignment |= (V1[0] == '-') && (V1[1] == '-');
+
+      if (isAssignment) {
         *N = *L;
         free (V0);

trunk/Ohana/src/opihi/lib.shell/parse.c

@@ -1 +1 @@
 # include "opihi.h"
 
-char *parse (char *line) {
+char *parse (int *status, char *line) {
 
   double fval;
   float *fptr;
   char *newline, *N, *L, *val, *B, *V, *V0, *V1, *c1, *c2, *p;
-  int Nx, Ny, Nbytes, status, size, NLINE, isBuffer, inRange;
+  int Nx, Ny, Nbytes, filestatus, size, NLINE, isBuffer, inRange;
   FILE *f;
   Vector *vec;
   Buffer *buf;
+
+  *status = TRUE; 
 
   Ny = 0;
@@ -49 +51 @@
     }
 
+    if (!strncmp (V1, "+=", 2)) {
+        V1 ++;
+        if (*V1 == 0) goto error;
+        V1 ++;
+        if (*V1 == 0) goto error;
+
+        val = get_variable (V0);
+        if (val == NULL) {
+            fval = 0.0;
+        } else {
+            fval = atof (val);
+        }
+
+        /* dvomath returns a new string, or NULL, with the result of the expression */
+        val = dvomath (1, &V1, &size, 0);
+        if (val == NULL) goto error;
+        fval += atof(val);
+        // save the result
+        set_variable (V0, fval);
+        goto escape;
+    }
+
+    if (!strncmp (V1, "-=", 2)) {
+        V1 ++;
+        if (*V1 == 0) goto error;
+        V1 ++;
+        if (*V1 == 0) goto error;
+
+        val = get_variable (V0);
+        if (val == NULL) {
+            fval = 0.0;
+        } else {
+            fval = atof (val);
+        }
+
+        /* dvomath returns a new string, or NULL, with the result of the expression */
+        val = dvomath (1, &V1, &size, 0);
+        if (val == NULL) goto error;
+        fval -= atof(val);
+        // save the result
+        set_variable (V0, fval);
+        goto escape;
+    }
+
     /* not an assignement, syntax error */
     if (*V1 != '=') goto error;
@@ -73 +119 @@
       Nbytes = fread (val, 1, 1023, f);
       val[Nbytes] = 0;
-      status = pclose (f);
+      filestatus = pclose (f);
       free (B);
 
-      if (status) gprint (GP_ERR, "warning: exit status of command %d\n", status);
+      if (filestatus) gprint (GP_ERR, "warning: exit status of command %d\n", filestatus);
 
       /* convert all but last return to ' '.  drop last return */
@@ -88 +134 @@
         }
       }
+      // save the resulting value
+      set_str_variable (V0, val);
+      goto escape;  /* frees temp variables */
+    }
+
+    /* simple variable assignment */
+    /* dvomath returns a new string, or NULL, with the result of the expression */
+    val = dvomath (1, &V1, &size, 0);
+    if (val == NULL) { 
+      while (OHANA_WHITESPACE (*V1)) V1++;
+      val = strcreate (V1);
     } 
-
-    /* simple variable assignment */
-    if (*V1 != '`') {
-      /* dvomath returns a new string, or NULL, with the result of the expression */
-      val = dvomath (1, &V1, &size, 0);
-      if (val == NULL) { 
-        while (OHANA_WHITESPACE (*V1)) V1++;
-        val = strcreate (V1);
-      } 
-    }
-    /* both dvomath and command replacement create (char *) val */
+    // save the result
     set_str_variable (V0, val);
     goto escape;  /* frees temp variables */
@@ -172 +219 @@
       if (!inRange) {
         gprint (GP_ERR, "no element %d,%d\n", Nx, Ny);
-        goto escape;
+        goto error;
       }
       if (Nx < 0) Nx += buf[0].header.Naxis[0];
@@ -188 +235 @@
       if (!inRange) {
         gprint (GP_ERR, "no element %d\n", Nx);
-        goto escape;
+        goto error;
       }
       if (Nx < 0) Nx += vec[0].Nelements;
@@ -197 +244 @@
       }
     }
-
     goto escape;
   }
@@ -226 +272 @@
     if (c1 == NULL) {
       gprint (GP_ERR, "no close brackets!\n");
-      goto escape;
+      goto error;
     }
     c2 = strchr (L, '{');
     if ((c2 != NULL) && (c2 < c1)) {
       gprint (GP_ERR, "can't nest brackets!\n");
-      goto escape;
+      goto error;
     }
     *c1 = 0;
@@ -240 +286 @@
     if (val == NULL) {
       print_error ();
-      goto escape;
+      goto error;
     } 
 
@@ -257 +303 @@
   
   REALLOCATE (newline, char, strlen (newline) + 1);
+  *status = TRUE;
   return (newline); 
 
 error:
   gprint (GP_ERR, "syntax error\n");
-
-escape:
+  // assignment or increment operation: free line and return NULL
   if (line != (char *) NULL) free (line);
   if (val != (char *) NULL) free (val);
   if (V0 != (char *) NULL) free (V0);
+  *status = FALSE;
+  return NULL;
+
+escape:
+  // assignment or increment operation: free line and return NULL
+  if (line != (char *) NULL) free (line);
+  if (val != (char *) NULL) free (val);
+  if (V0 != (char *) NULL) free (V0);
+  *status = TRUE;
   return (NULL);
 }

trunk/Ohana/src/opihi/lib.shell/stack_math.c

@@ -972 +972 @@
         *out = OP;                                              \
       }                                                         \
-      clear_stack (V1);                                         \
-      return (TRUE);                                            \
+      goto escape;                                              \
     }                                                           \
     if ((V1->vector->type == OPIHI_INT) && (FTYPE == 'S')) {    \
@@ -982 +981 @@
         *out = OP;                                              \
       }                                                         \
-      clear_stack (V1);                                         \
-      return (TRUE);                                            \
+      goto escape;                                              \
     }                                                           \
     if ((V1->vector->type == OPIHI_INT) && (FTYPE == 's')) {    \
@@ -992 +990 @@
         *out = OP;                                              \
       }                                                         \
-      clear_stack (V1);                                         \
-      return (TRUE);                                            \
+      goto escape;                                              \
     } }                                                 
 
@@ -1035 +1032 @@
 # undef V_FUNC
 
+escape:
+
   if (V1[0].type == 'v') {
     free (V1[0].vector[0].elements.Ptr);