Changeset 72 for trunk/pbs_drmaa

Timestamp:

09/06/12 17:30:01 (13 years ago)

Author:

mmamonski

Message:

DRMAA submit filter - almost done

Location:

trunk/pbs_drmaa

Files:

• session.h (modified) (1 diff)
• submit.c (modified) (8 diffs)
• submit.h (modified) (1 diff)

trunk/pbs_drmaa/session.h

@@ -89 +89 @@
          */
         char *job_exit_status_file_prefix;
+
+        /*
+         * Whether to cache PBS Connection
+         */
+        bool cache_connection;
 };
 

trunk/pbs_drmaa/submit.c

@@ -24 +24 @@
 #include <unistd.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include <pbs_ifl.h>
@@ -56 +57 @@
 
 static void pbsdrmaa_submit_set( pbsdrmaa_submit_t *self, const char *pbs_attr, char *value, unsigned placeholders );
+
+static struct attrl *pbsdrmaa_submit_filter(struct attrl *pbs_attr);
+
 
 static void pbsdrmaa_submit_apply_defaults( pbsdrmaa_submit_t *self );
@@ -200 +204 @@
                  }
 
+
+                pbs_attr = pbsdrmaa_submit_filter(pbs_attr);
+
                 conn_lock = fsd_mutex_lock( &self->session->drm_connection_mutex );
 retry:
@@ -232 +239 @@
                                  {
                                         if (tries_left--)
-                                                goto retry;
-                                        else
+                                                goto retry;
+                                        else
                                                 pbsdrmaa_exc_raise_pbs( "pbs_submit" );
                                  }
@@ -692 +699 @@
 
         {
-                fsd_iter_t * volatile args_list = fsd_iter_new(NULL, 0);
                 fsd_template_t *pbs_attr = self->pbs_job_attributes;
                 char *arg = NULL;
@@ -799 +805 @@
                                                 "Invalid native specification: %s",
                                                 native_specification);
-
                  }
                 FINALLY
@@ -806 +811 @@
                         pbs_attr->set_attr( pbs_attr, "submit_args", native_specification);
 #endif
-                        args_list->destroy(args_list);
                         fsd_free((char *)native_spec_copy);
                  }
@@ -813 +817 @@
 }
 
+struct attrl *
+pbsdrmaa_submit_filter(struct attrl *pbs_attr)
+{
+        fsd_log_enter(( "({pbs_attr=%p})", pbs_attr));
+
+        if (getenv(PBSDRMAA_SUBMIT_FILTER_ENV) == NULL) {
+                return pbs_attr;
+        } else {
+                struct attrl *ii = NULL;
+                const char *submit_filter = getenv(PBSDRMAA_SUBMIT_FILTER_ENV);
+
+                fsd_log_info(("Executing filter script: %s", submit_filter));
+
+                for (ii = pbs_attr; ii; ii = ii->next) {
+                        fsd_log_info(("FILTER: %s=%s ", ii->name, ii->value));
+                }
+
+                return pbs_attr;
+        }
+
+
+}
+

trunk/pbs_drmaa/submit.h

@@ -28 +28 @@
 
 typedef struct pbsdrmaa_submit_s pbsdrmaa_submit_t;
+
+#define PBSDRMAA_SUBMIT_FILTER_ENV "PBSDRMAA_SUBMIT_FILTER"
 
 pbsdrmaa_submit_t *