Change order of file size and hashed size in manifest

I think that it makes sense to keep hash digest and hashed bytes next to
each other since they are related.

Also:

* Renamed hashed_content_size to hsize and size to fsize.
* Fixed long source lines.

diff --git a/src/ccache.c b/src/ccache.c
index 590cf866ea23dacaba9deebf3b2cfa6074f585b6..fcd7f8f0f775c5a82f4bf6ab7866b631a47cc0bf 100644 (file)
--- a/src/ccache.c
+++ b/src/ccache.c
@@ -742,13 +742,13 @@ remember_include_file(char *path, struct hash *cpp_hash, bool system,
 
                struct file_hash *h = x_malloc(sizeof(*h));
                hash_result_as_bytes(fhash, h->hash);
-               h->hashed_content_size = hash_input_size(fhash);
+               h->hsize = hash_input_size(fhash);
                hashtable_insert(included_files, path, h);
                path = NULL; // Ownership transferred to included_files.
 
                if (depend_mode_hash) {
                        hash_delimiter(depend_mode_hash, "include");
-                       char *result = format_hash_as_string(h->hash, h->hashed_content_size);
+                       char *result = format_hash_as_string(h->hash, h->hsize);
                        hash_string(depend_mode_hash, result);
                        free(result);
                }
@@ -1169,7 +1169,7 @@ object_hash_from_depfile(const char *depfile, struct hash *hash)
 
        struct file_hash *result = x_malloc(sizeof(*result));
        hash_result_as_bytes(hash, result->hash);
-       result->hashed_content_size = hash_input_size(hash);
+       result->hsize = hash_input_size(hash);
        return result;
 }
 
@@ -1366,7 +1366,7 @@ update_manifest_file(void)
 static void
 update_cached_result_globals(struct file_hash *hash)
 {
-       char *object_name = format_hash_as_string(hash->hash, hash->hashed_content_size);
+       char *object_name = format_hash_as_string(hash->hash, hash->hsize);
        cached_obj_hash = hash;
        cached_obj = get_path_in_cache(object_name, ".o");
        cached_stderr = get_path_in_cache(object_name, ".stderr");
@@ -1728,7 +1728,7 @@ get_object_name_from_cpp(struct args *args, struct hash *hash)
 
        struct file_hash *result = x_malloc(sizeof(*result));
        hash_result_as_bytes(hash, result->hash);
-       result->hashed_content_size = hash_input_size(hash);
+       result->hsize = hash_input_size(hash);
        return result;
 }
 

diff --git a/src/hashutil.c b/src/hashutil.c
index 5f2ae79166601cc3cda56fa9553b60b63d2fa46d..ed69b156640b5e69d8b60e02d45c6de012e503f0 100644 (file)
--- a/src/hashutil.c
+++ b/src/hashutil.c
@@ -40,8 +40,7 @@ strings_equal(void *str1, void *str2)
 int
 file_hashes_equal(struct file_hash *fh1, struct file_hash *fh2)
 {
-       return memcmp(fh1->hash, fh2->hash, 16) == 0
-              && fh1->hashed_content_size == fh2->hashed_content_size;
+       return memcmp(fh1->hash, fh2->hash, 16) == 0 && fh1->hsize == fh2->hsize;
 }
 
 // Search for the strings "__DATE__" and "__TIME__" in str.

diff --git a/src/hashutil.h b/src/hashutil.h
index 3dc7ab9a72f5819dc0c3ef52fd77503a14c8afdc..5ff2d3912618a55d2e7c62f9e200aee7341839b1 100644 (file)
--- a/src/hashutil.h
+++ b/src/hashutil.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2018 Joel Rosdahl
+// Copyright (C) 2009-2019 Joel Rosdahl
 //
 // This program is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
@@ -24,7 +24,7 @@
 struct file_hash
 {
        uint8_t hash[16];
-       uint32_t hashed_content_size;
+       uint32_t hsize;
 };
 
 unsigned hash_from_string(void *str);

