Changeset 57 for trunk/pbs_drmaa

Timestamp:

01/08/12 17:38:24 (13 years ago)

Author:

mmamonski

Message:

on site fixies

Location:

trunk/pbs_drmaa

Files:

• job.c (modified) (4 diffs)
• submit.c (modified) (1 diff)

trunk/pbs_drmaa/job.c

@@ -26 +26 @@
 #include <string.h>
 #include <unistd.h>
+#include <sys/stat.h>
 
 #include <drmaa_utils/drmaa.h>
@@ -508 +509 @@
 pbsdrmaa_job_read_exit_status( const char *job_id, const char *job_state_dir_prefix)
 {
-        char *status_file = NULL, start_file = NULL;
+        char *status_file = NULL, *start_file = NULL;
         FILE *fhandle = NULL;
         int exit_status = -1;
@@ -515 +516 @@
 
         status_file = fsd_asprintf("%s/%s.exitcode", job_state_dir_prefix, job_id);
-        start_file = fsd_asprintf("%s/%s.started", job_id, job_state_dir_prefix);
+        start_file = fsd_asprintf("%s/%s.started", job_state_dir_prefix, job_id);
 
         if ((fhandle = fopen(status_file, "r")) == NULL)
@@ -525 +526 @@
                  {
                         exit_status = 143; /* SIGTERM */
-                        fsd_log_info("But start file exist %s. Assuming that job was killed (exit_status=%d).", start_file, exit_status);
-                 }
+                        fsd_log_info(("But start file exist %s. Assuming that job was killed (exit_status=%d).", start_file, exit_status));
+                 }
+                else
+                 {
+                        fsd_log_error(("Start file not found: %s", start_file));
+                 }
+        
+
          }
         else

trunk/pbs_drmaa/submit.c

@@ -354 +354 @@
                 if( wd != NULL )
                         s += sprintf( s, "cd %s; ", wd );
-                s += sprintf( s, "touch %s/$PBS_JOBID.started;", ((pbsdrmaa_session_t *)self->session)->job_exit_status_file_prefix)
+                s += sprintf( s, "touch %s/$PBS_JOBID.started;", ((pbsdrmaa_session_t *)self->session)->job_exit_status_file_prefix);
                 s += sprintf( s, "%s", executable );
                 if( argv != NULL )