[rqd] reserve all cores and report threads

proto/src/report.proto

@@ -34,7 +34,7 @@ message BootReport {
 }
 
 message CoreDetail {
-    int32 total_cores = 1;
+    int32 total_cores = 1; // physical cores
     int32 idle_cores = 2;
     int32 locked_cores = 3;
     int32 booked_cores = 4;
@@ -43,6 +43,7 @@ message CoreDetail {
     // solely on rqd's end to store a map of reserved cores, but the data was never communicated to
     // the server.
     map<int64, CoreId> reserved_cores = 5 [deprecated=true];
+    int32 total_threads = 6; // logical cores
 }
 
 message CoreId {
@@ -70,7 +71,7 @@ message RenderHost {
     bool nimby_locked = 3; // if nimby has locked the host due to user activity
     string facility= 4; // The name of the facility that the host is in
     int32 num_procs = 5; // the number of physical procs on this machine
-    int32 cores_per_proc = 6; // the number of cores per proc
+    int32 cores_per_proc = 6; // the number of physical cores per proc
     int64 total_swap = 7; // the total size of the swap in kB
     int64 total_mem = 8; // the total size of the main memory pool in kB
     int64 total_mcp = 9; // the total size of MCP in kB
@@ -85,6 +86,7 @@ message RenderHost {
     int32 num_gpus = 18; // the number of physical GPU's
     int64 free_gpu_mem = 19; // the current amount of free gpu memory in kB
     int64 total_gpu_mem = 20; // the total size of gpu memory in kB
+    int32 threads_per_proc = 21; // the number of logical cores per proc
 };
 
 message RunningFrameInfo {
@@ -107,6 +109,7 @@ message RunningFrameInfo {
     int64 used_gpu_memory = 17; // kB
     ChildrenProcStats children = 18; //additional data about the running frame's child processes
     int64 used_swap_memory = 19; // kB
+    bool use_threads = 20; // whether the frame is requesting logical or physical cores
 };
 
 message ChildrenProcStats {

rqd/rqd/__main__.py

@@ -29,6 +29,7 @@
 In /etc/opencue/rqd.conf (on Linux) or %LOCALAPPDATA%/OpenCue/rqd.conf (on Windows):
 [Override]
 OVERRIDE_CORES = 2
+OVERRIDE_THREADS = 4
 OVERRIDE_PROCS = 3
 OVERRIDE_MEMORY = 1000000
 OVERRIDE_CUEBOT = cuebot1 cuebot2 cuebot3

rqd/rqd/rqconstants.py

@@ -154,15 +154,16 @@
 if '-c' in sys.argv:
     CONFIG_FILE = sys.argv[sys.argv.index('-c') + 1]
 
-OVERRIDE_CORES = None # number of cores. ex: None or 8
-OVERRIDE_IS_DESKTOP = None # Force rqd to run in 'desktop' mode
 OVERRIDE_PROCS = None # number of physical cpus. ex: None or 2
+OVERRIDE_CORES = None # number of cores per cpu. ex: None or 8
+OVERRIDE_THREADS = None # number of threads per cpu. ex: None or 16
+OVERRIDE_IS_DESKTOP = None # Force rqd to run in 'desktop' mode
 OVERRIDE_MEMORY = None # in Kb
 OVERRIDE_NIMBY = None # True to turn on, False to turn off
 USE_NIMBY_PYNPUT = True # True pynput, False select
 OVERRIDE_HOSTNAME = None # Force to use this hostname
 ALLOW_GPU = False
-LOAD_MODIFIER = 0 # amount to add/subtract from load
+LOAD_MODIFIER = 0 # amount to add/subtract from load, makes the machine look busier to CueBot.
 
 LOG_FORMAT = '%(levelname)-9s openrqd-%(module)-10s: %(message)s'
 CONSOLE_LOG_LEVEL = logging.WARNING
@@ -207,6 +208,8 @@
             CUEBOT_GRPC_PORT = config.getint(__override_section, "CUEBOT_GRPC_PORT")
         if config.has_option(__override_section, "OVERRIDE_CORES"):
             OVERRIDE_CORES = config.getint(__override_section, "OVERRIDE_CORES")
+        if config.has_option(__override_section, "OVERRIDE_THREADS"):
+            OVERRIDE_THREADS = config.getint(__override_section, "OVERRIDE_THREADS")
         if config.has_option(__override_section, "OVERRIDE_PROCS"):
             OVERRIDE_PROCS = config.getint(__override_section, "OVERRIDE_PROCS")
         if config.has_option(__override_section, "OVERRIDE_MEMORY"):

rqd/rqd/rqcore.py

@@ -68,6 +68,7 @@ def __init__(self, optNimbyoff=False):
 
         self.cores = opencue_proto.report_pb2.CoreDetail(
             total_cores=0,
+            total_threads=0,
             idle_cores=0,
             locked_cores=0,
             booked_cores=0,
@@ -328,7 +329,10 @@ def killAllFrame(self, reason):
     def releaseCores(self, reqRelease, releaseHT=None, releaseGpus=None):
         """The requested number of cores are released
         @type  reqRelease: int
-        @param reqRelease: Number of cores to release, 100 = 1 physical core"""
+        @param reqRelease: Number of cores to release, 100 = 1 physical core
+        @type releaseHT: str
+        @param releaseHT: The hyper-threading cores to release
+        """
         with self.__threadLock:
             # pylint: disable=no-member
             self.cores.booked_cores -= reqRelease
@@ -431,9 +435,11 @@ def launchFrame(self, runFrame):
             # pylint: enable=no-member
 
             if runFrame.environment.get('CUE_THREADABLE') == '1':
-                reserveHT = self.machine.reserveHT(runFrame.num_cores)
-                if reserveHT:
-                    runFrame.attributes['CPU_LIST'] = reserveHT
+                cpu_list = self.machine.reserveCores(
+                    coresCount=runFrame.num_cores,
+                    logical=runFrame.use_threads)
+                if cpu_list:
+                    runFrame.attributes['CPU_LIST'] = cpu_list
 
             if runFrame.num_gpus:
                 reserveGpus = self.machine.reserveGpus(runFrame.num_gpus)