Changeset 40424 for trunk/Ohana/src/opihi/pantasks

Timestamp:

May 15, 2018, 8:56:30 AM (8 years ago)

Author:

eugene

Message:

change rule for JobID: continuously increment (abort at 2^{31); use IDtype}

Location:

trunk/Ohana/src/opihi/pantasks

Files:

• CheckController.c (modified) (1 diff)
• JobIDOps.c (modified) (1 diff)
• JobOps.c (modified) (5 diffs)
• delete.c (modified) (1 diff)
• kill.c (modified) (2 diffs)

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

@@ -7 +7 @@
 
   char *p, *q;
-  int i, Njobs, status, JobID;
+  int i, Njobs, status;
+  IDtype JobID;
   Job *job;
   IOBuffer buffer;

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

@@ -1 +1 @@
 # include "pantasks.h"
 
-# define MAX_N_JOBS 50000
-static char *JobIDList;
-static int   JobIDPtr;
+# define MAX_N_JOBS 0x80000000
+
+static IDtype JobIDMax = 0;
 
 void InitJobIDs () {
-
-  JobIDPtr = 0;
-  ALLOCATE (JobIDList, char, MAX_N_JOBS);
-  bzero (JobIDList, MAX_N_JOBS*sizeof(char));
+  JobIDMax = 0;
 }  
 
-void FreeJobIDs () {
-  free (JobIDList);
+void FreeJobIDs () { }
+
+/* return next unique ID, recycle every MAX_N_JOBS */
+IDtype NextJobID () {
+
+  JobIDMax ++;
+  if (JobIDMax >= MAX_N_JOBS) {
+    gprint (GP_ERR, "ERROR: too many jobs spawned: %d, aborting\n", JobIDMax);
+    abort();
+  }
+
+  return (JobIDMax);
 }
 
-/* return next unique ID, recycle every MAX_N_JOBS */
-int NextJobID () {
-
-  int Ntry;
-
-  JobIDPtr ++;
-  if (JobIDPtr >= MAX_N_JOBS) JobIDPtr = 0;
-
-  Ntry = 0;
-  while (JobIDList[JobIDPtr]) {
-    Ntry ++;
-    JobIDPtr ++;
-    if (JobIDPtr >= MAX_N_JOBS) JobIDPtr = 0;
-    if (Ntry == MAX_N_JOBS) return (-1);
-  }
-  JobIDList[JobIDPtr] = TRUE;
-  return (JobIDPtr);
-}
-
-int FreeJobID (int JobID) {
-
-  if (JobID < 0) return (FALSE);
-  if (JobID >= MAX_N_JOBS) return (FALSE);
-
-  JobIDList[JobID] = FALSE;
-  return (TRUE);
-}
+/* I am going to rework the jobID so that it just grows.  no need to ever free them
+   as an int, that allows 2^31 jobs (2e9 jobs) */

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

@@ -41 +41 @@
 
 /* return job with given ID */
-Job *FindJob (int JobID) {
+Job *FindJob (IDtype JobID) {
 
   int i;
@@ -55 +55 @@
 
 /* return job with given controller Job ID */
-Job *FindControllerJob (int JobID) {
+Job *FindControllerJob (IDtype JobID) {
 
   int i;
@@ -82 +82 @@
   gprint (GP_LOG, " Jobs in Pantasks Queue\n");
   for (i = 0; i < Njobs; i++) {
-    gprint (GP_LOG, " %4d  %6d: %-25s %10s %20s\n", Njobs, jobs[i][0].JobID, jobs[i][0].task[0].name, JobStateToString(jobs[i][0].state), jobs[i][0].argv[0]);
+    gprint (GP_LOG, " %4d  %8d: %-25s %10s %20s\n", Njobs, jobs[i][0].JobID, jobs[i][0].task[0].name, JobStateToString(jobs[i][0].state), jobs[i][0].argv[0]);
   }
 
@@ -97 +97 @@
 
   job[0].JobID = NextJobID ();
+
+  // this should not happen; abort?
   if (job[0].JobID < 0) {
     free (job);
@@ -165 +167 @@
   if (job == NULL) return;
   
-  FreeJobID (job[0].JobID);
-
   for (i = 0; i < job[0].argc; i++) {
     free (job[0].argv[i]);

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

@@ -4 +4 @@
 
   Job *job;
-  int JobID;
+  IDtype JobID;
 
   if (argc != 3) goto usage;

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

@@ -4 +4 @@
 
   Job *job;
-  int JobID;
+  IDtype JobID;
 
   if (argc < 2) {
@@ -10 +10 @@
     return (FALSE);
   }
-  JobID = atoi (argv[1]);
+  JobID = atoll (argv[1]);
 
   JobTaskLock();