job-list: struct job cleanup

Problem: As time has gone on, the fields in 'struct job' have
become a bit disorganized.

Solution: Re-arrange fields so all 'job data' fields are grouped
together, caches of information in grouped together, and comments
are clearer.

As a side effective, anal retentively update job_create() and
job_destroy() to init / cleanup fields in similar organized
order.

Author: chu11

src/modules/job-list/job_state.c

@@ -118,14 +118,14 @@ static void job_destroy (void *data)
 {
     struct job *job = data;
     if (job) {
-        json_decref (job->exception_context);
+        free (job->ranks);
+        free (job->nodelist);
         json_decref (job->annotations);
+        grudgeset_destroy (job->dependencies);
         json_decref (job->jobspec_job);
         json_decref (job->jobspec_cmd);
         json_decref (job->R);
-        grudgeset_destroy (job->dependencies);
-        free (job->ranks);
-        free (job->nodelist);
+        json_decref (job->exception_context);
         zlist_destroy (&job->next_states);
         free (job);
     }
@@ -145,18 +145,17 @@ static struct job *job_create (struct list_ctx *ctx, flux_jobid_t id)
         return NULL;
     job->ctx = ctx;
     job->id = id;
-    job->state = FLUX_JOB_STATE_NEW;
     job->userid = FLUX_USERID_UNKNOWN;
-    job->ntasks = -1;
-    job->nnodes = -1;
     job->urgency = -1;
-    job->expiration = -1.0;
-    job->wait_status = -1;
     /* pending jobs that are not yet assigned a priority shall be
      * listed after those who do, so we set the job priority to MIN */
     job->priority = FLUX_JOB_PRIORITY_MIN;
+    job->state = FLUX_JOB_STATE_NEW;
+    job->ntasks = -1;
+    job->nnodes = -1;
+    job->expiration = -1.0;
+    job->wait_status = -1;
     job->result = FLUX_JOB_RESULT_FAILED;
-    job->eventlog_seq = -1;
 
     if (!(job->next_states = zlist_new ())) {
         errno = ENOMEM;
@@ -166,7 +165,7 @@ static struct job *job_create (struct list_ctx *ctx, flux_jobid_t id)
 
     job->states_mask = FLUX_JOB_STATE_NEW;
     job->states_events_mask = FLUX_JOB_STATE_NEW;
-
+    job->eventlog_seq = -1;
     return job;
 }
 

src/modules/job-list/job_state.h

@@ -59,6 +59,17 @@ struct job_state_ctx {
     flux_future_t *events;
 };
 
+/* timestamp of when we enter the state
+ *
+ * associated eventlog entries when restarting
+ *
+ * t_depend - "submit"
+ * t_priority - "priority" (not saved, can be entered multiple times)
+ * t_sched - "depend" (not saved, can be entered multiple times)
+ * t_run - "alloc"
+ * t_cleanup - "finish" or "exception" w/ severity == 0
+ * t_inactive - "clean"
+ */
 struct job {
     struct list_ctx *ctx;
 
@@ -67,6 +78,11 @@ struct job {
     int urgency;
     int64_t priority;
     double t_submit;
+    // t_depend is identical to t_submit
+    // double t_depend;
+    double t_run;
+    double t_cleanup;
+    double t_inactive;
     flux_job_state_t state;
     const char *name;
     int ntasks;
@@ -77,19 +93,18 @@ struct job {
     int wait_status;
     bool success;
     bool exception_occurred;
-    json_t *exception_context;
     int exception_severity;
     const char *exception_type;
     const char *exception_note;
     flux_job_result_t result;
     json_t *annotations;
     struct grudgeset *dependencies;
-    int eventlog_seq;           /* last event seq read */
 
     /* cache of job information */
     json_t *jobspec_job;
     json_t *jobspec_cmd;
     json_t *R;
+    json_t *exception_context;
 
     /* Track which states we have seen and have completed transition
      * to.  We do not immediately update to the new state and place
@@ -108,22 +123,7 @@ struct job {
     unsigned int states_events_mask;
     void *list_handle;
 
-    /* timestamp of when we enter the state
-     *
-     * associated eventlog entries when restarting
-     *
-     * depend - "submit"
-     * priority - "priority" (not saved, can be entered multiple times)
-     * sched - "depend" (not saved, can be entered multiple times)
-     * run - "alloc"
-     * cleanup - "finish" or "exception" w/ severity == 0
-     * inactive - "clean"
-     */
-    // t_depend is identical to t_submit above, use that
-    // double t_depend;
-    double t_run;
-    double t_cleanup;
-    double t_inactive;
+    int eventlog_seq;           /* last event seq read */
 };
 
 struct job_state_ctx *job_state_create (struct list_ctx *ctx);