Changeset 45 for trunk/pbs_drmaa/submit.c

Timestamp:

11/28/11 15:02:58 (12 years ago)

Author:

mmamonski

Message:

version 1.0.11 - ready to try

File:

• trunk/pbs_drmaa/submit.c (modified) (4 diffs)

trunk/pbs_drmaa/submit.c

@@ -145 +145 @@
                 const fsd_template_t *pbs_tmpl = self->pbs_job_attributes;
                 unsigned i;
+                int tries_left = ((pbsdrmaa_session_t *)self->session)->max_retries_count;
+                int sleep_time = 1;
 
                 for( i = 0;  i < PBSDRMAA_N_PBS_ATTRIBUTES;  i++ )
@@ -173 +175 @@
                                 if (pbsself->pbs_conn >= 0 )
                                         pbs_disconnect( pbsself->pbs_conn );
-                                sleep(1);
+retry_connect:
+                                sleep(sleep_time++);
                                 pbsself->pbs_conn = pbs_connect( pbsself->super.contact );
-                                if( pbsself->pbs_conn < 0 )
-                                        pbsdrmaa_exc_raise_pbs( "pbs_connect" );
+                                if( pbsself->pbs_conn < 0)
+                                        if (tries_left--)
+                                                goto retry_connect;
+                                        else
+                                                pbsdrmaa_exc_raise_pbs( "pbs_connect" );
                                 else
                                         goto retry;
@@ -612 +618 @@
                 TRY
                   {
-                        for (arg = strtok_r(native_spec_copy, " \t", &ctxt); arg; arg = strtok_r(NULL, " \t",&ctxt) ) {
+                        for (arg = strtok_r((char *)native_spec_copy, " \t", &ctxt); arg; arg = strtok_r(NULL, " \t",&ctxt) ) {
                                 if (!opt)
                                   {
@@ -718 +724 @@
 #endif
                         args_list->destroy(args_list);
-                        fsd_free(native_spec_copy);
+                        fsd_free((char *)native_spec_copy);
                  }
                 END_TRY