diff --git a/src/manifest.c b/src/manifest.c
index 83288512c399bc4dd5a6312abb6480b26b5693c3..b783353b58dad7e3414d1aee1e5f5459872d9ff4 100644 (file)
--- a/src/manifest.c
+++ b/src/manifest.c
@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2018 Joel Rosdahl
+// Copyright (C) 2009-2019 Joel Rosdahl
 //
 // This program is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
@@ -24,40 +24,41 @@
 
 // Sketchy specification of the manifest disk format:
 //
-// <magic>                     magic number                        (4 bytes)
-// <version>                   file format version                 (1 byte unsigned int)
-// <hash_size>                 size of the hash fields (in bytes)  (1 byte unsigned int)
-// <reserved>                  reserved for future use             (2 bytes)
+// <magic>         magic number                        (4 bytes)
+// <version>       file format version                 (1 byte unsigned int)
+// <hash_size>     size of the hash fields (in bytes)  (1 byte unsigned int)
+// <reserved>      reserved for future use             (2 bytes)
 // ----------------------------------------------------------------------------
-// <n>                         number of include file paths        (4 bytes unsigned int)
-// <path_0>                    path to include file                (NUL-terminated string,
+// <n>             number of include file paths        (4 bytes unsigned int)
+// <path_0>        path to include file                (NUL-terminated string,
 // ...                                                  at most 1024 bytes)
 // <path_n-1>
 // ----------------------------------------------------------------------------
-// <n>                         number of include file hash entries (4 bytes unsigned int)
-// <index[0]>                  index of include file path          (4 bytes unsigned int)
-// <hash[0]>                   hash of include file                (<hash_size> bytes)
-// <size[0]>                   size of include file                (8 bytes unsigned int)
-// <hashed_content_size[0]>    bytes passed through hash function  (4 bytes unsigned int)
-// <mtime[0]>                  mtime of include file               (8 bytes signed int)
-// <ctime[0]>                  ctime of include file               (8 bytes signed int)
+// <n>             number of include file hash entries (4 bytes unsigned int)
+// <index[0]>      index of include file path          (4 bytes unsigned int)
+// <hash[0]>       hash of include file                (<hash_size> bytes)
+// <hsize[0]>      hashed bytes                        (4 bytes unsigned int)
+// <fsize[0]>      size of include file                (8 bytes unsigned int)
+// <mtime[0]>      mtime of include file               (8 bytes signed int)
+// <ctime[0]>      mtime of include file               (8 bytes signed int)
 // ...
 // <index[n-1]>
 // <hash[n-1]>
-// <size[n-1]>
+// <hsize[n-1]>
+// <fsize[n-1]>
 // <mtime[n-1]>
 // <ctime[n-1]>
 // ----------------------------------------------------------------------------
-// <n>                         number of object name entries       (4 bytes unsigned int)
-// <m[0]>                      number of include file hash indexes (4 bytes unsigned int)
-// <index[0][0]>               include file hash index             (4 bytes unsigned int)
+// <n>             number of object name entries       (4 bytes unsigned int)
+// <m[0]>          number of include file hash indexes (4 bytes unsigned int)
+// <index[0][0]>   include file hash index             (4 bytes unsigned int)
 // ...
 // <index[0][m[0]-1]>
-// <hash[0]>                   hash part of object name            (<hash_size> bytes)
-// <size[0]>                   size part of object name            (4 bytes unsigned int)
+// <hash[0]>       hash part of object name            (<hash_size> bytes)
+// <size[0]>       size part of object name            (4 bytes unsigned int)
 // ...
-// <m[n-1]>                    number of include file hash indexes
-// <index[n-1][0]>             include file hash index
+// <m[n-1]>        number of include file hash indexes
+// <index[n-1][0]> include file hash index
 // ...
 // <index[n-1][m[n-1]]>
 // <hash[n-1]>
