diff options
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 4d2c62cd96..730cdc56ff 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -1933,7 +1933,8 @@ class Parser(multiprocessing.Process): | |||
1933 | except queue.Empty: | 1933 | except queue.Empty: |
1934 | pass | 1934 | pass |
1935 | else: | 1935 | else: |
1936 | self.results.cancel_join_thread() | 1936 | self.results.close() |
1937 | self.results.join_thread() | ||
1937 | break | 1938 | break |
1938 | 1939 | ||
1939 | if pending: | 1940 | if pending: |
@@ -1942,6 +1943,8 @@ class Parser(multiprocessing.Process): | |||
1942 | try: | 1943 | try: |
1943 | job = self.jobs.pop() | 1944 | job = self.jobs.pop() |
1944 | except IndexError: | 1945 | except IndexError: |
1946 | self.results.close() | ||
1947 | self.results.join_thread() | ||
1945 | break | 1948 | break |
1946 | result = self.parse(*job) | 1949 | result = self.parse(*job) |
1947 | # Clear the siggen cache after parsing to control memory usage, its huge | 1950 | # Clear the siggen cache after parsing to control memory usage, its huge |
@@ -2060,8 +2063,6 @@ class CookerParser(object): | |||
2060 | 2063 | ||
2061 | bb.event.fire(event, self.cfgdata) | 2064 | bb.event.fire(event, self.cfgdata) |
2062 | 2065 | ||
2063 | # Allow data left in the cancel queue to be discarded | ||
2064 | self.parser_quit.cancel_join_thread() | ||
2065 | for process in self.processes: | 2066 | for process in self.processes: |
2066 | self.parser_quit.put(None) | 2067 | self.parser_quit.put(None) |
2067 | 2068 | ||
@@ -2081,7 +2082,8 @@ class CookerParser(object): | |||
2081 | process.join() | 2082 | process.join() |
2082 | 2083 | ||
2083 | self.parser_quit.close() | 2084 | self.parser_quit.close() |
2084 | self.parser_quit.join_thread() | 2085 | # Allow data left in the cancel queue to be discarded |
2086 | self.parser_quit.cancel_join_thread() | ||
2085 | 2087 | ||
2086 | sync = threading.Thread(target=self.bb_cache.sync) | 2088 | sync = threading.Thread(target=self.bb_cache.sync) |
2087 | self.syncthread = sync | 2089 | self.syncthread = sync |