mirrors/tar
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/tar.git synced 2026-08-19 07:46:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add LG_BLOCKSIZE to omit some *, % ops

Browse Source 
* src/buffer.c (_flush_write, short_read, seek_archive)
(_gnu_flush_write):
* src/create.c (write_gnu_long_link, dump_regular_file)
(dump_dir0):
* src/delete.c (write_recent_bytes, flush_file)
(delete_archive_members):
* src/list.c (read_header):
* src/sparse.c (sparse_dump_region, sparse_extract_region)
(pax_dump_header_1):
* src/tar.c (parse_opt):
* src/update.c (append_file):
Prefer shifting and masking to dividing and remaindering by
BLOCKSIZE.  This reclaims some compiler optimizations lost
by our recent preference for signed integers.
* src/tar.h (LG_BLOCKSIZE): New constant, for shifting.
This commit is contained in:
Paul Eggert
2024-11-02 13:43:05 -07:00
parent 568919d77b
commit a6cf78b0fa
8 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/create.c
+6 -6
View File
@@ -543,13 +543,13 @@ write_gnu_long_link (struct tar_stat_info *st, const char *p, char type)
memcpy (header->buffer, p, bufsize);
p += bufsize;
size -= bufsize;
set_next_block_after (header + (bufsize - 1) / BLOCKSIZE);
set_next_block_after (header + ((bufsize - 1) >> LG_BLOCKSIZE));
header = find_next_block ();
bufsize = available_space_after (header);
}
memcpy (header->buffer, p, size);
memset (header->buffer + size, 0, bufsize - size);
set_next_block_after (header + (size - 1) / BLOCKSIZE);
set_next_block_after (header + ((size - 1) >> LG_BLOCKSIZE));
}
static int
@@ -1041,7 +1041,7 @@ dump_regular_file (int fd, struct tar_stat_info *st)
{
/* Last read -- zero out area beyond. */
bufsize = size_left;
idx_t beyond = bufsize % BLOCKSIZE;
idx_t beyond = bufsize & (BLOCKSIZE - 1);
if (beyond)
memset (blk->buffer + size_left, 0, BLOCKSIZE - beyond);
}
@@ -1049,7 +1049,7 @@ dump_regular_file (int fd, struct tar_stat_info *st)
idx_t count = (fd <= 0 ? bufsize
: blocking_read (fd, blk->buffer, bufsize));
size_left -= count;
set_next_block_after (blk + (bufsize - 1) / BLOCKSIZE);
set_next_block_after (blk + ((bufsize - 1) >> LG_BLOCKSIZE));
if (count != bufsize)
{
@@ -1130,14 +1130,14 @@ dump_dir0 (struct tar_stat_info *st, char const *directory)
if (size_left < bufsize)
{
bufsize = size_left;
idx_t count = bufsize % BLOCKSIZE;
idx_t count = bufsize & (BLOCKSIZE - 1);
if (count)
memset (blk->buffer + size_left, 0, BLOCKSIZE - count);
}
memcpy (blk->buffer, p_buffer, bufsize);
size_left -= bufsize;
p_buffer += bufsize;
set_next_block_after (blk + (bufsize - 1) / BLOCKSIZE);
set_next_block_after (blk + ((bufsize - 1) >> LG_BLOCKSIZE));
}
}
return;