Changeset 38 for branches/slurm-drmaa-1.2.0/slurm_drmaa/job.c

Timestamp:

07/22/14 11:17:42 (11 years ago)

Author:

pkopta

Message:

 

File:

• branches/slurm-drmaa-1.2.0/slurm_drmaa/job.c (modified) (4 diffs)

branches/slurm-drmaa-1.2.0/slurm_drmaa/job.c

@@ -261 +261 @@
                 const fsd_template_t *jt,
                 fsd_environ_t **envp,
-                job_desc_msg_t * job_desc,
-                int n_job /* ~job_step */
-                )
+                job_desc_msg_t * job_desc)
 {
         fsd_expand_drmaa_ph_t *volatile expand = NULL;
@@ -269 +267 @@
         TRY
          {
-                expand = fsd_expand_drmaa_ph_new( NULL, NULL, fsd_asprintf("%d",n_job) );
-                slurmdrmaa_job_create( session, jt, envp, expand, job_desc, n_job);
+                expand = fsd_expand_drmaa_ph_new( NULL, NULL, fsd_strdup("%a") );
+                slurmdrmaa_job_create( session, jt, envp, expand, job_desc );
          }
         EXCEPT_DEFAULT
@@ -308 +306 @@
                 fsd_environ_t **envp,
                 fsd_expand_drmaa_ph_t *expand, 
-                job_desc_msg_t * job_desc,
-                int n_job
+                job_desc_msg_t * job_desc
                 )
 {
@@ -326 +323 @@
         const char *job_category = "default";
         
-        slurmdrmaa_init_job_desc( job_desc );
-
-        slurm_init_job_desc_msg( job_desc );
-        
         job_desc->user_id = getuid();
         job_desc->group_id = getgid();