Changeset 12 for trunk/pbs_drmaa/job.c

Timestamp:

04/20/11 17:20:29 (13 years ago)

Author:

mmamonski

Message:

version 1.0.7 release candidate

File:

• trunk/pbs_drmaa/job.c (modified) (8 diffs, 1 prop)

trunk/pbs_drmaa/job.c

@@ -1 @@
-/* $Id: job.c 370 2010-11-16 09:51:00Z mamonski $ */
+/* $Id$ */
 /*
  *  FedStage DRMAA for PBS Pro
@@ -43 +43 @@
                 __attribute__ ((unused))
 #       endif
-        = "$Id: job.c 370 2010-11-16 09:51:00Z mamonski $";
+        = "$Id$";
 #endif
 
@@ -385 +385 @@
                 int hours, minutes, seconds;
                 long mem;
-                if( cpu_usage && sscanf( cpu_usage, "%d:%d:%d",
-                                &hours, &minutes, &seconds ) == 3 )
+                if( cpu_usage && sscanf( cpu_usage, "%d:%d:%d", &hours, &minutes, &seconds ) == 3 )
                  {
                         self->cpu_usage = 60*( 60*hours + minutes ) + seconds;
@@ -401 +400 @@
                         fsd_log_debug(( "vmem_usage: %s=%ldB", vmem_usage, self->vmem_usage ));
                  }
-                if( walltime && sscanf( walltime, "%d:%d:%d",
-                                        &hours, &minutes, &seconds ) == 3 )
+                if( walltime && sscanf( walltime, "%d:%d:%d", &hours, &minutes, &seconds ) == 3 )
                  {
                         self->walltime = 60*( 60*hours + minutes ) + seconds;
@@ -414 +412 @@
 {
         pbsdrmaa_session_t *pbssession = (pbsdrmaa_session_t*)self->session;
-        
+
         if( pbssession->pbs_home == NULL )
                 pbsdrmaa_job_on_missing_standard( self );       
@@ -429 +427 @@
 
         fsd_log_enter(( "({job_id=%s})", self->job_id ));
-        fsd_log_warning(( "self %s missing from DRM queue", self->job_id ));
+        fsd_log_warning(( "Job %s missing from DRM queue", self->job_id ));
 
         switch( session->missing_jobs )
@@ -465 +463 @@
         }
 
+        fsd_cond_broadcast( &self->status_cond);
+
         fsd_log_return(( "; job_ps=%s, exit_status=%d",
                                 drmaa_job_ps_to_str(self->state), self->exit_status ));
@@ -476 +476 @@
         
         fsd_log_enter(( "({job_id=%s})", self->job_id ));
-        fsd_log_warning(( "self %s missing from DRM queue", self->job_id ));
+        fsd_log_info(( "Job %s missing from DRM queue", self->job_id ));
         
         TRY