Changeset 3349

Timestamp:

Nov 13, 2014, 4:59:26 AM (9 years ago)

Author:

Peter

Message:

avoid having a std::set just to count number of jobs. refs #800

Location:

trunk/yat/utility

Files:

• Scheduler.cc (modified) (5 diffs)
• Scheduler.h (modified) (2 diffs)

trunk/yat/utility/Scheduler.cc

@@ -31 +31 @@
 
   Scheduler::Scheduler(unsigned int threads)
+    : running_jobs_(0)
   {
     assert(threads);
@@ -40 +41 @@
   void Scheduler::post_process(JobPtr job)
   {
-    running_jobs_.erase(job);
+    --running_jobs_;
+    assert(running_jobs_>=0);
     job->status_ = Job::completed;
     // check if there are jobs waiting for job
@@ -90 +92 @@
   {
     job->status_ = Job::running;
-    running_jobs_.insert(job);
+    ++running_jobs_;
+    assert(running_jobs_>0);
     queue_.push(job);
   }
@@ -97 +100 @@
   void Scheduler::submit(JobPtr job)
   {
+    // If any job has been completed since last submission,
+    // post-process the completed job
+    JobPtr completed_job;
+    while (completed_.try_pop(completed_job))
+      post_process(completed_job);
     process(job);
   }
@@ -103 +111 @@
   void Scheduler::wait(void)
   {
-    while (running_jobs_.size() || completed_.size()) {
+    while (running_jobs_ || completed_.size()) {
       JobPtr job;
       completed_.pop(job);

trunk/yat/utility/Scheduler.h

@@ -108 +108 @@
     /**
        \brief submit a \a job to Scheduler
+
+       If \a job depends on other jobs, they are also submitted to the
+       Scheduler.
      */
     void submit(boost::shared_ptr<Job> job);
@@ -149 +152 @@
 
     typedef boost::shared_ptr<Scheduler::Job> JobPtr;
-    std::set<JobPtr> running_jobs_;
+    int running_jobs_;
 
     // value lists all jobs that depend on key, i.e., key has to