Changeset 103

Timestamp:

09/11/15 12:46:51 (9 years ago)

Author:

pkopta

Message:

 

Location:

trunk

Files:

• AUTHORS (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• m4/ax_pbs.m4 (modified) (1 diff)
• pbs_drmaa/Makefile.am (modified) (3 diffs)
• pbs_drmaa/job.c (modified) (1 diff)

trunk/AUTHORS

@@ -10 +10 @@
 
 Send bug reports to:
-       Piotr Kopta <pkopta@man.poznan.pl>
+      qcg@plgrid.pl 

trunk/ChangeLog

@@ -1 @@
-2015-09-09 Piotr Kopta <pkopta@man.poznan.pl>
-    * pbs_drmaa/pbs_conn.c (pbsdrmaa_pbs_statjob): 'x' flag for PBS Pro
-    - this enables to query for finished and moved jobs
+2015-09-11 Piotr Kopta <pkopta@man.poznan.pl>
+
+        * pbs_drmaa/pbs_attrib_pro.gperf: separate definition for PBS Professional
+        * pbs_drmaa/pbs_conn.c (pbsdrmaa_pbs_statjob): 'x' attribute for pbs_stat (PBS Professional)
+        * pbs_drmaa/job.c (pbsdrmaa_job_update): 'F' job state for PBS Professional
 
 2014-11-27 Piotr Kopta <pkopta@man.poznan.pl>
 
-    * pbs_drmaa/submit.c (parse_addition_attr): changed ';' to ',' as
-    parameter separate character of '-W' arguments
+        * pbs_drmaa/submit.c (parse_addition_attr): changed ';' to ',' as
+        parameter separate character of '-W' arguments

trunk/configure.ac

@@ -1 @@
-AC_INIT([DRMAA for PBS Pro], [1.0.18], [mamonski@man.poznan.pl], [pbs-drmaa])
+AC_INIT([DRMAA for PBS Pro], [1.0.19], [qcg@plgrid.pl], [pbs-drmaa])
 AC_PREREQ(2.59)
 AC_REVISION([$Id$])
@@ -23 +23 @@
 PBS_DRMAA_MAJOR=1
 PBS_DRMAA_MINOR=0
-PBS_DRMAA_MICRO=18
-PBS_DRMAA_VERSION_INFO=1:18:0
+PBS_DRMAA_MICRO=19
+PBS_DRMAA_VERSION_INFO=1:19:0
 AC_SUBST([PBS_DRMAA_MAJOR])
 AC_SUBST([PBS_DRMAA_MINOR])

trunk/m4/ax_pbs.m4

@@ -104 +104 @@
                 ax_pbs_libs="-ltorque"
         fi
+
+        AM_CONDITIONAL([PBS_PROFESSIONAL], [false])
 else
         AC_DEFINE(PBS_PROFESSIONAL,[1])
+        AM_CONDITIONAL([PBS_PROFESSIONAL], [true])
 fi
 

trunk/pbs_drmaa/Makefile.am

@@ -27 +27 @@
  drmaa.c \
  job.c job.h \
- pbs_attrib.gperf pbs_attrib.h \
+ pbs_attrib.h \
  session.c session.h \
  submit.c submit.h \
@@ -33 +33 @@
  log_reader.c log_reader.h \
  pbs_conn.c pbs_conn.h 
+
+
+if PBS_PROFESSIONAL
+GPERF_INPUT= pbs_attrib_pro.gperf
+else
+GPERF_INPUT= pbs_attrib.gperf
+endif
+
+libdrmaa_la_SOURCES += $(GPERF_INPUT)
+
+BUILT_SOURCES       = $(GPERF_INPUT:.gperf=.c)
+EXTRA_DIST          = $(GPERF_INPUT:.gperf=.c)
+
 if TORQUE4
 libdrmaa_la_SOURCES += torque4.cpp torque4.h
 endif
-BUILT_SOURCES       = pbs_attrib.c
-EXTRA_DIST          = pbs_attrib.c
 dist_sysconf_DATA   = pbs_drmaa.conf.example
 libdrmaa_la_LIBADD  = ../drmaa_utils/drmaa_utils/libdrmaa_utils.la @PBS_LIBS@
@@ -47 +58 @@
 
 if GCC
-pbs_attrib.lo: CFLAGS += @GCC_W_NO_MISSING_FIELD_INITIALIZERS@
+$(GPERF_INPUT:.gperf=.lo): CFLAGS += @GCC_W_NO_MISSING_FIELD_INITIALIZERS@
 endif

trunk/pbs_drmaa/job.c

@@ -252 +252 @@
                  {
                         case 'C': /* Job is completed after having run. */
+#ifdef PBS_PROFESSIONAL
+                        case 'F': /* Job is completed after having run. */
+#endif
                                 self->flags &= FSD_JOB_TERMINATED_MASK;
                                 self->flags |= FSD_JOB_TERMINATED;