@@ -75,10 +76,10 @@ struct file_info {
        uint32_t index;
        // Hash of referenced file.
        uint8_t hash[16];
-       // Hashed content byte count
-       uint32_t hashed_content_size;
+       // Hashed content byte count.
+       uint32_t hsize;
        // Size of referenced file.
-       uint64_t size;
+       uint64_t fsize;
        // mtime of referenced file.
        int64_t mtime;
        // ctime of referenced file.
@@ -137,8 +138,8 @@ file_infos_equal(void *key1, void *key2)
        struct file_info *fi2 = (struct file_info *)key2;
        return fi1->index == fi2->index
               && memcmp(fi1->hash, fi2->hash, 16) == 0
-              && fi1->size == fi2->size
-              && fi1->hashed_content_size == fi2->hashed_content_size
+              && fi1->hsize == fi2->hsize
+              && fi1->fsize == fi2->fsize
               && fi1->mtime == fi2->mtime
               && fi1->ctime == fi2->ctime;
 }
@@ -265,8 +266,8 @@ read_manifest(gzFile f)
        for (uint32_t i = 0; i < mf->n_file_infos; i++) {
                READ_INT(4, mf->file_infos[i].index);
                READ_BYTES(mf->hash_size, mf->file_infos[i].hash);
-               READ_INT(8, mf->file_infos[i].size);
-               READ_INT(4, mf->file_infos[i].hashed_content_size);
+               READ_INT(4, mf->file_infos[i].hsize);
+               READ_INT(8, mf->file_infos[i].fsize);
                READ_INT(8, mf->file_infos[i].mtime);
                READ_INT(8, mf->file_infos[i].ctime);
        }
@@ -282,7 +283,7 @@ read_manifest(gzFile f)
                        READ_INT(4, mf->objects[i].file_info_indexes[j]);
                }
                READ_BYTES(mf->hash_size, mf->objects[i].hash.hash);
-               READ_INT(4, mf->objects[i].hash.hashed_content_size);
+               READ_INT(4, mf->objects[i].hash.hsize);
        }
 
        return mf;
@@ -340,8 +341,8 @@ write_manifest(gzFile f, const struct manifest *mf)
        for (uint32_t i = 0; i < mf->n_file_infos; i++) {
                WRITE_INT(4, mf->file_infos[i].index);
                WRITE_BYTES(mf->hash_size, mf->file_infos[i].hash);
-               WRITE_INT(8, mf->file_infos[i].size);
-               WRITE_INT(4, mf->file_infos[i].hashed_content_size);
+               WRITE_INT(4, mf->file_infos[i].hsize);
+               WRITE_INT(8, mf->file_infos[i].fsize);
                WRITE_INT(8, mf->file_infos[i].mtime);
                WRITE_INT(8, mf->file_infos[i].ctime);
        }
@@ -353,7 +354,7 @@ write_manifest(gzFile f, const struct manifest *mf)
                        WRITE_INT(4, mf->objects[i].file_info_indexes[j]);
                }
                WRITE_BYTES(mf->hash_size, mf->objects[i].hash.hash);
-               WRITE_INT(4, mf->objects[i].hash.hashed_content_size);
+               WRITE_INT(4, mf->objects[i].hash.hsize);
        }
 
        return 1;
@@ -383,8 +384,7 @@ verify_object(struct conf *conf, struct manifest *mf, struct object *obj,
                        hashtable_insert(stated_files, x_strdup(path), st);
                }
 
-               // Compare actual file sizes
-               if (fi->size != st->size) {
+               if (fi->fsize != st->size) {
                        return 0;
                }
 
@@ -431,12 +431,12 @@ verify_object(struct conf *conf, struct manifest *mf, struct object *obj,
                        }
                        actual = x_malloc(sizeof(*actual));
                        hash_result_as_bytes(hash, actual->hash);
-                       actual->hashed_content_size = hash_input_size(hash);
+                       actual->hsize = hash_input_size(hash);
                        hashtable_insert(hashed_files, x_strdup(path), actual);
                        hash_free(hash);
                }
                if (memcmp(fi->hash, actual->hash, mf->hash_size) != 0
-                   || fi->hashed_content_size != actual->hashed_content_size) {
+                   || fi->hsize != actual->hsize) {
                        return 0;
                }
        }
