SALOMEHPContainer getNumberOfFreePlace and allocateFor

[modules/yacs.git] / src / runtime / SalomeHPContainerTools.hxx

diff --git a/src/runtime/SalomeHPContainerTools.hxx b/src/runtime/SalomeHPContainerTools.hxx
index f3a0ccb217bc773e54d451e9b74b20c2df6c1ae7..66ac984bcd63dcc07018b4bdfe72880180214044 100644 (file)
--- a/src/runtime/SalomeHPContainerTools.hxx
+++ b/src/runtime/SalomeHPContainerTools.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2006-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2006-2020  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -17,15 +17,11 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifndef __SALOMEHPCONTAINERTOOLS_HXX__
-#define __SALOMEHPCONTAINERTOOLS_HXX__
+#pragma once
 
 #include "YACSRuntimeSALOMEExport.hxx"
 #include "SalomeContainerHelper.hxx"
 
-#include "RefCounter.hxx"
-
-#include "Mutex.hxx"
 #include "AutoRefCnt.hxx"
 
 #include <map>
@@ -39,41 +35,30 @@ namespace YACS
     class SalomeComponent;
     class SalomeHPContainer;
     class SalomeContainerMonoHelper;
-    class SalomeHPContainerVectOfHelper : public RefCounter
+    class SalomeHPContainerVectOfHelper
     {
     public:
       std::size_t size() const { return _launchModeType.size(); }
       void resize(std::size_t sz);
       std::size_t getNumberOfFreePlace() const;
-      std::size_t getNumberOfFreePlaceAmong(const std::vector<std::size_t>& idsOfKernelContainers) const;
       void allocateFor(const std::vector<const Task *>& nodes);
-      void allocateForAmong(const std::vector<std::size_t>& idsOfKernelContainers, const std::vector<const Task *>& nodes);
+      void allocateForCrude(const std::vector<std::pair<const Task *,std::size_t>>& nodes);
       void release(const Task *node);
       std::size_t locateTask(const Task *node) const;
       const SalomeContainerMonoHelper *at(std::size_t pos) const { checkPosInVec(pos); return _launchModeType[pos]; }
       SalomeContainerMonoHelper *at(std::size_t pos) { checkPosInVec(pos); return _launchModeType[pos]; }
-      const SalomeContainerMonoHelper *getHelperOfTaskThreadSafe(const Task *node) const;
+      const SalomeContainerMonoHelper *getHelperOfTaskThreadSafe(const SalomeHPContainer *cont, const Task *node) const;
       const SalomeContainerMonoHelper *getHelperOfTask(const Task *node) const;
-      SalomeContainerMonoHelper *getHelperOfTaskThreadSafe(const Task *node);
+      SalomeContainerMonoHelper *getHelperOfTaskThreadSafe(SalomeHPContainer *cont, const Task *node);
       SalomeContainerMonoHelper *getHelperOfTask(const Task *node);
-      void shutdown();
-      //! For thread safety for concurrent load operation on same Container.
-      void lock();
-      //! For thread safety for concurrent load operation on same Container.
-      void unLock();
-    public:
-      std::vector<std::string> getKernelContainerNames() const;
+      std::vector<std::string> getKernelContainerNames(const SalomeHPContainer *cont) const;
     private:
-      ~SalomeHPContainerVectOfHelper() { }
       void checkNoCurrentWork() const;
       void checkPosInVec(std::size_t pos) const;
     private:
-      YACS::BASES::Mutex _mutex;
       std::vector<bool> _whichOccupied;
       std::vector< BASES::AutoRefCnt<YACS::ENGINE::SalomeContainerMonoHelper> > _launchModeType;
       std::map<const Task *,std::size_t > _currentlyWorking;
     };
   }
 }
-
-#endif