Changeset 35 for trunk/slurm_drmaa/session.c

Timestamp:

04/22/14 16:14:49 (11 years ago)

Author:

pkopta

Message:

Michael Gutteridge <michael.gutteridge@…> patch for "mincpus" calculations.

File:

• trunk/slurm_drmaa/session.c (modified) (5 diffs)

trunk/slurm_drmaa/session.c

@@ -93 +93 @@
         fsd_job_t *volatile job = NULL;
         char **volatile job_ids = NULL;
-        unsigned n_jobs = 0;
+        unsigned n_jobs = 1;
         volatile bool connection_lock = false;
         fsd_environ_t *volatile env = NULL;
@@ -103 +103 @@
 
                 if( start != end )
-                        n_jobs = (end - start) / incr + 1;
-                else 
-                        n_jobs = 1;     
-
-                if(  start != end )
                  {
                         unsigned idx, i;
+
+                        n_jobs = (end - start) / incr + 1;
 
                         fsd_calloc( job_ids, n_jobs+1, char* );
@@ -125 +122 @@
                                 connection_lock = fsd_mutex_unlock( &self->drm_connection_mutex );
 
-
                                 job_ids[i] = fsd_asprintf("%d",submit_response->job_id); /*TODO  */
 
@@ -140 +136 @@
                  {
                         fsd_calloc( job_ids, n_jobs+1, char* );
-                        
+
                         connection_lock = fsd_mutex_lock( &self->drm_connection_mutex );
                         slurmdrmaa_job_create_req( self, jt, (fsd_environ_t**)&env , &job_desc, 0);
@@ -148 +144 @@
                         }
 
+                        connection_lock = fsd_mutex_unlock( &self->drm_connection_mutex );
+
                         fsd_log_debug(("job %u submitted", submit_response->job_id));         
-                        connection_lock = fsd_mutex_unlock( &self->drm_connection_mutex );
                         
                         job_ids[0] = fsd_asprintf( "%d", submit_response->job_id); /* .0*/