diff options
Diffstat (limited to 'bitbake/bin/bitbake-worker')
-rwxr-xr-x | bitbake/bin/bitbake-worker | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bitbake/bin/bitbake-worker b/bitbake/bin/bitbake-worker index 451e6926bf..609e276fe2 100755 --- a/bitbake/bin/bitbake-worker +++ b/bitbake/bin/bitbake-worker | |||
@@ -91,19 +91,19 @@ def worker_fire_prepickled(event): | |||
91 | worker_thread_exit = False | 91 | worker_thread_exit = False |
92 | 92 | ||
93 | def worker_flush(worker_queue): | 93 | def worker_flush(worker_queue): |
94 | worker_queue_int = b"" | 94 | worker_queue_int = bytearray() |
95 | global worker_pipe, worker_thread_exit | 95 | global worker_pipe, worker_thread_exit |
96 | 96 | ||
97 | while True: | 97 | while True: |
98 | try: | 98 | try: |
99 | worker_queue_int = worker_queue_int + worker_queue.get(True, 1) | 99 | worker_queue_int.extend(worker_queue.get(True, 1)) |
100 | except queue.Empty: | 100 | except queue.Empty: |
101 | pass | 101 | pass |
102 | while (worker_queue_int or not worker_queue.empty()): | 102 | while (worker_queue_int or not worker_queue.empty()): |
103 | try: | 103 | try: |
104 | (_, ready, _) = select.select([], [worker_pipe], [], 1) | 104 | (_, ready, _) = select.select([], [worker_pipe], [], 1) |
105 | if not worker_queue.empty(): | 105 | if not worker_queue.empty(): |
106 | worker_queue_int = worker_queue_int + worker_queue.get() | 106 | worker_queue_int.extend(worker_queue.get()) |
107 | written = os.write(worker_pipe, worker_queue_int) | 107 | written = os.write(worker_pipe, worker_queue_int) |
108 | worker_queue_int = worker_queue_int[written:] | 108 | worker_queue_int = worker_queue_int[written:] |
109 | except (IOError, OSError) as e: | 109 | except (IOError, OSError) as e: |
@@ -346,12 +346,12 @@ class runQueueWorkerPipe(): | |||
346 | if pipeout: | 346 | if pipeout: |
347 | pipeout.close() | 347 | pipeout.close() |
348 | bb.utils.nonblockingfd(self.input) | 348 | bb.utils.nonblockingfd(self.input) |
349 | self.queue = b"" | 349 | self.queue = bytearray() |
350 | 350 | ||
351 | def read(self): | 351 | def read(self): |
352 | start = len(self.queue) | 352 | start = len(self.queue) |
353 | try: | 353 | try: |
354 | self.queue = self.queue + (self.input.read(102400) or b"") | 354 | self.queue.extend(self.input.read(102400) or b"") |
355 | except (OSError, IOError) as e: | 355 | except (OSError, IOError) as e: |
356 | if e.errno != errno.EAGAIN: | 356 | if e.errno != errno.EAGAIN: |
357 | raise | 357 | raise |
@@ -379,7 +379,7 @@ class BitbakeWorker(object): | |||
379 | def __init__(self, din): | 379 | def __init__(self, din): |
380 | self.input = din | 380 | self.input = din |
381 | bb.utils.nonblockingfd(self.input) | 381 | bb.utils.nonblockingfd(self.input) |
382 | self.queue = b"" | 382 | self.queue = bytearray() |
383 | self.cookercfg = None | 383 | self.cookercfg = None |
384 | self.databuilder = None | 384 | self.databuilder = None |
385 | self.data = None | 385 | self.data = None |
@@ -413,7 +413,7 @@ class BitbakeWorker(object): | |||
413 | if len(r) == 0: | 413 | if len(r) == 0: |
414 | # EOF on pipe, server must have terminated | 414 | # EOF on pipe, server must have terminated |
415 | self.sigterm_exception(signal.SIGTERM, None) | 415 | self.sigterm_exception(signal.SIGTERM, None) |
416 | self.queue = self.queue + r | 416 | self.queue.extend(r) |
417 | except (OSError, IOError): | 417 | except (OSError, IOError): |
418 | pass | 418 | pass |
419 | if len(self.queue): | 419 | if len(self.queue): |