From: JinWang An Date: Tue, 3 Aug 2021 07:15:28 +0000 (+0900) Subject: Imported Upstream version 3.1.9 X-Git-Tag: upstream/3.1.9^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=78a414a1ef7c1819c98bdc8a28b05df7ad4cb2f9;p=platform%2Fupstream%2Fccache.git Imported Upstream version 3.1.9 --- diff --git a/AUTHORS.html b/AUTHORS.html index 6167306..1df9412 100644 --- a/AUTHORS.html +++ b/AUTHORS.html @@ -736,7 +736,7 @@ asciidoc.install(2);

ccache authors

-version 3.1.8 +version 3.1.9

Table of Contents

@@ -751,11 +751,21 @@ maintained by Joel Rosdahl.

+Alfred Landrum <alfred.landrum@riverbed.com> +
+
+
Andrea Bittau <a.bittau@cs.ucl.ac.uk>
+Andrew Stubbs <ams@codesourcery.com> +
+
+
Andrew Tridgell <tridge@samba.org>

wsnyder@wsnyder.org

* Andrea Bittau +* Andrew Stubbs * Andrew Tridgell * Bernhard Bauer * BjÃ¶rn Jacke diff --git a/INSTALL.html b/INSTALL.html index 6d3316e..df37a57 100644 --- a/INSTALL.html +++ b/INSTALL.html @@ -736,7 +736,7 @@ asciidoc.install(2);

ccache installation

-version 3.1.8 +version 3.1.9

Table of Contents

@@ -845,8 +845,8 @@ above.

diff --git a/LICENSE.html b/LICENSE.html index c05d7f3..71a3351 100644 --- a/LICENSE.html +++ b/LICENSE.html @@ -736,7 +736,7 @@ asciidoc.install(2);

ccache copyright and license

-version 3.1.8 +version 3.1.9

Table of Contents

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

diff --git a/MANUAL.html b/MANUAL.html index 2076988..be2c37e 100644 --- a/MANUAL.html +++ b/MANUAL.html @@ -736,7 +736,7 @@ asciidoc.install(2);

CCACHE(1)

-version 3.1.8 +version 3.1.9

Table of Contents

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

diff --git a/NEWS.html b/NEWS.html index d95929c..8dc3325 100644 --- a/NEWS.html +++ b/NEWS.html @@ -736,7 +736,7 @@ asciidoc.install(2);

ccache news

-version 3.1.8 +version 3.1.9

Table of Contents

@@ -744,6 +744,56 @@ asciidoc.install(2);

ccache 3.1.9

Release date: 2013-01-06

Bug fixes

+
+The EAGAIN signal is now handled correctly when emitting cached stderr + output. This fixes a problem triggered by large error outputs from the + compiler. +
+
+
+Subdirectories in the cache are no longer created in read-only mode. +
+
+
+Fixed so that ccache’s log file descriptor is not made available to the + compiler. +
+
+
+Improved error reporting when failing to create temporary stdout/stderr + files when executing the compiler. +
+
+
+Disappearing temporary stdout/stderr files are now handled gracefully. +
+

Other

+
+Fixed test suite to work on ecryptfs. +
+

ccache 3.1.8

Release date: 2012-08-11

@@ -769,7 +819,7 @@ Clang plugins are now hashed to catch plugin upgrades.

Bug fixes

@@ -796,7 +846,7 @@ Paths are now correctly canonicalized when computing paths relative to

Other

