diff options
| author | Phillip Lougher <phillip@squashfs.org.uk> | 2013-05-29 02:38:41 +0100 |
|---|---|---|
| committer | Phillip Lougher <phillip@squashfs.org.uk> | 2013-05-29 02:38:41 +0100 |
| commit | 2f3a085d55aec92881f1c04c38f3490c26f8136e (patch) | |
| tree | 372027095064f25500ebf63483eef38cf5bf5e10 | |
| parent | ec1ff063d69649b918e403ae4107ba66f66bc489 (diff) | |
| download | squashfs-tools-2f3a085d55aec92881f1c04c38f3490c26f8136e.tar.gz | |
mksquashfs: rename from_reader queue to to_deflate
The from_reader queue used to collect all the data queued from
the reader thread (hence its name). Data from the reader thread
is now queued to the to_main queue (uncompressed fragments etc.) and
to the from_reader queue, which is now soley used to queue
blocks to the deflator thread(s). So rename to to_deflate which
now more accurately reflects how it is used.
Signed-off-by: Phillip Lougher <phillip@squashfs.org.uk>
| -rw-r--r-- | squashfs-tools/info.c | 2 | ||||
| -rw-r--r-- | squashfs-tools/mksquashfs.c | 8 | ||||
| -rw-r--r-- | squashfs-tools/mksquashfs.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/squashfs-tools/info.c b/squashfs-tools/info.c index b75199d..b108cec 100644 --- a/squashfs-tools/info.c +++ b/squashfs-tools/info.c @@ -94,7 +94,7 @@ void dump_state() printf("===========================\n"); printf("file buffer queue (reader thread -> deflate thread(s))\n"); - dump_queue(from_reader); + dump_queue(to_deflate); printf("uncompressed fragment queue (reader thread -> main" " thread)\n"); diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c index a045e0d..aebbcb2 100644 --- a/squashfs-tools/mksquashfs.c +++ b/squashfs-tools/mksquashfs.c @@ -277,7 +277,7 @@ unsigned int uid_count = 0, guid_count = 0; unsigned int sid_count = 0, suid_count = 0, sguid_count = 0; struct cache *reader_buffer, *writer_buffer, *fragment_buffer; -struct queue *to_reader, *from_reader, *to_writer, *from_writer, +struct queue *to_reader, *to_deflate, *to_writer, *from_writer, *to_frag, *locked_fragment; struct seq_queue *to_main; pthread_t *thread, *deflator_thread, *frag_deflator_thread; @@ -1974,7 +1974,7 @@ void put_file_buffer(struct file_buffer *file_buffer) } else if (file_buffer->file_size == 0 || file_buffer->fragment) seq_queue_put(to_main, file_buffer); else - queue_put(from_reader, file_buffer); + queue_put(to_deflate, file_buffer); } @@ -2279,7 +2279,7 @@ void *deflator(void *arg) BAD_ERROR("deflator:: compressor_init failed\n"); while(1) { - struct file_buffer *file_buffer = queue_get(from_reader); + struct file_buffer *file_buffer = queue_get(to_deflate); struct file_buffer *write_buffer; if(sparse_files && all_zero(file_buffer)) { @@ -4055,7 +4055,7 @@ void initialise_threads(int readb_mbytes, int writeb_mbytes, frag_deflator_thread = &deflator_thread[processors]; to_reader = queue_init(1); - from_reader = queue_init(reader_buffer_size); + to_deflate = queue_init(reader_buffer_size); to_writer = queue_init(writer_buffer_size); from_writer = queue_init(1); to_frag = queue_init(fragment_buffer_size); diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h index 86e984f..16e3be9 100644 --- a/squashfs-tools/mksquashfs.h +++ b/squashfs-tools/mksquashfs.h @@ -77,7 +77,7 @@ struct inode_info { #define BLOCK_OFFSET 2 extern struct cache *reader_buffer, *writer_buffer, *fragment_buffer; -extern struct queue *to_reader, *from_reader, *to_writer, *from_writer, +extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer, *to_frag, *locked_fragment; extern struct seq_queue *to_main; #endif |