Changeset 26 for trunk/pbs_drmaa/log_reader.c

Timestamp:

10/12/11 14:21:23 (11 years ago)

Author:

mmamonski

Message:

try pbs

File:

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

trunk/pbs_drmaa/log_reader.c

@@ -260 +260 @@
 pbsdrmaa_read_log( pbsdrmaa_log_reader_t * self )
 {
-        pbsdrmaa_job_t *pbsjob = (pbsdrmaa_job_t*) self->job;   
+        pbsdrmaa_job_t *pbsjob = (pbsdrmaa_job_t*) self->job;
         fsd_job_t *volatile temp_job = NULL;
                 
@@ -279 +279 @@
                         self->select_file(self);
 
-                        while ((self->read_line(self, line,buffer, sizeof(line), &idx,&end_idx,&line_idx)) > 0)                         
+                        while ((self->read_line(self, line,buffer, sizeof(line), &idx,&end_idx,&line_idx)) > 0)
                         {
                                 const char *volatile ptr = line;
@@ -349 +349 @@
                                                                         self->run_flag = false;
                                                                         job_id_match = true; 
-                                                                        status.name = fsd_strdup(self->job->job_id);                                                                    
+                                                                        status.name = fsd_strdup(self->job->job_id);
                                                                 }
                                                                 else if ( !job_found && diff >= 1)
@@ -379 +379 @@
                                                         struct_mtime,
                                                         struct_queue,
-                                                        struct_account_name;
+                                                        struct_account_name,
+                                                        struct_exec_vnode;
+                                                struct attrl *last_attr = NULL;
                                                 
                                                 bool state_running = false;
@@ -393 +395 @@
                                                 memset(&struct_queue,0,sizeof(struct attrl));
                                                 memset(&struct_account_name,0,sizeof(struct attrl));
+                                                memset(&struct_exec_vnode,0,sizeof(struct attrl));
                                                                 
                                                 if (strcmp(event,FLD_MSG_STATE) == 0) 
@@ -401 +404 @@
                                                         struct_state.next = NULL;
                                                         struct_state.name = "job_state";
+                                                        last_attr = &struct_state;
+
                                                         if(field[0] == 'J') /* Job Queued, Job Modified, Job Run*/
                                                          {
@@ -424 +429 @@
                                                                          {
                                                                                 time_t temp_time = mktime(&temp_time_tm);
-                                                                                status.attribs = &struct_mtime;
+                                                                                last_attr->next = &struct_mtime;
+                                                                                last_attr = &struct_mtime;
                                                                                 struct_mtime.name = "mtime";
                                                                                 struct_mtime.next = NULL;
@@ -434 +440 @@
                                                         /* != Job deleted and Job to be deleted*/
 #ifdef PBS_PROFESSIONAL
-                                                        else if (field[4] != 't' && field[10] != 'd') {
+                                                        else if (field[4] != 't' && field[10] != 'd')
+                                                         {
 #else
-                                                        else if(field[4] != 'd') {
+                                                        else if (field[4] != 'd')
+                                                         {
 #endif
-
-                                                                if ((struct_state.value = fsd_asprintf("%c",field[n]) ) == NULL ) { /* 4 first letter of state */
-                                                                        fsd_exc_raise_fmt(FSD_ERRNO_INTERNAL_ERROR,"%s - Memory allocation wasn't possible",self->name);
-                                                                }
-                                                                if(struct_state.value[0] == 'R'){
+                                                                struct_state.value = fsd_asprintf("%c",field[n]);
+
+                                                                if(struct_state.value[0] == 'R')
+                                                                 {
                                                                         state_running = true;
-                                                                }
-                                                        }
-                                                        else { /* job terminated - pbs drmaa detects failed as completed with exit_status !=0, aborted with status -1*/
+#ifdef PBS_PROFESSIONAL
+                                                                        {
+                                                                                char *p_vnode = NULL;
+                                                                                if (p_vnode = strstr(field, "exec_vnode"))
+                                                                                 {
+                                                                                        last_attr->next = &struct_exec_vnode;
+                                                                                        last_attr =  &struct_exec_vnode;
+                                                                                        struct_exec_vnode.name = "exec_vnode";
+                                                                                        struct_exec_vnode.next = NULL;
+                                                                                        struct_exec_vnode.value = fsd_strdup(p + 11);
+                                                                                 }
+                                                                        }
+#endif
+                                                                 }
+                                                         }
+                                                        else
+                                                         { /* job terminated - pbs drmaa detects failed as completed with exit_status !=0, aborted with status -1*/
                                                                 struct_status.name = "exit_status";
                                                                 struct_status.value = fsd_strdup("-1");
@@ -452 +473 @@
                                                                 struct_state.next = &struct_status;
                                                                 struct_state.value = fsd_strdup("C");
-                                                        }
+                                                         }
                                                 }
                                                 else /*if (strcmp(event,FLD_MSG_STATUS) == 0 )*/
@@ -534 +555 @@
                                                         else
                                                         {
-                                                                fsd_log_debug(("%s - updating job: %s",self->name, temp_job->job_id ));                                                 
+                                                                fsd_log_debug(("%s - updating job: %s",self->name, temp_job->job_id ));
                                                                 pbsjob->update( temp_job, &status );
                                                         }
@@ -540 +561 @@
                                                 else if( job_found ) /* job_on_missing */
                                                 {
-                                                        fsd_log_debug(("Job_on_missing - updating job: %s", self->job->job_id ));                                                       
+                                                        fsd_log_debug(("Job_on_missing - updating job: %s", self->job->job_id ));
                                                         pbsjob->update( self->job, &status );
                                                 }
@@ -575 +596 @@
                                                 log_event = false;
                                         }
-                                        else if( self->job == NULL && log_match && field_n == FLD_MSG && strncmp(field,"Log closed",10) == 0) 
+                                        else if( self->job == NULL && log_match && field_n == FLD_MSG && strncmp(field,"Log closed",10) == 0)
                                         {
                                                 fsd_log_debug(("%s - Date changed. Closing log file",self->name));
@@ -591 +612 @@
                                 }               
 
-                                fsd_free(temp_date);                    
-                        } /* end of while getline loop */                       
+                                fsd_free(temp_date);
+                        } /* end of while getline loop */
                         
                         if(self->job == NULL)
@@ -599 +620 @@
                                 fd_set log_fds;
         
-                                fsd_mutex_unlock( &self->session->mutex );                      
+                                fsd_mutex_unlock( &self->session->mutex );
                                 
                                 FD_ZERO(&log_fds);
@@ -874 +895 @@
                 close(self->fd);
 
-        fsd_log_debug(("Accounting Log file: %s",log_path));                            
+        fsd_log_debug(("Accounting Log file: %s",log_path));
 
         if((self->fd = open(log_path,O_RDONLY) ) == -1 )
@@ -926 +947 @@
                         
                         if(self->fd != -1)                                      
-                        while ((self->read_line(self, line,buffer, sizeof(line), &idx,&end_idx,&line_idx)) > 0)                         
+                        while ((self->read_line(self, line,buffer, sizeof(line), &idx,&end_idx,&line_idx)) > 0)
                         {
                                 const char *volatile ptr = line;
@@ -965 +986 @@
                                                                         job_found = true;
                                                                         job_id_match = true; 
-                                                                        status.name = fsd_strdup(self->job->job_id);                                                                    
+                                                                        status.name = fsd_strdup(self->job->job_id);
                                                                 }       
                                                 }
