Changeset 7 for trunk

Timestamp:

12/17/10 14:40:43 (14 years ago)

Author:

mmatloka

Message:

release package

Location:

trunk

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (1 diff)
• slurm_drmaa/job.c (modified) (5 diffs)
• slurm_drmaa/job.h (modified) (1 diff)

trunk/Makefile.am

@@ -25 +25 @@
 
 SUBDIRS = drmaa_utils slurm_drmaa 
-#doc
+

trunk/configure.ac

@@ -181 +181 @@
         Makefile
         slurm_drmaa/Makefile
-        doc/Makefile
 ])
 AC_CONFIG_HEADERS([config.h])

trunk/slurm_drmaa/job.c

@@ -54 +54 @@
                                         fsd_exc_raise_fmt(      FSD_ERRNO_INTERNAL_ERROR,"slurm_suspend error: %s,job_id: %s",slurm_strerror(slurm_get_errno()),self->job_id);
                                 }
+                                slurm_self->user_suspended = true;
                                 break;
                         case DRMAA_CONTROL_HOLD:
@@ -69 +70 @@
                                         fsd_exc_raise_fmt(      FSD_ERRNO_INTERNAL_ERROR,"slurm_resume error: %s,job_id: %s",slurm_strerror(slurm_get_errno()),self->job_id);
                                 }
+                                slurm_self->user_suspended = false;
                                 break;
                         case DRMAA_CONTROL_RELEASE:
@@ -106 +108 @@
 {
         job_info_msg_t *job_info = NULL;
+        slurmdrmaa_job_t * slurm_self = (slurmdrmaa_job_t *) self;
         fsd_log_enter(( "({job_id=%s})", self->job_id ));
 
@@ -167 +170 @@
                                 break;
                         case JOB_SUSPENDED:
-                                self->state = DRMAA_PS_SYSTEM_SUSPENDED; /* assume SYSTEM - suspendig jobs is administrator only */
+                                if(slurm_self->user_suspended == true)
+                                        self->state = DRMAA_PS_USER_SUSPENDED;
+                                else
+                                        self->state = DRMAA_PS_SYSTEM_SUSPENDED; /* assume SYSTEM - suspendig jobs is administrator only */
                                 break;
                         case JOB_COMPLETE:
@@ -225 +231 @@
         self->super.update_status = slurmdrmaa_job_update_status;
         self->old_priority = UINT32_MAX;
-
+        self->user_suspended = true;
         return (fsd_job_t*)self;
 }

trunk/slurm_drmaa/job.h

@@ -40 +40 @@
         /* job priority before hold */
         uint32_t old_priority;
+        bool user_suspended;
 };