Changeset 29 for trunk/slurm_drmaa/util.c

Timestamp:

10/31/12 14:10:21 (12 years ago)

Author:

mmamonski

Message:

bump version, avoid segault on missing jobs

File:

• trunk/slurm_drmaa/util.c (modified) (3 diffs)

trunk/slurm_drmaa/util.c

@@ -94 +94 @@
         else if (strcasecmp(mail_type_str, "FAIL") == 0)
                 rc = MAIL_JOB_FAIL;
+#if SLURM_VERSION_NUMBER >= SLURM_VERSION_NUM(2,2,0)
         else if (strcasecmp(mail_type_str, "REQUEUE") == 0)
                 rc = MAIL_JOB_REQUEUE;
+#endif
         else if (strcasecmp(mail_type_str, "ALL") == 0)
+#if SLURM_VERSION_NUMBER >= SLURM_VERSION_NUM(2,2,0)
                 rc = MAIL_JOB_BEGIN | MAIL_JOB_END | MAIL_JOB_FAIL | MAIL_JOB_REQUEUE;
-        else
-                rc = 0; /* failure */
+#else
+                rc = MAIL_JOB_BEGIN | MAIL_JOB_END | MAIL_JOB_FAIL;
+#endif
+        else {
+                fsd_log_error(("Unknown mail type: %s", mail_type_str));
+        }
 
         return rc;
@@ -163 +170 @@
         fsd_free(job_desc->std_err);    
         fsd_free(job_desc->work_dir);
+        fsd_free(job_desc->exc_nodes);
+#if SLURM_VERSION_NUMBER >= SLURM_VERSION_NUM(2,2,0)
         fsd_free(job_desc->gres);
-        fsd_free(job_desc->exc_nodes);
-
+#endif
         
         fsd_log_return(( "" ));
@@ -309 +317 @@
                         break;  
                 case SLURM_NATIVE_GRES:
+                        #if SLURM_VERSION_NUMBER >= SLURM_VERSION_NUM(2,2,0)
                         fsd_log_debug(("# gres = %s",value));
                         job_desc->gres = fsd_strdup(value);
+                        #else
+                        fsd_log_error(("GRES not supported in this version of SLURM."));
+                        #endif
                         break;
                 case SLURM_NATIVE_NO_KILL: