Changeset 3851

Timestamp:

Dec 12, 2019, 1:44:06 AM (4 years ago)

Author:

Peter

Message:

merge release 0.16.3 into trunk.

Location:

trunk

Files:

• . (modified) (1 prop)
• NEWS (modified) (1 diff)
• m4/version.m4 (modified) (1 diff)
• test/scheduler.cc (modified) (3 diffs)

trunk/NEWS

@@ -12 +12 @@
 
 yat 0.16.x series from http://dev.thep.lu.se/yat/svn/branches/0.16-stable
+
+version 0.16.3 (released 12 December 2019)
+  - fixed a bug in Scheduler::Jobs (ticket #931)
+
+  A complete list of closed tickets can be found here [[br]]
+  http://dev.thep.lu.se/yat/query?status=closed&milestone=yat+0.16.3
 
 version 0.16.2 (released 13 August 2019)

trunk/m4/version.m4

@@ -91 +91 @@
 # yat-0.16.1 13:1:0
 # yat-0.16.2 13:2:0
+# yat-0.16.3 13:3:0
 #
 # *Accidently, the libtool number was not updated for yat 0.5

trunk/test/scheduler.cc

@@ -2 +2 @@
 
 /*
-  Copyright (C) 2014, 2015, 2017 Peter Johansson
+  Copyright (C) 2014, 2015, 2017, 2019 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -61 +61 @@
     suite.err() << "threads(): " << n_threads << " - expected: 2\n";
   }
+  for (size_t i=0; i<10; ++i)
+    scheduler.submit(boost::make_shared<Sleeper>(i < 4 ? 1 : 0));
+  // sleep a sec to give the Scheduler chance to process submitted jobs
+  sleep(1);
+  int n = scheduler.jobs();
+  suite.out() << "jobs: " << n << "\n";
+  if (n < 8 || n > 10) {
+    suite.add(false);
+    suite.err() << "error: jobs() returned: " << n << "; expected 8-10\n";
+  }
+
   std::vector<boost::shared_ptr<Sleeper> > sleeper;
   sleeper.reserve(4);
@@ -77 +88 @@
 
   scheduler.submit(sleeper[3]);
-  suite.out() << "jobs: " << scheduler.jobs() << "\n";
   scheduler.wait();
   return suite.return_value();