Merge pull request #83 from sorenhein/master

Cumulative update from v2.9.0 beta to v2.9.0

ChangeLog

@@ -1,3 +1,11 @@
+Release Notes DDS 2.9.0
+-----------------------
+- Fixed crashes in certain multi-threading types
+- Added GetDDSInfo to Exports.def (thanks to Paul Barden)
+- Fixed casting problems with some compilers in ThreadMgr
+- Updated documentation
+
+
 Release Notes DDS 2.9.0 beta
 ----------------------------
 Included code for a number of multi-threading systems:

README.md

@@ -6,7 +6,7 @@ DDS offers a wide range of functions, including par-score calculations.
 
 Please refer to the [home page](http://privat.bahnhof.se/wb758135) for details.
 
-The current version is DDS 2.9.0 beta, released in May 2018 and licensed under the Apache 2.0 license in the LICENSE FILE.
+The current version is DDS 2.9.0, released in August 2018 and licensed under the Apache 2.0 license in the LICENSE FILE.
 
 Release notes are in the ChangeLog file.
 
@@ -88,7 +88,7 @@ The DDS library interface is documented. You find the docs, including a Markdown
 
 Bugs
 ====
-Version 2.9.0 beta has no known bugs.
+Version 2.9.0 has no known bugs.
 
 Please report bugs to bo.haglund@bahnhof.se and soren.hein@gmail.com.
 

src/Exports.def

@@ -6,6 +6,8 @@ EXPORTS
    SetThreading@4 = SetThreading
    SetResources
    SetResources@8 = SetResources
+   GetDDSInfo
+   GetDDSInfo@4 = GetDDSInfo
    FreeMemory
    FreeMemory@0 = FreeMemory
    ErrorMessage

src/Makefiles/Makefile_Visual

@@ -17,7 +17,7 @@
 # matters are CC_BOOST_INCL and CC_BOOST_LINK.
 # On my systems (there are two), they are here:
 
-BOOST32_PATH1	= \User\sheins\boost_1_66_0_x32_new
+BOOST32_PATH1	= \Users\heins\Libraries\Boost\boost_1_66_0_x32_new
 BOOST32_LIB1	= $(BOOST32_PATH1)\lib32-msvc-14.1
 
 BOOST32_PATH2	= \Users\s.hein\Documents\Programs\boost_1_66_0_x32_14_1

src/System.cpp

@@ -570,15 +570,10 @@ int System::RunThreadsPPLIMPL()
   (* CallbackDuplList[runCat])(* bop, uniques, crossrefs);
 
   static atomic<int> thrIdNext = 0;
-  bool err = false;
+  bool err = false, err2 = false;
 
   threadMgr.Reset(numThreads);
 
-  using namespace Concurrency;
-  Concurrency::Scheduler * sched = Concurrency::Scheduler::Create(
-    SchedulerPolicy(1, MaxConcurrency, numThreads));
-  sched->Attach();
-
   Concurrency::parallel_for_each(uniques.begin(), uniques.end(),
     [&](int &bno)
   {
@@ -595,17 +590,19 @@ int System::RunThreadsPPLIMPL()
       (* CallbackSingleList[runCat])(realThrId, bno);
 
     if (! threadMgr.Release(thrId))
-      err = true;
+      err2 = true;
   });
 
-  CurrentScheduler::Detach();
-  sched->Release();
-
   if (err)
   {
     cout << "Too many threads, numThreads " << numThreads << endl;
     return RETURN_THREAD_INDEX;
   }
+  else if (err2)
+  {
+    cout << "Release failed, numThreads " << numThreads << endl;
+    return RETURN_THREAD_INDEX;
+  }
 
   (* CallbackCopyList[runCat])(crossrefs);
 #endif

src/ThreadMgr.cpp

@@ -36,35 +36,37 @@ ThreadMgr::~ThreadMgr()
 
 void ThreadMgr::Reset(const int nThreads)
 {
-  if (nThreads > numRealThreads)
+  const unsigned n = static_cast<unsigned>(nThreads);
+  if (n > numRealThreads)
   {
-    realThreads.resize(nThreads);
-    for (int t = numRealThreads; t < nThreads; t++)
+    realThreads.resize(n);
+    for (unsigned t = numRealThreads; t < n; t++)
       realThreads[t] = false;
-    numRealThreads = nThreads;
+    numRealThreads = n;
   }
 
-  if (nThreads > numMachineThreads)
+  if (n > numMachineThreads)
   {
-    machineThreads.resize(nThreads);
-    for (int t = numMachineThreads; t < nThreads; t++)
+    machineThreads.resize(n);
+    for (unsigned t = numMachineThreads; t < n; t++)
       machineThreads[t] = -1;
-    numMachineThreads = nThreads;
+    numMachineThreads = n;
   }
 }
 
 
 int ThreadMgr::Occupy(const int machineId)
 {
-  if (machineId >= numMachineThreads)
+  const unsigned m = static_cast<unsigned>(machineId);
+  if (m >= numMachineThreads)
   {
-    numMachineThreads = machineId + 1;
+    numMachineThreads = m + 1;
     machineThreads.resize(numMachineThreads);
-    for (int t = machineId; t < numMachineThreads; t++)
+    for (unsigned t = m; t < numMachineThreads; t++)
       machineThreads[t] = -1;
   }
 
-  if (machineThreads[machineId] != -1)
+  if (machineThreads[m] != -1)
   {
     // Error: Already in use.
     return -1;
@@ -75,13 +77,14 @@ int ThreadMgr::Occupy(const int machineId)
   do
   {
     mtx.lock();
-    for (int t = 0; t < numRealThreads; t++)
+    for (unsigned t = 0; t < numRealThreads; t++)
     {
       if (realThreads[t] == false)
       {
+        const int ti = static_cast<int>(t);
         realThreads[t] = true;
-        machineThreads[machineId] = t;
-        res = t;
+        machineThreads[m] = ti;
+        res = ti;
         break;
       }
     }
@@ -102,24 +105,32 @@ int ThreadMgr::Occupy(const int machineId)
 
 bool ThreadMgr::Release(const int machineId)
 {
-  const int r = machineThreads[machineId];
+  mtx.lock();
+
+  bool ret;
+  const unsigned m = static_cast<unsigned>(machineId);
+  const int r = machineThreads[m];
+  const unsigned ru = static_cast<unsigned>(r);
+
   if (r == -1)
   {
     // Error: Not in use.
-    return false;
+    ret = false;
   }
-
-  if (! realThreads[r])
+  else if (! realThreads[ru])
   {
     // Error: Refers to a real thread that is not in use.
-    return false;
+    ret = false;
+  }
+  else
+  {
+    realThreads[ru] = false;
+    machineThreads[m] = -1;
+    ret = true;
   }
 
-  mtx.lock();
-  realThreads[r] = false;
-  machineThreads[machineId] = -1;
   mtx.unlock();
-  return true;
+  return ret;
 }
 
 
@@ -133,15 +144,15 @@ void ThreadMgr::Print(
 
   fo << tag << 
     ": Real threads occupied (out of " << numRealThreads << "):\n";
-  for (int t = 0; t < numRealThreads; t++)
+  for (unsigned t = 0; t < numRealThreads; t++)
   {
     if (realThreads[t])
       fo << t << endl;
   }
   fo << endl;
 
   fo << "Machine threads overview:\n";
-  for (int t = 0; t < numMachineThreads; t++)
+  for (unsigned t = 0; t < numMachineThreads; t++)
   {
     if (machineThreads[t] != -1)
     {

src/ThreadMgr.h

@@ -21,8 +21,8 @@ class ThreadMgr
 
     vector<bool> realThreads;
     vector<int> machineThreads;
-    int numRealThreads;
-    int numMachineThreads;
+    unsigned numRealThreads;
+    unsigned numMachineThreads;
 
   public: