From: JinWang An Date: Tue, 3 Aug 2021 07:16:31 +0000 (+0900) Subject: Imported Upstream version 3.2.1 X-Git-Tag: upstream/3.2.1^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=335f2c0f9f8337f0f8b5d7ecaf4c38f67b77b5f5;p=platform%2Fupstream%2Fccache.git Imported Upstream version 3.2.1 --- diff --git a/AUTHORS.html b/AUTHORS.html index 0ddc35c..f6931c2 100644 --- a/AUTHORS.html +++ b/AUTHORS.html @@ -734,7 +734,7 @@ asciidoc.install(2);

ccache authors

-version 3.2 +version 3.2.1

Table of Contents

@@ -960,8 +960,8 @@ Yiding Jia <yiding@fb.com>

diff --git a/INSTALL.html b/INSTALL.html index 3f29e9f..734cbc4 100644 --- a/INSTALL.html +++ b/INSTALL.html @@ -734,7 +734,7 @@ asciidoc.install(2);

ccache installation

-version 3.2 +version 3.2.1

Table of Contents

@@ -853,8 +853,8 @@ above.

diff --git a/LICENSE.html b/LICENSE.html index aea9be7..6def0cd 100644 --- a/LICENSE.html +++ b/LICENSE.html @@ -734,7 +734,7 @@ asciidoc.install(2);

ccache copyright and license

-version 3.2 +version 3.2.1

Table of Contents

@@ -1205,8 +1205,8 @@ following license:

diff --git a/MANUAL.html b/MANUAL.html index 82707f6..57a922d 100644 --- a/MANUAL.html +++ b/MANUAL.html @@ -734,7 +734,7 @@ asciidoc.install(2);

CCACHE(1)

-version 3.2 +version 3.2.1

Table of Contents

@@ -1301,12 +1301,22 @@ the prefix_command setting if possible. See

-stats (CCACHE_STATS) [boolean] +max_files (CCACHE_MAXFILES)

- If true, ccache will update the statistics counters on each compilation. - The default is true. + This option specifies the maximum number of files to keep in the cache. Use + 0 for no limit (which is the default). +

+max_size (CCACHE_MAXSIZE) +

+ This option specifies the maximum size of the cache. Use 0 for no limit. + The default value is 5G. Available suffixes: k, M, G, T (decimal) and Ki, + Mi, Gi, Ti (binary). The default suffix is "G".

@@ -1353,7 +1363,7 @@ the prefix_command setting if possible. See

-reache (CCACHE_RECACHE) [boolean] +recache (CCACHE_RECACHE) [boolean]

@@ -1447,6 +1457,15 @@ the prefix_command setting if possible. See information.

+stats (CCACHE_STATS) [boolean] +

+ If true, ccache will update the statistics counters on each compilation. + The default is true. +

temporary_dir (CCACHE_TEMPDIR)

@@ -2141,8 +2160,8 @@ maintained by Joel Rosdahl. See AUTHORS.txt or AUTHORS.html and

diff --git a/MANUAL.txt b/MANUAL.txt index dd0c969..4ac113e 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -376,10 +376,16 @@ WRAPPERS>>. If set to a file path, ccache will write information on what it is doing to the specified file. This is useful for tracking down problems. -*stats* (*CCACHE_STATS*) [boolean]:: +*max_files* (*CCACHE_MAXFILES*):: - If true, ccache will update the statistics counters on each compilation. - The default is true. + This option specifies the maximum number of files to keep in the cache. Use + 0 for no limit (which is the default). + +*max_size* (*CCACHE_MAXSIZE*):: + + This option specifies the maximum size of the cache. Use 0 for no limit. + The default value is 5G. Available suffixes: k, M, G, T (decimal) and Ki, + Mi, Gi, Ti (binary). The default suffix is "G". *path* (*CCACHE_PATH*):: @@ -409,7 +415,7 @@ WRAPPERS>>. from the cache using the direct mode, not the preprocessor mode. See documentation for *read_only* regarding using a read-only ccache directory. -*reache* (*CCACHE_RECACHE*) [boolean]:: +*recache* (*CCACHE_RECACHE*) [boolean]:: If true, ccache will not use any previously stored result. New results will still be cached, possibly overwriting any pre-existing results. @@ -454,6 +460,11 @@ WRAPPERS>>. See the discussion under <<_troubleshooting,TROUBLESHOOTING>> for more information. +*stats* (*CCACHE_STATS*) [boolean]:: + + If true, ccache will update the statistics counters on each compilation. + The default is true. + *temporary_dir* (*CCACHE_TEMPDIR*):: This setting specifies where ccache will put temporary files. The default diff --git a/NEWS.html b/NEWS.html index f90da22..912ecec 100644 --- a/NEWS.html +++ b/NEWS.html @@ -734,7 +734,7 @@ asciidoc.install(2);

