Changeset 16242 for trunk/ippTools/src

Timestamp:

Jan 25, 2008, 2:41:18 PM (18 years ago)

Author:

jhoblitt

Message:

add pxwarpQueueByCamID()
modify camtool so that it can auto-start warp runs

Location:

trunk/ippTools/src

Files:

• Makefile.am (modified) (2 diffs)
• camtool.c (modified) (4 diffs)
• pxwarp.c (added)
• pxwarp.h (added)
• warptool.c (modified) (5 diffs)

trunk/ippTools/src/Makefile.am

@@ -31 +31 @@
         pxtools.h \
         pxtoolsErrorCodes.h \
-        pxtree.h 
+        pxtree.h \
+        pxwarp.h
 
 noinst_HEADERS = \
@@ -56 +57 @@
 libpxtools_la_LDFLAGS   = -release $(PACKAGE_VERSION)
 libpxtools_la_SOURCES   = \
+        pxcam.c \
+        pxchip.c \
+        pxconfig.c \
+        pxdata.c \
+        pxerrors.c \
+        pxfault.c \
+        pxio.c \
+        pxregister.c \
+        pxtables.c \
+        pxtag.c \
         pxtoolsErrorCodes.c \
-        pxerrors.c \
-        pxconfig.c \
-        pxfault.c \
-        pxtables.c \
-        pxdata.c \
-        pxio.c \
-        pxtag.c \
-        pxregister.c \
-        pxchip.c \
         pxtree.c \
-        pxcam.c
+        pxwarp.c
 
 # for pxtools.h

trunk/ippTools/src/camtool.c

@@ -27 +27 @@
 
 #include "pxtools.h"
+#include "pxwarp.h"
 #include "camtool.h"
 
@@ -485 +486 @@
         code
     );
-    psFree(pendingRow);
 
     if (!camProcessedExpInsertObject(config->dbh, row)) {
@@ -494 +494 @@
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(row);
+        psFree(pendingRow);
         return false;
     }
@@ -501 +502 @@
         psError(PS_ERR_UNKNOWN, false, "failed to change camRun.state for cam_id: %" PRId64, row->cam_id);
         psFree(row);
-        return false;
-    }
-
+        psFree(pendingRow);
+        return false;
+    }
+
+    // should we stop here or proceed on to the warp stage?
+    // NULL for end_stage means go as far as possible
+    // we can't start a warp run unlesss tess_id is defined
+    if ((pendingRow->end_stage && psStrcasestr(pendingRow->end_stage, "cam"))
+        || pendingRow->tess_id == NULL) {
+        psFree(row);
+        psFree(pendingRow);
+        if (!psDBCommit(config->dbh)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+            return false;
+        }
+
+        return true;
+    }
     psFree(row);
+    // else continue on...
+
+    if (!pxwarpQueueByCamID(config,
+            pendingRow->cam_id,
+            pendingRow->workdir,
+            pendingRow->dvodb,
+            pendingRow->tess_id,
+            pendingRow->end_stage
+    )) {
+        // rollback
+        if (!psDBRollback(config->dbh)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+        }
+        psError(PS_ERR_UNKNOWN, false, "failed to queue new warpRun");
+        psFree(pendingRow);
+        return false;
+    }
+    psFree(pendingRow);
 
     if (!psDBCommit(config->dbh)) {

trunk/ippTools/src/warptool.c

@@ -30 +30 @@
 #include "pxtools.h"
 #include "warptool.h"
+#include "pxwarp.h"
 
 static psS64 definerunMode(pxConfig *config);
@@ -46 +47 @@
 
 static bool parseAndInsertSkyCellMap(pxConfig *config, const char *mapfile);
-static bool setwarpRunState(pxConfig *config, psS64 warp_id, const char *state);
 static bool isValidMode(pxConfig *config, const char *mode);
 bool warpCompletedRuns(pxConfig *config);
@@ -200 +200 @@
         return false;
     }
-    if (!setwarpRunState(config, warp_id, "run")) {
+    if (!pxwarpRunSetState(config, warp_id, "run")) {
         // rollback
         if (!psDBRollback(config->dbh)) {
@@ -227 +227 @@
     if (state) {
         // set detRun.state to state
-        return setwarpRunState(config, (psS64)atoll(warp_id), state);
+        return pxwarpRunSetState(config, (psS64)atoll(warp_id), state);
     }
 
@@ -999 +999 @@
 
 
-static bool setwarpRunState(pxConfig *config, psS64 warp_id, const char *state)
-{
-    PS_ASSERT_PTR_NON_NULL(state, false);
-
-    // check that state is a valid string value
-    if (!(
-            (strncmp(state, "run", 4) == 0)
-            || (strncmp(state, "stop", 5) == 0)
-            || (strncmp(state, "reg", 4) == 0)
-        )
-    ) {
-        psError(PS_ERR_UNKNOWN, false,
-                "invalid warpRun state: %s", state);
-        return false;
-    }
-
-    char *query = "UPDATE warpRun SET state = '%s' WHERE warp_id = %" PRId64;
-    if (!p_psDBRunQuery(config->dbh, query, state, warp_id)) {
-        psError(PS_ERR_UNKNOWN, false,
-                "failed to change state for warp_id %" PRId64, warp_id);
-        return false;
-    }
-
-    return true;
-}
-
-
 static bool isValidMode(pxConfig *config, const char *mode)
 {