Changeset 986 for trunk/optimizer/src/rp_optimizer_tcl.c

Timestamp:

Apr 2, 2008, 2:32:58 PM (16 years ago)

Author:

gah

Message:

added global pgapack_abort flag to plugin and abort operation to optimizer

File:

• trunk/optimizer/src/rp_optimizer_tcl.c (modified) (6 diffs)

trunk/optimizer/src/rp_optimizer_tcl.c

@@ -15 +15 @@
  */
 #include "rp_optimizer.h"
+
+extern int pgapack_abort;
 
 /*
@@ -67 +69 @@
 __declspec( dllexport )
 #endif
+
+extern int pgapack_abort;
 
 int
@@ -362 +366 @@
             return TCL_ERROR;
         }
-    }
-
-    /*
-     * OPTION:  get ?globPattern? ?-option?
-     */
-    else if (*option == 'g' && strcmp(option,"get") == 0) {
+    } else if (*option == 'a' && strcmp(option,"abort") == 0) {
+        int value;
+
+        if (objc < 3) {
+            Tcl_WrongNumArgs(interp, 1, objv, "abort bool");
+            return TCL_ERROR;
+        }
+        if (Tcl_GetBooleanFromObj(interp, objv[2], &value) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        pgapack_abort = value;
+        return TCL_OK;
+    } else if (*option == 'g' && strcmp(option,"get") == 0) {
+        /*
+         * OPTION:  get ?globPattern? ?-option?
+         */
         if (objc > 2) {
             path = Tcl_GetStringFromObj(objv[2], (int*)NULL);
@@ -623 +637 @@
             RpOptimizerPerformInTcl, fitnessExpr);
 
+        fprintf(stderr, ">>>status=%d\n", status);
+
         Tcl_DecrRefCount(toolPtr);
         if (updateCmdPtr) {
@@ -637 +653 @@
             break;
         case RP_OPTIM_ABORTED:
+            fprintf(stderr, "Got abort status=%d\n", status);
             Tcl_SetResult(interp, "aborted", TCL_STATIC);
             break;
@@ -824 +841 @@
         status = Tcl_GlobalEval(toolDataPtr->interp,
             Tcl_DStringValue(&buffer));
-
         if (status == TCL_ERROR) {
             Tcl_BackgroundError(toolDataPtr->interp);
-        }
-        else if (status == TCL_BREAK || status == TCL_RETURN) {
-            result = RP_OPTIM_ABORTED;
-        }
+        } 
         Tcl_DStringFree(&buffer);
     }