Changeset 11324

Timestamp:

Jan 26, 2007, 1:40:50 PM (19 years ago)

Author:

eugene

Message:

fixed task npending

Location:

trunk/Ohana/src/opihi

Files:

• cmd.data/book_commands.c (modified) (2 diffs)
• pantasks/CheckTasks.c (modified) (2 diffs)
• pantasks/TaskOps.c (modified) (1 diff)

trunk/Ohana/src/opihi/cmd.data/book_commands.c

@@ -363 +363 @@
   }
 
+  Optional = FALSE;
+  if ((N = get_argument (argc, argv, "-optional"))) {
+    remove_argument (N, &argc, argv);
+    Optional = TRUE;
+  }
+
   if (argc != 4) {
     gprint (GP_ERR, "USAGE: book newword (book) (page) (word)\n");
@@ -385 +391 @@
   value = BookGetWord (page, argv[3]);
   if (value == NULL) {
+    if (Optional) {
+      FREE (varName);
+      return TRUE;
+    }
     gprint (GP_ERR, "value %s on page %s in book %s not found\n", argv[3], argv[2], argv[1]);
     FREE (varName);

trunk/Ohana/src/opihi/pantasks/CheckTasks.c

@@ -25 +25 @@
     }
     if (task[0].NpendingMax && (task[0].Npending >= task[0].NpendingMax)) {
-        gettimeofday (&task[0].last, (void *) NULL);
-        continue;
-    }
-
-    /* check if there are errors with this task */
-    if (!ValidateTask (task, TRUE)) { 
+        fprintf (stderr, "npending: %d, max npending: %d\n", task[0].Npending, task[0].NpendingMax);
         gettimeofday (&task[0].last, (void *) NULL);
         continue;
@@ -42 +37 @@
           continue;
       }
+    }
+
+    /* check if there are errors with this task */
+    if (!ValidateTask (task, TRUE)) { 
+        gettimeofday (&task[0].last, (void *) NULL);
+        continue;
     }
 

trunk/Ohana/src/opihi/pantasks/TaskOps.c

@@ -400 +400 @@
 
   NewTask[0].NpendingMax = 0;  /* default value means 'no limit' */
+  NewTask[0].Npending = 0;  /* default value means 'no limit' */
 
   NewTask[0].Njobs = 0;