[Batchserver-cvs] batchserver/src/org/jmonks/batchserver/framework/controller/pool AbstractPoolJob

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/controller/pool
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20831/framework/controller/pool

Modified Files:
	AbstractPoolJobLoader.java AbstractPoolJobProcessor.java 
	CollectionJobPool.java JobPool.java PoolJobController.java 
	PoolJobLoader.java PoolJobProcessor.java 
Log Message:
no message

Index: PoolJobLoader.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/controller/pool/PoolJobLoader.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** PoolJobLoader.java	29 Aug 2006 02:01:32 -0000	1.7
--- PoolJobLoader.java	13 Sep 2006 04:49:46 -0000	1.8
***************
*** 69,73 ****
       *  @return Returns the number of records this loader is going to load.
       */
!     public int getTotalJobDataCount();
      /**
       *  Gets the loader state as object which can be understan by the monitoring
--- 69,73 ----
       *  @return Returns the number of records this loader is going to load.
       */
!     public long getTotalJobDataCount();
      /**
       *  Gets the loader state as object which can be understan by the monitoring

Index: JobPool.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/controller/pool/JobPool.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** JobPool.java	16 May 2006 03:15:28 -0000	1.5
--- JobPool.java	13 Sep 2006 04:49:46 -0000	1.6
***************
*** 50,53 ****
       *  @return Returns the number of job data objects being loaded into the pool.
       */
!     public int getLoadedJobDataCount();
  }
--- 50,53 ----
       *  @return Returns the number of job data objects being loaded into the pool.
       */
!     public long getLoadedJobDataCount();
  }

Index: PoolJobProcessor.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/controller/pool/PoolJobProcessor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PoolJobProcessor.java	29 Aug 2006 02:01:32 -0000	1.6
--- PoolJobProcessor.java	13 Sep 2006 04:49:46 -0000	1.7
***************
*** 67,70 ****
       *  @return Returns the number of job data objects processed.
       */
!     public int getProcessedJobDataCount();
  }
--- 67,70 ----
       *  @return Returns the number of job data objects processed.
       */
!     public long getProcessedJobDataCount();
  }

Index: AbstractPoolJobProcessor.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/controller/pool/AbstractPoolJobProcessor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AbstractPoolJobProcessor.java	29 Aug 2006 02:01:32 -0000	1.5
--- AbstractPoolJobProcessor.java	13 Sep 2006 04:49:46 -0000	1.6
***************
*** 24,28 ****
       *  Counts the number of job data objects processed.
       */
!     private int processedJobDataCount=0;
      /**
       *  Signal to stop the processor.
--- 24,28 ----
       *  Counts the number of job data objects processed.
       */
!     private long processedJobDataCount=0;
      /**
       *  Signal to stop the processor.
***************
*** 203,207 ****
       *  @see org.jmonks.batchserver.framework.controller.pool.PoolJobProcessor#getProcessedJobDataCount()
       */
!     public int getProcessedJobDataCount()
      {
          return processedJobDataCount;
--- 203,207 ----
       *  @see org.jmonks.batchserver.framework.controller.pool.PoolJobProcessor#getProcessedJobDataCount()
       */
!     public long getProcessedJobDataCount()
      {
          return processedJobDataCount;

Index: AbstractPoolJobLoader.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/controller/pool/AbstractPoolJobLoader.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AbstractPoolJobLoader.java	29 Aug 2006 02:01:32 -0000	1.8
--- AbstractPoolJobLoader.java	13 Sep 2006 04:49:46 -0000	1.9
***************
*** 241,244 ****
       *  @return Return the number of job data object its going to load.
       */
!     public abstract int getTotalJobDataCount();    
  }
--- 241,244 ----
       *  @return Return the number of job data object its going to load.
       */
!     public abstract long getTotalJobDataCount();    
  }

Index: PoolJobController.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/controller/pool/PoolJobController.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** PoolJobController.java	10 Sep 2006 17:58:07 -0000	1.13
--- PoolJobController.java	13 Sep 2006 04:49:46 -0000	1.14
***************
*** 160,168 ****
       *  @return	Returns the number of records this job goint to process.
       */
!     public int getExpectedRecordsCount()
      {
          logger.trace("Entering getExpectedRecordsCount");
          
!         int expectedRecordsCount=0;
          String jobLoaderName=super.getJobName()+"_Loader";
          PoolJobLoader jobLoader=(PoolJobLoader)this.jobProcessorsMap.get(jobLoaderName);
--- 160,168 ----
       *  @return	Returns the number of records this job goint to process.
       */
!     public long getExpectedRecordsCount()
      {
          logger.trace("Entering getExpectedRecordsCount");
          
!         long expectedRecordsCount=0;
          String jobLoaderName=super.getJobName()+"_Loader";
          PoolJobLoader jobLoader=(PoolJobLoader)this.jobProcessorsMap.get(jobLoaderName);
***************
*** 179,187 ****
       *  @return	Returns the number of records processed so far.
       */
!     public int getProcessedRecordsCount()
      {
          logger.trace("Entering getProcessedRecordsCount");
          
!         int processedRecordsCount=0;
          for(Iterator iterator=this.jobProcessorsMap.values().iterator();iterator.hasNext();)
          {
--- 179,187 ----
       *  @return	Returns the number of records processed so far.
       */
!     public long getProcessedRecordsCount()
      {
          logger.trace("Entering getProcessedRecordsCount");
          
!         long processedRecordsCount=0;
          for(Iterator iterator=this.jobProcessorsMap.values().iterator();iterator.hasNext();)
          {

Index: CollectionJobPool.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/controller/pool/CollectionJobPool.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CollectionJobPool.java	16 May 2006 03:15:28 -0000	1.6
--- CollectionJobPool.java	13 Sep 2006 04:49:46 -0000	1.7
***************
*** 44,48 ****
       *  Holds the number of job data objects have been loaded by job loader.
       */
!     protected int loadedJobsCount=0;
      /**
       *  Object to be pushed to the bounded buffer to denote the end of the pool.
--- 44,48 ----
       *  Holds the number of job data objects have been loaded by job loader.
       */
!     protected long loadedJobsCount=0;
      /**
       *  Object to be pushed to the bounded buffer to denote the end of the pool.
***************
*** 173,177 ****
       * @see org.jmonks.batchserver.framework.controller.pool.JobPool#getLoadedJobDataCount
       */
!     public int getLoadedJobDataCount()
      {
          return this.loadedJobsCount;
--- 173,177 ----
       * @see org.jmonks.batchserver.framework.controller.pool.JobPool#getLoadedJobDataCount
       */
!     public long getLoadedJobDataCount()
      {
          return this.loadedJobsCount;