@@ -973 +994 @@
                                         {                                       
                                                 struct attrl * struct_attrl = calloc(10,sizeof(struct attrl));
-                                                                                             
+                                                int i;
+
                                                 if(field[0] == 'q')
                                                 {
@@ -987 +1009 @@
                                                         char  msg[ 256 ] = "";
                                                         int n2 = 0;
-                                                        int msg_field_n = 0;    
+                                                        int msg_field_n = 0;
                                 
                                                         status.attribs = &struct_attrl[0];
@@ -996 +1018 @@
                                                                 {
                                                                         case FLD_MSG_ACC_USER:
-                                                                                struct_attrl[msg_field_n].name = ATTR_euser;                                                                    
+                                                                                struct_attrl[msg_field_n].name = ATTR_euser;
                                                                                 break;
 
@@ -1061 +1083 @@
                                                 if( job_found && status.attribs != NULL)
                                                 {
-                                                        fsd_log_debug(("Accounting file - updating job: %s", self->job->job_id ));                                      
+                                                        fsd_log_debug(("Accounting file - updating job: %s", self->job->job_id ));
                                                         pbsjob->update( self->job, &status );
                                                         res = true;
@@ -1074 +1096 @@
                                                         temp_job->release( temp_job );
         
-                                                int i = 0;
                                                 for(i = 0; i < 10; i++)
                                                 {