Changeset 3823 for trunk/yat/utility/Scheduler.h

Timestamp:

Jul 16, 2019, 4:11:48 AM (4 years ago)

Author:

Peter

Message:

Merge release 0.16 into trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• yat/utility/Scheduler.h (modified) (7 diffs)

trunk/yat/utility/Scheduler.h

@@ -5 +5 @@
 
 /*
-  Copyright (C) 2014, 2015, 2016, 2017 Peter Johansson
+  Copyright (C) 2014, 2015, 2016, 2017, 2019 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -23 +23 @@
 */
 
-#include "config_public.h"
 #include "PriorityQueue.h"
 #include "Queue.h"
@@ -31 +30 @@
 #include <boost/shared_ptr.hpp>
 
-#ifdef YAT_HAVE_ATOMIC
-#include <atomic>
-#endif
 #include <set>
 #include <deque>
@@ -87 +83 @@
   class Scheduler
   {
-#ifdef YAT_HAVE_ATOMIC
-    typedef std::atomic<int> running_jobs_type;
-#else
-    typedef int running_jobs_type;
-#endif
   public:
     /**
@@ -218 +209 @@
     }; // end class Worker
 
+
+    class JobHandlerData
+    {
+    public:
+      /// thread-safe class around int
+      class Count
+      {
+      public:
+        /// Constructor
+        explicit Count(int x=0);
+        /// increase value with 1
+        void decrement(void);
+        /// return value
+        int get(void) const;
+        /// decrease value with 1
+        void increment(void);
+        /// modify value
+        void set(int x);
+      private:
+        mutable boost::mutex mutex_;
+        int x_;
+      };
+
+      JobHandlerData(unsigned int threads);
+      Queue<boost::exception_ptr>& error(void) const;
+
+      const Queue<JobPtr>& jobs(void) const;
+      Queue<JobPtr>& jobs(void);
+      const JobQueue& queue(void) const;
+      JobQueue& queue(void);
+
+      const Count& job_count(void) const;
+      Count& job_count(void);
+
+      const Count& running_jobs(void) const;
+      Count& running_jobs(void);
+
+      const Count& threads(void) const;
+      Count& threads(void);
+    private:
+      mutable Queue<boost::exception_ptr> error_;
+      Queue<JobPtr> jobs_;
+      JobQueue queue_;
+
+      Count job_count_;
+      Count running_jobs_;
+      Count threads_;
+    };
+
+
     // \internal Class that handles job
     class JobHandler
     {
     public:
-      JobHandler(unsigned int threads, JobQueue& queue, Queue<JobPtr>& jobs,
-                 running_jobs_type& running_jobs,
-                 Queue<boost::exception_ptr>& error);
+      JobHandler(JobHandlerData& data);
 
       void operator()(void);
@@ -237 +276 @@
 
       void send2queue(JobPtr& job);
-      unsigned int threads_;
-      JobQueue& queue_;
-      Queue<JobPtr>& jobs_;
-      running_jobs_type& running_jobs_;
-      Queue<boost::exception_ptr>& error_;
-      int job_counter_;
+
+      JobHandlerData* data_;
     };
 
@@ -263 +298 @@
     void throw_if_error(void) const;
 
-    JobQueue queue_;
-    Queue<JobPtr> jobs_;
-    running_jobs_type running_jobs_;
-    mutable Queue<boost::exception_ptr> error_;
+    JobHandlerData data_;
     boost::thread job_handler_;
   }; // end class Scheduler