ccache news

-version 3.2 +version 3.2.1

Table of Contents

@@ -742,6 +742,47 @@ asciidoc.install(2);

ccache 3.2.1

Release date: 2014-12-10

Bug fixes

+
+Fixed regression in temporary file handling, which lead to incorrect + permissions for stats, manifest and ccache.conf files in the cache. +
+
+
+CACHEDIR.TAG files are now created in the [0-9a-f] subdirectories so that + ccache.conf is not lost in backups. +
+
+
+Made the default cache size suffix G, as previously documented. +
+
+
+-fdiagnostics-color=auto is now passed to the compiler even if stderr is + redirected. This fixes a problem when, for instance, a configure test probes + if the compiler (wrapped via ccache) supports -fdiagnostics-color=auto. +
+
+
+Added missing documentation for max_files and max_size configuration + options. +
+

ccache 3.2

Release date: 2014-11-17

@@ -937,7 +978,7 @@ Various other improvements of the test suite.

Bug fixes

@@ -1020,7 +1061,7 @@ Stale files in the internal temporary directory (<ccache_dir>/tmp


 
-Bug fixes
+Bug fixes
 
 
 
@@ -1060,7 +1101,7 @@ Fixed problem with logging of current working directory.
 

 Release date: 2013-01-06
 
-Bug fixes
+Bug fixes
 
 
 
@@ -1131,7 +1172,7 @@ Clang plugins are now hashed to catch plugin upgrades.
 
 
 
-Bug fixes
+Bug fixes
 
 
 
@@ -1179,7 +1220,7 @@ Fixed static_assert macro definition clash with GCC 4.7.
 

 Release date: 2012-01-08
 
-Bug fixes
+Bug fixes
 
 
 
@@ -1262,7 +1303,7 @@ Rewrite argument to --sysroot if CCACHE_BASEDIR is use
 
 
 
-Bug fixes
+Bug fixes
 
 
 
@@ -1315,7 +1356,7 @@ Improved order of statistics counters in ccache -s output.
 
 
 
-Bug fixes
+Bug fixes
 
 
 
@@ -1348,7 +1389,7 @@ Systems that lack (and don’t need to be linked with) libm are now supporte
 

 Release date: 2011-01-09
 
-Bug fixes
+Bug fixes
 
 
 
@@ -1381,7 +1422,7 @@ The file handle in now correctly closed on write error when trying to create
 

 Release date: 2010-11-28
 
-Bug fixes
+Bug fixes
 
 
 
@@ -1408,7 +1449,7 @@ Portability fixes for HP-UX 11.00 and other esoteric systems.
 

 Release date: 2010-11-21
 
-Bug fixes
+Bug fixes
 
 
 
@@ -1456,7 +1497,7 @@ The test suite now also works on systems that lack a /dev/zero.
 

 Release date: 2010-11-07
 
-Bug fixes
+Bug fixes
 
 
 
@@ -1578,7 +1619,7 @@ Added -install_name as an option known to take an argument. (This i
 
 
 
-Bug fixes
+Bug fixes
 
 
 
@@ -1664,7 +1705,7 @@ New HACKING.txt file with some notes about ccache code conventions.
 

 Release date: 2010-07-15
 
-Bug fixes
+Bug fixes
 
 
 
@@ -1853,7 +1894,7 @@ The following options are no longer hashed in the preprocessor mode:
 
 
 
-Bug fixes
+Bug fixes
 
 
 
@@ -1998,8 +2039,8 @@ Statistics counters are now correctly updated for -E option failures and
 

 
 
-Version 3.2

-Last updated 2014-11-17 19:56:32 CET
+Version 3.2.1

+Last updated 2014-12-10 20:38:47 CET
 
 
 
diff --git a/NEWS.txt b/NEWS.txt
index c67a77d..ca57aed 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -2,6 +2,30 @@ ccache news
 ===========
 
 
+ccache 3.2.1
+------------
+Release date: 2014-12-10
+
+
+Bug fixes
+~~~~~~~~~
+
+- Fixed regression in temporary file handling, which lead to incorrect
+  permissions for stats, manifest and ccache.conf files in the cache.
+
+- `CACHEDIR.TAG` files are now created in the [0-9a-f] subdirectories so that
+  ccache.conf is not lost in backups.
+
+- Made the default cache size suffix `G`, as previously documented.
+
+- `-fdiagnostics-color=auto` is now passed to the compiler even if stderr is
+  redirected. This fixes a problem when, for instance, a configure test probes
+  if the compiler (wrapped via ccache) supports `-fdiagnostics-color=auto`.
+
+- Added missing documentation for `max_files` and `max_size` configuration
+  options.
+
+
 ccache 3.2
 ----------
 Release date: 2014-11-17
diff --git a/ccache.1 b/ccache.1
index 186c50a..87abbe9 100644
--- a/ccache.1
+++ b/ccache.1
@@ -2,12 +2,12 @@
 .\"     Title: ccache
 .\"    Author: [see the "Author" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 
-.\"      Date: 11/17/2014
+.\"      Date: 12/10/2014
 .\"    Manual: ccache Manual
-.\"    Source: ccache 3.2
+.\"    Source: ccache 3.2.1
 .\"  Language: English
 .\"
-.TH "CCACHE" "1" "11/17/2014" "ccache 3\&.2" "ccache Manual"
+.TH "CCACHE" "1" "12/10/2014" "ccache 3\&.2\&.1" "ccache Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -490,9 +490,14 @@ If true, ccache will include the current working directory in the hash that is u
 If set to a file path, ccache will write information on what it is doing to the specified file\&. This is useful for tracking down problems\&.
 .RE
 .PP
-\fBstats\fR (\fBCCACHE_STATS\fR) [boolean]
+\fBmax_files\fR (\fBCCACHE_MAXFILES\fR)
 .RS 4
-If true, ccache will update the statistics counters on each compilation\&. The default is true\&.
+This option specifies the maximum number of files to keep in the cache\&. Use 0 for no limit (which is the default)\&.
+.RE
+.PP
+\fBmax_size\fR (\fBCCACHE_MAXSIZE\fR)
+.RS 4
+This option specifies the maximum size of the cache\&. Use 0 for no limit\&. The default value is 5G\&. Available suffixes: k, M, G, T (decimal) and Ki, Mi, Gi, Ti (binary)\&. The default suffix is "G"\&.
 .RE
 .PP
 \fBpath\fR (\fBCCACHE_PATH\fR)
@@ -524,7 +529,7 @@ except that ccache will only try to retrieve results from the cache using the di
 regarding using a read\-only ccache directory\&.
 .RE
 .PP
-\fBreache\fR (\fBCCACHE_RECACHE\fR) [boolean]
+\fBrecache\fR (\fBCCACHE_RECACHE\fR) [boolean]
 .RS 4
 If true, ccache will not use any previously stored result\&. New results will still be cached, possibly overwriting any pre\-existing results\&.
 .RE
@@ -581,6 +586,11 @@ TROUBLESHOOTING
 for more information\&.
 .RE
 .PP
+\fBstats\fR (\fBCCACHE_STATS\fR) [boolean]
+.RS 4
+If true, ccache will update the statistics counters on each compilation\&. The default is true\&.
+.RE
+.PP
 \fBtemporary_dir\fR (\fBCCACHE_TEMPDIR\fR)
 .RS 4
 This setting specifies where ccache will put temporary files\&. The default is
diff --git a/ccache.c b/ccache.c
index f3a6a03..c407760 100644
--- a/ccache.c
+++ b/ccache.c
@@ -291,8 +291,8 @@ clean_up_pending_tmp_files(void)
 	while (p) {
 		tmp_unlink(p->path);
 		p = p->next;
-		/* Leak p->path and p here because clean_up_pending_tmp_files needs to be signal
-		 * safe. */
+		/* Leak p->path and p here because clean_up_pending_tmp_files needs to be
+		 * signal safe. */
 	}
 }
 
@@ -930,15 +930,27 @@ to_cache(struct args *args)
 	put_file_in_cache(output_obj, cached_obj);
 	stats_update(STATS_TOCACHE);
 
-	/* Make sure we have a CACHEDIR.TAG
-	 * This can be almost anywhere, but might as well do it near the end
-	 * as if we exit early we save the stat call
+	/* Make sure we have a CACHEDIR.TAG in the cache part of cache_dir. This can
+	 * be done almost anywhere, but we might as well do it near the end as we
+	 * save the stat call if we exit early.
 	 */
-	if (create_cachedirtag(conf->cache_dir) != 0) {
-		cc_log("Failed to create %s/CACHEDIR.TAG (%s)\n",
-		       conf->cache_dir, strerror(errno));
-		stats_update(STATS_ERROR);
-		failed();
+	{
+		char *first_level_dir = dirname(stats_file);
+		if (create_cachedirtag(first_level_dir) != 0) {
+			cc_log("Failed to create %s/CACHEDIR.TAG (%s)\n",
+			       first_level_dir, strerror(errno));
+			stats_update(STATS_ERROR);
+			failed();
+		}
+		free(first_level_dir);
+
+		/* Remove any CACHEDIR.TAG on the cache_dir level where it was located in
+		 * previous ccache versions. */
+		if (getpid() % 1000 == 0) {
+			char *path = format("%s/CACHEDIR.TAG", conf->cache_dir);
+			unlink(path);
+			free(path);
+		}
 	}
 
 	free(tmp_stderr);
@@ -1999,6 +2011,8 @@ cc_process_args(struct args *args, struct args **preprocessor_args,
 				/* Output is redirected, so color output must be forced. */
 				args_add(stripped_args, "-fdiagnostics-color=always");
 				cc_log("Automatically forcing colors");
+			} else {
+				args_add(stripped_args, argv[i]);
 			}
 			found_color_diagnostics = true;
 			continue;
@@ -2200,7 +2214,8 @@ cc_process_args(struct args *args, struct args **preprocessor_args,
 	output_is_precompiled_header =
 		actual_language && strstr(actual_language, "-header");
 
-	if (output_is_precompiled_header && !(conf->sloppiness & SLOPPY_PCH_DEFINES)) {
+	if (output_is_precompiled_header
+	    && !(conf->sloppiness & SLOPPY_PCH_DEFINES)) {
 		cc_log("You have to specify \"pch_defines,time_macros\" sloppiness when"
 		       " creating precompiled headers");
 		stats_update(STATS_CANTUSEPCH);
diff --git a/cleanup.c b/cleanup.c
index a8b4cf0..ee872cc 100644
--- a/cleanup.c
+++ b/cleanup.c
@@ -80,6 +80,10 @@ traverse_fn(const char *fname, struct stat *st)
 		}
 	}
 
+	if (strstr(p, "CACHEDIR.TAG")) {
+		goto out;
+	}
+
 	if (num_files == allocated) {
 		allocated = 10000 + num_files*2;
 		files = (struct files **)x_realloc(files, sizeof(struct files *)*allocated);
diff --git a/stats.c b/stats.c
index 71fbb7a..aef628f 100644
--- a/stats.c
+++ b/stats.c
@@ -373,7 +373,8 @@ stats_zero(void)
 
 /* Get the per directory limits */
 void
-stats_get_obsolete_limits(const char *dir, unsigned *maxfiles, uint64_t *maxsize)
+stats_get_obsolete_limits(const char *dir, unsigned *maxfiles,
+                          uint64_t *maxsize)
 {
 	struct counters *counters = counters_init(STATS_END);
 	char *sname = format("%s/stats", dir);
diff --git a/test.sh b/test.sh
index 79e3e0d..b511146 100755
--- a/test.sh
+++ b/test.sh
@@ -43,6 +43,7 @@ unset CCACHE_SLOPPINESS
 unset CCACHE_TEMPDIR
 unset CCACHE_UMASK
 unset CCACHE_UNIFY
+unset GCC_COLORS
 
 # Many tests backdate files, which updates their ctimes.  In those tests, we
 # must ignore ctimes.  Might as well do so everywhere.
diff --git a/test/framework.c b/test/framework.c
index bbb0480..3590d03 100644
--- a/test/framework.c
+++ b/test/framework.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2012 Joel Rosdahl
+ * Copyright (C) 2010-2014 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
@@ -18,6 +18,7 @@
 
 #include "ccache.h"
 #include "test/framework.h"
+#include "util.h"
 
 #if defined(HAVE_TERMIOS_H)
 #define USE_COLOR
@@ -64,6 +65,7 @@ cct_run(suite_fn *suites, int verbose_output)
 	suite_fn *suite;
 	int tty = is_tty(1);
 
+	x_unsetenv("GCC_COLORS"); /* Avoid confusing argument processing tests. */
 	verbose = verbose_output;
 
 	for (suite = suites; *suite; suite++) {
diff --git a/test/test_util.c b/test/test_util.c
index a9c5479..156789d 100644
--- a/test/test_util.c
+++ b/test/test_util.c
@@ -164,7 +164,7 @@ TEST(parse_size_with_suffix)
 	size_t i;
 	struct { const char *size; int64_t expected; } sizes[] = {
 		{"0", 0},
-		{"42", 42},
+		{"42", (int64_t)42 * 1000 * 1000 * 1000}, /* Default suffix: G */
 
 		{"78k",       78 * 1000},
 		{"78K",       78 * 1000},
diff --git a/util.c b/util.c
index f453959..80eb58b 100644
--- a/util.c
+++ b/util.c
@@ -223,6 +223,21 @@ mkstemp(char *template)
 }
 #endif
 
+#ifndef _WIN32
+static mode_t
+get_umask(void)
+{
+	static bool mask_retrieved = false;
+	static mode_t mask;
+	if (!mask_retrieved) {
+		mask = umask(0);
+		umask(mask);
+		mask_retrieved = true;
+	}
+	return mask;
+}
+#endif
+
 /*
  * Copy src to dest, decompressing src if needed. compress_level > 0 decides
  * whether dest will be compressed, and with which compression level.
@@ -235,9 +250,6 @@ copy_file(const char *src, const char *dest, int compress_level)
 	char buf[10240];
 	int n, written;
 	char *tmp_name;
-#ifndef _WIN32
-	mode_t mask;
-#endif
 	struct stat st;
 	int errnum;
 
@@ -337,10 +349,7 @@ copy_file(const char *src, const char *dest, int compress_level)
 	}
 
 #ifndef _WIN32
-	/* get perms right on the tmp file */
-	mask = umask(0);
-	fchmod(fd_out, 0666 & ~mask);
-	umask(mask);
+	fchmod(fd_out, 0666 & ~get_umask());
 #endif
 
 	/* the close can fail on NFS if out of space */
@@ -947,6 +956,9 @@ parse_size_with_suffix(const char *str, uint64_t *size)
 		default:
 			return false;
 		}
+	} else {
+		/* Default suffix: G. */
+		x *= 1000 * 1000 * 1000;
 	}
 	*size = x;
 	return true;
@@ -1061,6 +1073,11 @@ create_tmp_fd(char **fname)
 	if (fd == -1) {
 		fatal("Failed to create file %s: %s", template, strerror(errno));
 	}
+
+#ifndef _WIN32
+	fchmod(fd, 0666 & ~get_umask());
+#endif
+
 	free(*fname);
 	*fname = template;
 	return fd;
diff --git a/version.c b/version.c
index 61f42e4..4bf7d25 100644
--- a/version.c
+++ b/version.c
@@ -1 +1 @@
-const char CCACHE_VERSION[] = "3.2";
+const char CCACHE_VERSION[] = "3.2.1";