summaryrefslogtreecommitdiff
path: root/lib/sqfs/data_writer/winpthread.c
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2020-01-24 11:56:20 +0100
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2020-01-24 16:15:47 +0100
commitf7c29ffee7fdd61470fd879cfae470534423c0c7 (patch)
tree81688531a5ec3729e3957c50d666e2d3cb264a77 /lib/sqfs/data_writer/winpthread.c
parenta9763a118ddceaffb99eb7d89b6a2d1f56b1e9df (diff)
Cleanup: remove single use helper functions from data writer
This commit moves the single use helper functions that are called from worker thread context into the worker thread function. Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib/sqfs/data_writer/winpthread.c')
-rw-r--r--lib/sqfs/data_writer/winpthread.c34
1 files changed, 31 insertions, 3 deletions
diff --git a/lib/sqfs/data_writer/winpthread.c b/lib/sqfs/data_writer/winpthread.c
index bba5894..e575859 100644
--- a/lib/sqfs/data_writer/winpthread.c
+++ b/lib/sqfs/data_writer/winpthread.c
@@ -38,20 +38,48 @@ static THREAD_TYPE worker_proc(THREAD_ARG arg)
{
compress_worker_t *worker = arg;
sqfs_data_writer_t *shared = worker->shared;
- sqfs_block_t *blk = NULL;
+ sqfs_block_t *it, *prev, *blk = NULL;
int status = 0;
for (;;) {
LOCK(&shared->mtx);
if (blk != NULL) {
- data_writer_store_done(shared, blk, status);
+ it = shared->done;
+ prev = NULL;
+
+ while (it != NULL) {
+ if (it->sequence_number >= blk->sequence_number)
+ break;
+ prev = it;
+ it = it->next;
+ }
+
+ if (prev == NULL) {
+ blk->next = shared->done;
+ shared->done = blk;
+ } else {
+ blk->next = prev->next;
+ prev->next = blk;
+ }
+
+ if (status != 0 && shared->status == 0)
+ shared->status = status;
SIGNAL_ALL(&shared->done_cond);
}
while (shared->queue == NULL && shared->status == 0)
AWAIT(&shared->queue_cond, &shared->mtx);
- blk = data_writer_next_work_item(shared);
+ if (shared->status == 0) {
+ blk = shared->queue;
+ shared->queue = blk->next;
+ blk->next = NULL;
+
+ if (shared->queue == NULL)
+ shared->queue_last = NULL;
+ } else {
+ blk = NULL;
+ }
UNLOCK(&shared->mtx);
if (blk == NULL)