Merge pull request #2646 from nab880/setCpuMaskFix

Add missing setCpumask/setThreadId definitions and reassignCores virt…

Author: jpkenny

src/sst/elements/mercury/components/compute_library/operating_system_cl.cc

@@ -79,5 +79,16 @@ OperatingSystemCL::execute(COMP_FUNC func, Event *data, int nthr)
   }
 }
 
+void
+OperatingSystemCL::reassignCores(Thread *thr)
+{
+  int ncores = thr->numActiveCcores();
+  //this is not equivalent to a no-op
+  //I could release cores - then based on changes
+  //to the cpumask, reserve different cores
+  compute_sched_->releaseCores(ncores, thr);
+  compute_sched_->reserveCores(ncores, thr);
+}
+
 } // namespace Hg
 } // namespace SST

src/sst/elements/mercury/components/compute_library/operating_system_cl.h

@@ -54,6 +54,8 @@ class OperatingSystemCL : public OperatingSystemCLAPI, public OperatingSystemImp
 
   void execute(COMP_FUNC, Event *data, int nthr = 1) override;
 
+  void reassignCores(Thread* thr) override;
+
   static size_t stacksize() {
     return sst_hg_global_stacksize;
   }

src/sst/elements/mercury/components/operating_system_api.h

@@ -120,6 +120,8 @@ class OperatingSystemAPI : public SST::Hg::SubComponent {
    virtual void unregisterEventLib(Library *lib) = 0;
 
    virtual void handleRequest(Request *req) = 0;
+
+   virtual void reassignCores(Thread* thr) { }
 };
 
 } // namespace Hg

src/sst/elements/mercury/operating_system/process/thread.cc

@@ -240,6 +240,19 @@ Thread::~Thread()
   //if (host_timer_) delete host_timer_;
 }
 
+void
+Thread::setCpumask(uint64_t cpumask)
+{
+  cpumask_ = cpumask;
+  os_->reassignCores(this);
+}
+
+void
+Thread::setThreadId(int thr)
+{
+  thread_id_ = thr;
+}
+
 void
 Thread::startThread(Thread* thr)
 {