Changeset 35 for trunk/pbs_drmaa

Timestamp:

10/27/11 16:13:55 (13 years ago)

Author:

mmamonski

Message:

on site fixies

File:

• trunk/pbs_drmaa/log_reader.c (modified) (8 diffs)

trunk/pbs_drmaa/log_reader.c

@@ -23 +23 @@
 
 #include <stdlib.h>
+#include <ctype.h>
 #include <string.h>
 #include <unistd.h>
@@ -408 +409 @@
                                                                 goto cleanup; /* ignore other job events*/
                                                         }
+                                        
+                                                        fsd_log_debug(("WT - updating job: %s", job->job_id ));
+                                                        status.name = job->job_id;
+                                                        status.attribs = attribs;
+
+                                                        ((pbsdrmaa_job_t *)job)->update( job, &status );
 
                                                         if ( in_running_state )
@@ -423 +430 @@
                                                                 END_TRY
                                                          }
-                                                        else
-                                                         {
-                                                                fsd_log_debug(("WT - updating job: %s", job->job_id ));
-                                                                status.name = job->job_id;
-                                                                status.attribs = attribs;
-
-                                                                ((pbsdrmaa_job_t *)job)->update( job, &status );
-
-                                                                pbsdrmaa_free_attrl(attribs); /* TODO free on exception */
-                                                         }
+
+
+                                                        pbsdrmaa_free_attrl(attribs); /* TODO free on exception */
 
                                                         fsd_cond_broadcast( &job->status_cond);
@@ -578 +578 @@
 {
                 pbsdrmaa_session_t *pbssession = (pbsdrmaa_session_t*) log_reader->session;
-
                 struct tm tm;
                 time_t tm_t;
                 char *line = NULL;
+                char *exec_host = NULL;
+                char *log_path = NULL;
                 FILE *fhandle = NULL;
-                char *exec_host = NULL;
-
-                fsd_log_enter((""));
+
+                fsd_log_enter(("(job_id=%s)", job_id));
 
                 tm_t = time(NULL);
-                localtime_r(&time_t, &tm);
+                localtime_r(&tm_t, &tm);
 
                 log_path = fsd_asprintf("%s/server_priv/accounting/%04d%02d%02d", pbssession->pbs_home, tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday);
@@ -596 +596 @@
                 if ((fhandle = fopen(log_path, "r")) == NULL)
                  {
-                        fsd_log_error("Failed to open accounting log file: %s", log_path);
+                        fsd_log_error(("Failed to open accounting log file: %s", log_path));
                         fsd_free(log_path);
                         return NULL;
@@ -607 +607 @@
                 while ((line = fsd_readline(fhandle)) != NULL)
                  {
-                        if (line[20] == 'E' && strncmp(line + 23, job_id, strlen(job_id)) == 0 )
+
+                        if (line[20] == 'E'  && strncmp(line + 22, job_id, strlen(job_id)) == 0 )
                          {
                                 char *p = NULL;
@@ -622 +623 @@
 
                                 p = exec_host;
-                                while (p != ' ' && p != '\0')
+                                while (*p != ' ' && *p != '\0')
                                         p++;
-                                p = '\0';
+                                *p = '\0';
 
                                 break;
@@ -639 +640 @@
                 else
                  {
-                        fsd_log_error(("Could not find executions hosts for %s.", job_id))
+                        fsd_log_error(("Could not find executions hosts for %s.", job_id));
                  }