@@ -42,7 +42,7 @@ CONTAIN := $(TOOLS_BIN)/contain

 check check-bison check-g++ check-gawk check-createrepo check-vagrant check-packer check-packer-ovf-plugin check-sanity \

 clean-install clean-chroot

-PARALLEL=False

+THREADS?=1

 all: iso micro-iso minimal-iso docker-image

@@ -70,7 +70,7 @@ packages-micro: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES)

                 -l $(PHOTON_LOGS_DIR) \

                 -p $(PHOTON_PUBLISH_RPMS_DIR) \

                 -j $(PHOTON_DATA_DIR)/build_install_options_micro.json \

-                -e ${PARALLEL}

+                -t ${THREADS}

 minimal: minimal-iso

@@ -96,7 +96,7 @@ packages-minimal: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES)

                 -l $(PHOTON_LOGS_DIR) \

                 -p $(PHOTON_PUBLISH_RPMS_DIR) \

                 -j $(PHOTON_DATA_DIR)/build_install_options_minimal.json \

-                -e ${PARALLEL}

+                -t ${THREADS}

 iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES)

 	@echo "Building Photon FUll ISO..."

@@ -120,7 +120,7 @@ packages: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN)

                 -l $(PHOTON_LOGS_DIR) \

                 -p $(PHOTON_PUBLISH_RPMS_DIR) \

                 -j $(PHOTON_DATA_DIR)/build_install_options_all.json \

-                -e ${PARALLEL}

+                -t ${THREADS}

 tool-chain-stage1: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN)

 	@echo "Building all RPMS..."

@@ -133,7 +133,7 @@ tool-chain-stage1: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN)

                 -l $(PHOTON_LOGS_DIR) \

                 -p $(PHOTON_PUBLISH_RPMS_DIR) \

                 -j $(PHOTON_DATA_DIR)/build_install_options_all.json \

-                -e ${PARALLEL} \

+                -t ${THREADS} \

                 -m stage1

 tool-chain-stage2: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN)

@@ -147,7 +147,7 @@ tool-chain-stage2: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN)

                 -l $(PHOTON_LOGS_DIR) \

                 -p $(PHOTON_PUBLISH_RPMS_DIR) \

                 -j $(PHOTON_DATA_DIR)/build_install_options_all.json \

-                -e ${PARALLEL} \

+                -t ${THREADS} \

                 -m stage2

@@ -28,7 +28,6 @@ class PackageManager(object):

         self.mapThreadsLaunchTime={}

         self.listAvailableCyclicPackages=[]

         self.listPackagesToBuild=[]

-        self.maxNumThreads=20

     def readPackageBuildData(self, listPackages):

         try:

@@ -93,26 +92,13 @@ class PackageManager(object):

             self.logger.error(e)

             raise e

-    def calculatePossibleNumWorkerThreads(self):

-        process = subprocess.Popen(["df" ,constants.buildRootPath],shell=True,stdout=subprocess.PIPE)

-        retval = process.wait()

-        if retval != 0:

-            self.logger.error("Unable to check free space. Unknown error.")

-            return False

-        output = process.communicate()[0]

-        device, size, used, available, percent, mountpoint = output.split("\n")[1].split()

-        c =  int(available)/600000

-        numChroots=int(c)

-        self.logger.info("Possible number of worker threads:"+str(numChroots))

-        return numChroots

-    

-    def buildToolChainPackages(self, parallelBuild):

+    def buildToolChainPackages(self, buildThreads):

         self.buildToolChain()

-        self.buildGivenPackages(constants.listToolChainPackages, parallelBuild)

+        self.buildGivenPackages(constants.listToolChainPackages, buildThreads)

-    def buildPackages(self,listPackages, parallelBuild):

-        self.buildToolChainPackages(parallelBuild)

-        self.buildGivenPackages(listPackages, parallelBuild)

+    def buildPackages(self,listPackages, buildThreads):

+        self.buildToolChainPackages(buildThreads)

+        self.buildGivenPackages(listPackages, buildThreads)

     def initializeThreadPool(self,statusEvent):

         ThreadPool.clear()

@@ -127,29 +113,18 @@ class PackageManager(object):

         Scheduler.setEvent(statusEvent)

         Scheduler.stopScheduling=False

-    def buildGivenPackages (self, listPackages, parallelBuild):

-        defaultThreads = 1

-        if parallelBuild == True:

