mirrors/tar
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/tar.git synced 2026-04-28 12:17:07 +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:42:02 -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

14
src/buffer.c
View File

@@ -890,7 +890,7 @@ _flush_write (void)
{
idx_t delta = status - map->start * BLOCKSIZE;
idx_t diff;
map->nblocks += delta / BLOCKSIZE;
map->nblocks += delta >> LG_BLOCKSIZE;
if (delta > map->sizeleft)
delta = map->sizeleft;
map->sizeleft -= delta;
@@ -970,7 +970,7 @@ short_read (idx_t status)
&& record_start_block == 0 && status != 0
&& archive_is_dev ())
{
idx_t rsize = status / BLOCKSIZE;
idx_t rsize = status >> LG_BLOCKSIZE;
paxwarn (0,
ngettext ("Record size = %td block",
"Record size = %td blocks",
@@ -1006,8 +1006,8 @@ short_read (idx_t status)
more += status;
}
record_end = record_start + (record_size - left) / BLOCKSIZE;
short_read_slop = (record_size - left) % BLOCKSIZE;
record_end = record_start + ((record_size - left) >> LG_BLOCKSIZE);
short_read_slop = (record_size - left) & (BLOCKSIZE - 1);
records_read++;
}
@@ -1116,7 +1116,7 @@ seek_archive (off_t size)
paxfatal (0, _("rmtlseek not stopped at a record boundary"));
/* Convert to number of records */
offset /= BLOCKSIZE;
offset >>= LG_BLOCKSIZE;
/* Compute number of skipped blocks */
nblk = offset - start;
@@ -1966,13 +1966,13 @@ _gnu_flush_write (idx_t buffer_level)
memcpy (header->buffer, copy_ptr, bufsize);
copy_ptr += bufsize;
copy_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, copy_ptr, copy_size);
memset (header->buffer + copy_size, 0, bufsize - copy_size);
set_next_block_after (header + (copy_size - 1) / BLOCKSIZE);
set_next_block_after (header + ((copy_size - 1) >> LG_BLOCKSIZE));
find_next_block ();
}