Changeset 65 for trunk

Timestamp:

01/15/12 17:18:16 (13 years ago)

Author:

mmamonski

Message:

try to maintain binary compatibility with older version of Torque

Location:

trunk/pbs_drmaa

Files:

• job.c (modified) (2 diffs)
• session.c (modified) (1 diff)
• submit.c (modified) (1 diff)
• util.h (modified) (1 diff)

trunk/pbs_drmaa/job.c

@@ -152 +152 @@
                         if ( rc == PBSE_NONE )
                                 break;
-                        else if (( rc == PBSE_INTERNAL || rc == PBSE_PROTOCOL || rc == PBSE_EXPIRED) && (tries_left--))
+                        else if (( rc == PBSE_INTERNAL || rc == PBSE_PROTOCOL || rc == PBSOLDE_PROTOCOL || rc == PBSE_EXPIRED || rc == PBSOLDE_EXPIRED) && (tries_left--))
                          {
-                                if (rc == PBSE_PROTOCOL || rc == PBSE_EXPIRED)
+                                if (rc == PBSE_PROTOCOL || rc == PBSE_EXPIRED || rc == PBSOLDE_PROTOCOL || rc == PBSOLDE_EXPIRED)
                                  {
                                         if ( session->pbs_conn >= 0)
@@ -243 +243 @@
                                         break;
                                 case PBSE_PROTOCOL:
+                                case PBSOLDE_PROTOCOL:
                                 case PBSE_EXPIRED:
+                                case PBSOLDE_EXPIRED:
                                         if ( session->pbs_conn >= 0 )
                                                 pbs_disconnect( session->pbs_conn );

trunk/pbs_drmaa/session.c

@@ -338 +338 @@
                 if( status == NULL  &&  pbs_errno != 0 )
                  {
-                        if (pbs_errno == PBSE_PROTOCOL || pbs_errno == PBSE_EXPIRED)
+                        if (pbs_errno == PBSE_PROTOCOL || pbs_errno == PBSE_EXPIRED || pbs_errno == PBSOLDE_PROTOCOL || pbs_errno == PBSOLDE_EXPIRED)
                          {
                                 if ( pbsself->pbs_conn >= 0)

trunk/pbs_drmaa/submit.c

@@ -210 +210 @@
                 if( job_id == NULL )
                 {
-                        if (pbs_errno == PBSE_PROTOCOL || pbs_errno == PBSE_EXPIRED)
+                        if (pbs_errno == PBSE_PROTOCOL || pbs_errno == PBSE_EXPIRED || pbs_errno == PBSOLDE_PROTOCOL || pbs_errno == PBSOLDE_EXPIRED)
                          {
                                 pbsdrmaa_session_t *pbsself = (pbsdrmaa_session_t*)self->session;

trunk/pbs_drmaa/util.h

@@ -25 +25 @@
 #endif
 
+/*compatibility hack - ugly but help to keep binary compatibility :/ */
+#define PBSOLDE_PROTOCOL 15031
+#define PBSOLDE_EXPIRED 15020
+
+
 void pbsdrmaa_exc_raise_pbs( const char *function );
 int pbsdrmaa_map_pbs_errno( int _pbs_errno );