@@ -818,7 +868,7 @@ Fixed static_assert macro definition clash with GCC 4.7.
Release date: 2012-01-08
-
Bug fixes
+
Bug fixes
- @@ -871,7 +921,7 @@ Reverted the GCC bug compatibility introduced in ccache 3.1.5 for
-
Other
+
Other
- @@ -902,7 +952,7 @@ Rewrite argument to --sysroot if CCACHE_BASEDIR is used.
-
Bug fixes
+
Bug fixes
- @@ -955,7 +1005,7 @@ Improved order of statistics counters in ccache -s output.
-
Bug fixes
+
Bug fixes
- @@ -989,7 +1039,7 @@ Systems that lack (and don’t need to be linked with) libm are now
  
  Release date: 2011-01-09
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1022,7 +1072,7 @@ The file handle in now correctly closed on write error when trying to
  
  Release date: 2010-11-28
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1033,7 +1083,7 @@ The -MFarg, -MTarg and -MQarg compiler options (i.e, without space
  
  -
  Other
  +
  Other
  
  @@ -1049,7 +1099,7 @@ Portability fixes for HP-UX 11.00 and other esoteric systems.
  
  Release date: 2010-11-21
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1070,7 +1120,7 @@ Fixed issue when parsing precompiler output on AIX.
  
  -
  Other
  +
  Other
  
  @@ -1097,7 +1147,7 @@ The test suite now also works on systems that lack a /dev/zero.
  
  Release date: 2010-11-07
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1136,7 +1186,7 @@ ccache development version (set by dev.mk) now works with gits whose
  
  -
  Other
  +
  Other
  
  @@ -1221,7 +1271,7 @@ Added -install_name as an option known to take an argument. (This
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1247,7 +1297,7 @@ EINTR is now handled correctly.
  
  -
  Other
  +
  Other
  
  @@ -1309,7 +1359,7 @@ New HACKING.txt file with some notes about ccache code conventions.
  
  Release date: 2010-07-15
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1503,7 +1553,7 @@ The following options are no longer hashed in the preprocessor mode:
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1648,8 +1698,8 @@ Statistics counters are now correctly updated for -E option failures and
  
  -Version 3.1.8
  -Last updated 2012-08-11 10:57:17 CEST +Version 3.1.9
  +Last updated 2013-01-06 17:55:15 CET
  
  diff --git a/NEWS.txt b/NEWS.txt index 1ffa0a2..554c6ff 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -2,6 +2,31 @@ ccache news =========== +ccache 3.1.9 +------------ +Release date: 2013-01-06 + + +Bug fixes +~~~~~~~~~ + + - The EAGAIN signal is now handled correctly when emitting cached stderr + output. This fixes a problem triggered by large error outputs from the + compiler. + - Subdirectories in the cache are no longer created in read-only mode. + - Fixed so that ccache's log file descriptor is not made available to the + compiler. + - Improved error reporting when failing to create temporary stdout/stderr + files when executing the compiler. + - Disappearing temporary stdout/stderr files are now handled gracefully. + + +Other +~~~~~ + + - Fixed test suite to work on ecryptfs. + + ccache 3.1.8 ------------ Release date: 2012-08-11 diff --git a/README.html b/README.html index 486d851..f58e224 100644 --- a/README.html +++ b/README.html @@ -736,7 +736,7 @@ asciidoc.install(2);
  
  ccache README
  -version 3.1.8 +version 3.1.9
  
  Table of Contents
  @@ -832,8 +832,8 @@ Thiele’s “compilercache” (see
  
  -Version 3.1.8
  -Last updated 2012-01-09 20:53:18 CET +Version 3.1.9
  +Last updated 2012-11-07 19:42:42 CET
  
  diff --git a/ccache.1 b/ccache.1 index c2c106a..2ba09f8 100644 --- a/ccache.1 +++ b/ccache.1 @@ -2,12 +2,12 @@ .\" Title: ccache .\" Author: [see the "Author" section] .\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: 08/11/2012 +.\" Date: 01/06/2013 .\" Manual: ccache Manual -.\" Source: ccache 3.1.8 +.\" Source: ccache 3.1.9 .\" Language: English .\" -.TH "CCACHE" "1" "08/11/2012" "ccache 3\&.1\&.8" "ccache Manual" +.TH "CCACHE" "1" "01/06/2013" "ccache 3\&.1\&.9" "ccache Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/ccache.c b/ccache.c index 738c022..02dbdfa 100644 --- a/ccache.c +++ b/ccache.c @@ -2,7 +2,7 @@ * ccache -- a fast C/C++ compiler cache * * Copyright (C) 2002-2007 Andrew Tridgell - * Copyright (C) 2009-2012 Joel Rosdahl + * Copyright (C) 2009-2013 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 @@ -266,7 +266,7 @@ get_path_in_cache(const char *name, const char *suffix) char *p = format("%s/%c", path, name[i]); free(path); path = p; - if (create_dir(path) != 0) { + if (!getenv("CCACHE_READONLY") && create_dir(path) != 0) { fatal("Failed to create %s: %s", path, strerror(errno)); } } @@ -551,7 +551,13 @@ to_cache(struct args *args) args_pop(args, 3); if (stat(tmp_stdout, &st) != 0) { - fatal("Could not create %s (permission denied?)", tmp_stdout); + /* The stdout file was removed - cleanup in progress? Better bail out. */ + cc_log("%s not found: %s", tmp_stdout, strerror(errno)); + stats_update(STATS_MISSING); + tmp_unlink(tmp_stdout); + tmp_unlink(tmp_stderr); + tmp_unlink(tmp_obj); + failed(); } if (st.st_size != 0) { cc_log("Compiler produced stdout"); diff --git a/execute.c b/execute.c index f1970d3..761aa80 100644 --- a/execute.c +++ b/execute.c @@ -19,6 +19,10 @@ #include "ccache.h" +/* Let's hope no compiler uses these exit statuses. */ +#define FAILED_TO_CREATE_STDOUT 212 +#define FAILED_TO_CREATE_STDERR 213 + static char * find_executable_in_path(const char *name, const char *exclude_name, char *path); @@ -179,7 +183,8 @@ execute(char **argv, const char *path_stdout, const char *path_stderr) tmp_unlink(path_stdout); fd = open(path_stdout, O_WRONLY|O_CREAT|O_TRUNC|O_EXCL|O_BINARY, 0666); if (fd == -1) { - exit(1); + cc_log("Error creating %s: %s", path_stdout, strerror(errno)); + exit(FAILED_TO_CREATE_STDOUT); } dup2(fd, 1); close(fd); @@ -187,7 +192,8 @@ execute(char **argv, const char *path_stdout, const char *path_stderr) tmp_unlink(path_stderr); fd = open(path_stderr, O_WRONLY|O_CREAT|O_TRUNC|O_EXCL|O_BINARY, 0666); if (fd == -1) { - exit(1); + cc_log("Error creating %s: %s", path_stderr, strerror(errno)); + exit(FAILED_TO_CREATE_STDERR); } dup2(fd, 2); close(fd); @@ -203,6 +209,12 @@ execute(char **argv, const char *path_stdout, const char *path_stderr) return -1; } + if (status == FAILED_TO_CREATE_STDOUT) { + fatal("Could not create %s (permission denied?)", path_stdout); + } else if (status == FAILED_TO_CREATE_STDERR) { + fatal("Could not create %s (permission denied?)", path_stderr); + } + return WEXITSTATUS(status); } #endif diff --git a/test.sh b/test.sh index 372c188..3ed9069 100755 --- a/test.sh +++ b/test.sh @@ -497,7 +497,7 @@ base_suite() { link_suite() { if [ `dirname $COMPILER` = . ]; then - ln -s ../ccache $COMPILER + ln -s "$CCACHE" $COMPILER CCACHE_COMPILE="./$COMPILER" base_tests else @@ -1387,17 +1387,26 @@ readonly_suite() { # Make the cache readonly # Check that readonly mode finds the result. testname="cache hit" - rm -f test.o + rm -f test.o test2.o chmod -R a-w $CCACHE_DIR - CCACHE_READONLY=1 CCACHE_TEMPDIR=/tmp CCACHE_PREFIX=false $CCACHE $COMPILER -c test.c -o test.o - status=$? + CCACHE_READONLY=1 CCACHE_TEMPDIR=/tmp CCACHE_PREFIX=false $CCACHE $COMPILER -c test.c -o test.o >/dev/null 2>&1 + status1=$? + # Check that fallback to the real compiler works for a cache miss. + CCACHE_READONLY=1 CCACHE_TEMPDIR=/tmp $CCACHE $COMPILER -c test2.c -o test2.o >/dev/null 2>&1 + status2=$? chmod -R a+w $CCACHE_DIR - if [ $status -ne 0 ]; then + if [ $status1 -ne 0 ]; then test_failed "failure when compiling test.c readonly" fi + if [ $status2 -ne 0 ]; then + test_failed "failure when compiling test2.c readonly" + fi if [ ! -f test.o ]; then test_failed "test.o missing" fi + if [ ! -f test2.o ]; then + test_failed "test2.o missing" + fi # Check that readonly mode doesn't try to store new results. testname="cache miss" @@ -1542,6 +1551,11 @@ cleanup_suite() { fi done + # Warning: this test is known to fail on filesystems that have + # unusual block sizes, including ecryptfs. The workaround is + # to place the test directory elsewhere: + # cd /tmp + # CCACHE=$DIR/ccache $DIR/test.sh testname="forced cleanup, size limit" $CCACHE -C >/dev/null prepare_cleanup_test $CCACHE_DIR/a diff --git a/util.c b/util.c index b489800..3b472de 100644 --- a/util.c +++ b/util.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2002 Andrew Tridgell - * Copyright (C) 2009-2012 Joel Rosdahl + * Copyright (C) 2009-2013 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 @@ -48,6 +48,11 @@ init_log(void) } logfile = fopen(cache_logfile, "a"); if (logfile) { + int fd = fileno(logfile); + int flags = fcntl(fd, F_GETFD, 0); + if (flags >= 0) { + fcntl(fd, F_SETFD, flags | FD_CLOEXEC); + } return true; } else { return false; @@ -149,10 +154,13 @@ copy_fd(int fd_in, int fd_out) ssize_t count, written = 0; do { count = write(fd_out, buf + written, n - written); - if (count == -1 && errno != EINTR) { - fatal("Failed to copy fd"); + if (count == -1) { + if (errno != EAGAIN && errno != EINTR) { + fatal("Failed to copy fd"); + } + } else { + written += count; } - written += count; } while (written < n); } @@ -1118,7 +1126,7 @@ x_unlink(const char *path) * file. We don't care if the temp file is trashed, so it's always safe to * unlink it first. */ - char* tmp_name = format("%s.%s.rmXXXXXX", path, tmp_string()); + char *tmp_name = format("%s.tmp.rm.%s", path, tmp_string()); int result = 0; cc_log("Unlink %s via %s", path, tmp_name); if (x_rename(path, tmp_name) == -1) { diff --git a/version.c b/version.c index d845ba9..e694384 100644 --- a/version.c +++ b/version.c @@ -1 +1 @@ -const char CCACHE_VERSION[] = "3.1.8"; +const char CCACHE_VERSION[] = "3.1.9";

ccache authors

ccache installation

ccache copyright and license

CCACHE(1)

ccache news

ccache 3.1.9

Bug fixes

Other

ccache 3.1.8

Bug fixes

Bug fixes

Other

Other

Bug fixes

Bug fixes

Other

Other

Bug fixes

Bug fixes

Bug fixes

Bug fixes

Bug fixes

Bug fixes

Bug fixes

Bug fixes

Other

Other

Bug fixes

Bug fixes

Other

Other

Bug fixes

Bug fixes

Other

Other

Bug fixes

Bug fixes

Other

Other

Bug fixes

Bug fixes

Bug fixes

Bug fixes

ccache README