Changeset 94 for trunk/pbs_drmaa

Timestamp:

11/15/13 16:10:32 (11 years ago)

Author:

mmamonski

Message:

Torque 4 support

File:

• trunk/pbs_drmaa/pbs_conn.c (modified) (2 diffs)

trunk/pbs_drmaa/pbs_conn.c

@@ -154 +154 @@
 }
 
+#define HAS_PBS_SUBMIT_HASH             
+#ifdef HAS_PBS_SUBMIT_HASH
+
+#include <qsub_functions.h>
+
+void set_job_defaults(job_info *ji) {
+  _Z16hash_add_or_exitPP6memmgrPP8job_dataPKcS6_i(&ji->mm, &ji->job_attr, ATTR_c, CHECKPOINT_UNSPECIFIED, STATIC_DATA);
+
+  _Z16hash_add_or_exitPP6memmgrPP8job_dataPKcS6_i(&ji->mm, &ji->job_attr, ATTR_h, NO_HOLD, STATIC_DATA);
+
+  _Z16hash_add_or_exitPP6memmgrPP8job_dataPKcS6_i(&ji->mm, &ji->job_attr, ATTR_j, NO_JOIN, STATIC_DATA);
+
+  _Z16hash_add_or_exitPP6memmgrPP8job_dataPKcS6_i(&ji->mm, &ji->job_attr, ATTR_k, NO_KEEP, STATIC_DATA);
+
+  _Z16hash_add_or_exitPP6memmgrPP8job_dataPKcS6_i(&ji->mm, &ji->job_attr, ATTR_m, MAIL_AT_ABORT, STATIC_DATA);
+
+  _Z16hash_add_or_exitPP6memmgrPP8job_dataPKcS6_i(&ji->mm, &ji->job_attr, ATTR_p, DEFAULT_PRIORITY, STATIC_DATA);
+
+  _Z16hash_add_or_exitPP6memmgrPP8job_dataPKcS6_i(&ji->mm, &ji->job_attr, ATTR_r, "FALSE", STATIC_DATA);
+  _Z16hash_add_or_exitPP6memmgrPP8job_dataPKcS6_i(&ji->mm, &ji->job_attr, ATTR_f, "FALSE", STATIC_DATA);
+  
+  _Z16hash_add_or_exitPP6memmgrPP8job_dataPKcS6_i(&ji->mm, &ji->client_attr, "pbs_dprefix", "#PBS", STATIC_DATA);
+  _Z16hash_add_or_exitPP6memmgrPP8job_dataPKcS6_i(&ji->mm, &ji->job_attr, ATTR_job_radix, "0", STATIC_DATA);
+  _Z16hash_add_or_exitPP6memmgrPP8job_dataPKcS6_i(&ji->mm, &ji->job_attr, ATTR_v, "");
+}  
+
+
+static char *pbs_submit_4_wrapper(int connection_fd, struct attropl *attrib, char  *script, char *destination)
+{       
+        char *new_jobname = NULL;
+        char *jobname_copy = NULL;
+        char *errmsg = NULL;
+        job_info          ji;
+        int local_errno = 0;
+        struct attropl *p;
+
+        memset(&ji, 0, sizeof(job_info));
+
+        if (_Z11memmgr_initPP6memmgri(&ji.mm, 8192) != PBSE_NONE) /* do not want to use g++ just for this file*/
+          {
+                pbsdrmaa_exc_raise_pbs( "memmgr_init", connection_fd);
+          }
+
+        set_job_defaults(&ji);
+
+        for (p = attrib; p; p = p->next) {
+                if (p->resource) {
+                        _Z16hash_add_or_exitPP6memmgrPP8job_dataPKcS6_i(&ji.mm, &ji.res_attr, p->resource, p->value);
+                } else {
+                        _Z16hash_add_or_exitPP6memmgrPP8job_dataPKcS6_i(&ji.mm, &ji.job_attr, p->name, p->value);
+                }
+        }
+
+
+        pbs_errno = pbs_submit_hash(
+                  connection_fd,
+                  &ji.mm,
+                  ji.job_attr,
+                  ji.res_attr,
+                  script,
+                  destination,
+                  NULL,
+                  &new_jobname,
+                  &errmsg);             
+
+        fsd_log_info(("pbs_submit_hash(%s,%s) = %d (jobid=%s)", script, destination, local_errno, new_jobname));
+        
+        jobname_copy = fsd_strdup(new_jobname);
+
+        _Z14memmgr_destroyPP6memmgr(&ji.mm);
+
+        return jobname_copy;
+}
+#endif
+
 char* 
 pbsdrmaa_pbs_submit( pbsdrmaa_pbs_conn_t *self, struct attropl *attrib, char *script, char *destination )
@@ -170 +245 @@
 
 retry:
+
+#ifdef HAS_PBS_SUBMIT_HASH
+                job_id = pbs_submit_4_wrapper(self->connection_fd, attrib, script, destination);
+#else
                 job_id = pbs_submit(self->connection_fd, attrib, script, destination, NULL);
+#endif
 
                 fsd_log_info(("pbs_submit(%s, %s) = %s", script, destination, job_id));