@@ -498,7 +498,7 @@ get_file_hash_index(struct manifest *mf,
        struct file_info fi;
        fi.index = get_include_file_index(mf, path, mf_files);
        memcpy(fi.hash, file_hash->hash, sizeof(fi.hash));
-       fi.hashed_content_size = file_hash->hashed_content_size;
+       fi.hsize = file_hash->hsize;
 
        // file_stat.st_{m,c}time has a resolution of 1 second, so we can cache the
        // file's mtime and ctime only if they're at least one second older than
@@ -517,11 +517,11 @@ get_file_hash_index(struct manifest *mf,
                        fi.mtime = -1;
                        fi.ctime = -1;
                }
-               fi.size = file_stat.st_size;
+               fi.fsize = file_stat.st_size;
        } else {
                fi.mtime = -1;
                fi.ctime = -1;
-               fi.size = file_hash->hashed_content_size;
+               fi.fsize = file_hash->hsize;
        }
 
        uint32_t *fi_index = hashtable_search(mf_file_infos, &fi);
@@ -580,7 +580,7 @@ add_object_entry(struct manifest *mf,
        obj->file_info_indexes = x_malloc(n_fii * sizeof(*obj->file_info_indexes));
        add_file_info_indexes(obj->file_info_indexes, n_fii, mf, included_files);
        memcpy(obj->hash.hash, object_hash->hash, mf->hash_size);
-       obj->hash.hashed_content_size = object_hash->hashed_content_size;
+       obj->hash.hsize = object_hash->hsize;
 }
 
 // Try to get the object hash from a manifest file. Caller frees. Returns NULL
@@ -781,8 +781,8 @@ manifest_dump(const char *manifest_path, FILE *stream)
                hash = format_hash_as_string(mf->file_infos[i].hash, -1);
                fprintf(stream, "    Hash: %s\n", hash);
                free(hash);
-               fprintf(stream, "    File size: %"PRIu64"\n", mf->file_infos[i].size);
-               fprintf(stream, "    Hashed bytes: %u\n", mf->file_infos[i].hashed_content_size);
+               fprintf(stream, "    Hashed bytes: %u\n", mf->file_infos[i].hsize);
+               fprintf(stream, "    File size: %"PRIu64"\n", mf->file_infos[i].fsize);
                fprintf(stream, "    Mtime: %lld\n", (long long)mf->file_infos[i].mtime);
                fprintf(stream, "    Ctime: %lld\n", (long long)mf->file_infos[i].ctime);
        }
@@ -798,7 +798,7 @@ manifest_dump(const char *manifest_path, FILE *stream)
                hash = format_hash_as_string(mf->objects[i].hash.hash, -1);
                fprintf(stream, "    Hash: %s\n", hash);
                free(hash);
-               fprintf(stream, "    Size: %u\n", (unsigned)mf->objects[i].hash.hashed_content_size);
+               fprintf(stream, "    Size: %u\n", (unsigned)mf->objects[i].hash.hsize);
        }
 
        ret = true;

diff --git a/test/suites/depend.bash b/test/suites/depend.bash
index 97b7858e10aae9525c973bfff5b454c54988c044..a13f84260d41a10c2ac23380d1a14fedc49a3627 100644 (file)
--- a/test/suites/depend.bash
+++ b/test/suites/depend.bash
@@ -294,5 +294,6 @@ EOF
     expect_stat 'files in cache' 9
 
     # -------------------------------------------------------------------------
+
     # TODO: Add more test cases (see direct.bash for inspiration)
 }