-            defaultThreads = 8

-

+    def buildGivenPackages (self, listPackages, buildThreads):

         returnVal=self.calculateParams(listPackages)

         if not returnVal:

             self.logger.error("Unable to set paramaters. Terminating the package manager.")

             raise Exception("Unable to set paramaters")

         statusEvent=threading.Event()

-        numWorkerThreads=self.calculatePossibleNumWorkerThreads()

-        if numWorkerThreads > self.maxNumThreads:

-            numWorkerThreads = defaultThreads

-        if numWorkerThreads == 0:

-            self.logger.error("Unable to create worker threads. Terminating the package manager.")

-            raise Exception("No Space.")

-

         self.initializeScheduler(statusEvent)

         self.initializeThreadPool(statusEvent)

         i=0

-        while i < numWorkerThreads:

+        while i < buildThreads:

             workerName="WorkerThread"+str(i)

             ThreadPool.addWorkerThread(workerName)

             ThreadPool.startWorkerThread(workerName)

@@ -22,7 +22,7 @@ def main():

     parser.add_option("-z",  "--top-dir-path", dest="topDirPath",  default="/usr/src/photon")

     parser.add_option("-j",  "--json-file", dest="inputJSONFile",  default="../../common/data/build_install_options_all.json")

     parser.add_option("-b",  "--build-root-path", dest="buildRootPath",  default="/mnt")

-    parser.add_option("-e",  "--parallel-build", dest="parallelBuild",  default=False)

+    parser.add_option("-t",  "--threads", dest="buildThreads",  default=1, type="int", help="Numbeer of working threads")

     parser.add_option("-m",  "--tool-chain-stage", dest="toolChainStage",  default="None")

     (options,  args) = parser.parse_args()

@@ -30,11 +30,6 @@ def main():

     if not os.path.isdir(options.logPath):

         cmdUtils.runCommandInShell("mkdir -p "+options.logPath)

-    if options.parallelBuild in ["TRUE", "True", "true"]:

-        parallelBuild = True

-    else:

-        parallelBuild = False

-

     logger=Logger.getLogger(options.logPath+"/Main")

     errorFlag=False

@@ -113,11 +108,11 @@ def main():

             pkgManager.buildToolChain()

         elif options.toolChainStage == "stage2":

             pkgManager = PackageManager()

-            pkgManager.buildToolChainPackages(parallelBuild)

+            pkgManager.buildToolChainPackages(options.buildThreads)

         elif options.installPackage:

-            buildAPackage(package, parallelBuild)

+            buildAPackage(package, options.buildThreads)

         else:

-            buildPackagesFromGivenJSONFile(options.inputJSONFile, options.buildOption,logger, parallelBuild)

+            buildPackagesFromGivenJSONFile(options.inputJSONFile, options.buildOption,logger, options.buildThreads)

     except Exception as e:

         logger.error("Caught an exception")

         logger.error(str(e))

@@ -125,19 +120,19 @@ def main():

     sys.exit(0)

-def buildToolChain(parallelBuild):

+def buildToolChain(buildThreads):

     listPackages=[]

     listPackages.append(package)

     pkgManager = PackageManager()

-    pkgManager.buildPackages(listPackages, parallelBuild)

+    pkgManager.buildPackages(listPackages, buildThreads)

-def buildAPackage(package, parallelBuild):

+def buildAPackage(package, buildThreads):

     listPackages=[]

     listPackages.append(package)

     pkgManager = PackageManager()

-    pkgManager.buildPackages(listPackages, parallelBuild)

+    pkgManager.buildPackages(listPackages, buildThreads)

-def buildPackagesFromGivenJSONFile(inputJSONFile,buildOption,logger, parallelBuild):

+def buildPackagesFromGivenJSONFile(inputJSONFile,buildOption,logger, buildThreads):

     listPackages = get_all_package_names(inputJSONFile)

     listPackagesToBuild=[]

@@ -147,7 +142,7 @@ def buildPackagesFromGivenJSONFile(inputJSONFile,buildOption,logger, parallelBui

     logger.info("List of packages to build:")

     logger.info(listPackagesToBuild)

     pkgManager = PackageManager()

-    pkgManager.buildPackages(listPackagesToBuild, parallelBuild)

+    pkgManager.buildPackages(listPackagesToBuild, buildThreads)

 def get_all_package_names(build_install_option):

     base_path = os.path.dirname(build_install_option)