Changeset 24 for trunk

Timestamp:

10/09/11 16:15:37 (13 years ago)

Author:

mmamonski

Message:

lost commit :/ thx Dominique

Location:

trunk

Files:

• configure.ac (modified) (2 diffs)
• pbs_drmaa/log_reader.c (modified) (1 diff)
• pbs_drmaa/submit.c (modified) (3 diffs)

trunk/configure.ac

@@ -1 @@
-AC_INIT([DRMAA for PBS Pro], [1.0.8], [mamonski@man.poznan.pl], [pbs-drmaa])
+AC_INIT([DRMAA for PBS Pro], [1.0.9], [mamonski@man.poznan.pl], [pbs-drmaa])
 AC_PREREQ(2.59)
 AC_REVISION([$Id$])
@@ -23 +23 @@
 PBS_DRMAA_MAJOR=1
 PBS_DRMAA_MINOR=0
-PBS_DRMAA_MICRO=8
-PBS_DRMAA_VERSION_INFO=1:8:0
+PBS_DRMAA_MICRO=9
+PBS_DRMAA_VERSION_INFO=1:9:0
 AC_SUBST([PBS_DRMAA_MAJOR])
 AC_SUBST([PBS_DRMAA_MINOR])

trunk/pbs_drmaa/log_reader.c

@@ -995 +995 @@
                                                                                 struct_attrl[msg_field_n].name = ATTR_etime;
                                                                                 break; 
-                                                                                
+#ifndef PBS_PROFESSIONAL                
                                                                         case FLD_MSG_ACC_START:
                                                                                 struct_attrl[msg_field_n].name = ATTR_start_time;
-                                                                                break; 
+#else
+                                                                        case FLD_MSG_ACC_START:
+                                                                                struct_attrl[msg_field_n].name = ATTR_stime;
+#endif
                                                                                 
                                                                         case FLD_MSG_ACC_OWNER:

trunk/pbs_drmaa/submit.c

@@ -462 +462 @@
         const fsd_template_t *jt = self->job_template;
         const char *const *env_v;
+        const char *jt_wd;
+        char *wd;
+        char *env_c = NULL;
+        int ii = 0, len = 0;
 
         env_v = jt->get_v_attr( jt, DRMAA_V_ENV);
+        jt_wd    = jt->get_attr( jt, DRMAA_WD );
+        
+        if (!jt_wd)
+        {
+                wd = fsd_getcwd();
+        }
+        else
+        {
+                wd = fsd_strdup(jt_wd);
+        }
 
         if (env_v)
         {
-                char *env_c = NULL;
-                int ii = 0, len = 0;
-
                 ii = 0;
                 while (env_v[ii]) {
@@ -475 +486 @@
                         ii++;
                 }
-
-                fsd_calloc(env_c, len + 1, char);
-                env_c[0] = '\0';
-
+        }
+        
+        len+= strlen("PBS_O_WORKDIR=") + strlen(wd);
+
+        fsd_calloc(env_c, len + 1, char);
+        env_c[0] = '\0';
+
+        if (env_v)
+        {
                 ii = 0;
                 while (env_v[ii]) {
@@ -486 +502 @@
                 }
 
-                env_c[strlen(env_c) -1 ] = '\0'; /*remove the last ',' */
-
-                self->pbs_job_attributes->set_attr(self->pbs_job_attributes, "Variable_List", env_c);
-
-                fsd_free(env_c);
         }
+        
+        strcat(env_c, "PBS_O_WORKDIR=");
+        strcat(env_c, wd);
+
+        self->pbs_job_attributes->set_attr(self->pbs_job_attributes, "Variable_List", env_c);
+
+        fsd_free(env_c);
+        fsd_free(wd);
 }