From: <wsf...@us...> - 2009-01-08 17:52:24
|
Revision: 11039 http://swig.svn.sourceforge.net/swig/?rev=11039&view=rev Author: wsfulton Date: 2009-01-08 17:52:15 +0000 (Thu, 08 Jan 2009) Log Message: ----------- add some missing stats and logging Modified Paths: -------------- trunk/CCache/ccache.c trunk/CCache/ccache.h trunk/CCache/execute.c trunk/CCache/stats.c Modified: trunk/CCache/ccache.c =================================================================== --- trunk/CCache/ccache.c 2009-01-07 21:10:46 UTC (rev 11038) +++ trunk/CCache/ccache.c 2009-01-08 17:52:15 UTC (rev 11039) @@ -125,6 +125,7 @@ if ((e=getenv("CCACHE_PREFIX"))) { char *p = find_executable(e, MYNAME); if (!p) { + cc_log("could not find executable (%s)\n", e); perror(e); exit(1); } @@ -535,8 +536,8 @@ correct i_tmpfile */ path_stdout = x_strdup(input_file); if (create_empty_file(path_stderr) != 0) { + cc_log("failed to create empty stderr file\n"); stats_update(STATS_ERROR); - cc_log("failed to create empty stderr file\n"); failed(); } status = 0; @@ -592,6 +593,7 @@ char *p; if (create_dir(hash_dir) != 0) { cc_log("failed to create %s\n", hash_dir); + stats_update(STATS_ERROR); failed(); } x_asprintf(&p, "%s/%c", hash_dir, s[i]); @@ -600,6 +602,7 @@ } if (create_dir(hash_dir) != 0) { cc_log("failed to create %s\n", hash_dir); + stats_update(STATS_ERROR); failed(); } x_asprintf(&hashname, "%s/%s", hash_dir, s+nlevels); @@ -785,6 +788,7 @@ /* can't find the compiler! */ if (!orig_args->argv[0]) { stats_update(STATS_COMPILER); + cc_log("could not find compiler (%s)\n", base); perror(base); exit(1); } @@ -1069,6 +1073,7 @@ if (p) { if (strlen(p) < 2) { + cc_log("badly formed dependency file %s\n", output_file); stats_update(STATS_ARGS); failed(); return; @@ -1105,6 +1110,8 @@ if ((e=getenv("CCACHE_PREFIX"))) { char *p = find_executable(e, MYNAME); if (!p) { + cc_log("could not find executable (%s)\n", e); + stats_update(STATS_ENVIRONMMENT); perror(e); exit(1); } @@ -1288,6 +1295,7 @@ uncached_fd = dup(2); if (uncached_fd == -1) { cc_log("dup(2) failed\n"); + stats_update(STATS_ERROR); failed(); } @@ -1296,6 +1304,7 @@ if (putenv(buf) == -1) { cc_log("putenv failed\n"); + stats_update(STATS_ERROR); failed(); } } Modified: trunk/CCache/ccache.h =================================================================== --- trunk/CCache/ccache.h 2009-01-07 21:10:46 UTC (rev 11038) +++ trunk/CCache/ccache.h 2009-01-08 17:52:15 UTC (rev 11039) @@ -84,6 +84,7 @@ STATS_NOTC, STATS_DEVICE, STATS_NOINPUT, + STATS_ENVIRONMMENT, STATS_MULTIPLE, STATS_CONFTEST, STATS_UNSUPPORTED, Modified: trunk/CCache/execute.c =================================================================== --- trunk/CCache/execute.c 2009-01-07 21:10:46 UTC (rev 11038) +++ trunk/CCache/execute.c 2009-01-08 17:52:15 UTC (rev 11039) @@ -123,9 +123,7 @@ std_od = _dup(1); fd = _open(path_stdout, O_WRONLY|O_CREAT|O_TRUNC|O_EXCL|O_BINARY, 0666); if (fd == -1) { - status = STATUS_NOCACHE; - cc_log("stdout error: failed to open %s\n", path_stdout); - goto out; + exit(STATUS_NOCACHE); } _dup2(fd, 1); _close(fd); @@ -134,9 +132,7 @@ fd = _open(path_stderr, O_WRONLY|O_CREAT|O_TRUNC|O_EXCL|O_BINARY, 0666); std_ed = _dup(2); if (fd == -1) { - status = STATUS_NOCACHE; - cc_log("stderr error: failed to open %s\n", path_stderr); - goto out; + exit(STATUS_NOCACHE); } _dup2(fd, 2); _close(fd); @@ -144,9 +140,6 @@ /* Spawn process (_exec* familly doesn't return) */ status = _spawnv(_P_WAIT, argv[0], (const char **)argv); -out: - if (status == -1) cc_log("Error %i: %s\n", errno, strerror(errno)); - /* Restore descriptors */ if (std_od != -1) _dup2(std_od, 1); if (std_ed != -1) _dup2(std_ed, 2); @@ -235,6 +228,7 @@ } if (!path) { cc_log("no PATH variable!?\n"); + stats_update(STATS_ENVIRONMMENT); return NULL; } Modified: trunk/CCache/stats.c =================================================================== --- trunk/CCache/stats.c 2009-01-07 21:10:46 UTC (rev 11038) +++ trunk/CCache/stats.c 2009-01-08 17:52:15 UTC (rev 11039) @@ -55,6 +55,7 @@ { STATS_OUTSTDOUT, "output to stdout ", NULL, 0 }, { STATS_DEVICE, "output to a non-regular file ", NULL, 0 }, { STATS_NOINPUT, "no input file ", NULL, 0 }, + { STATS_ENVIRONMMENT, "error due to bad env variable ", NULL, 0 }, { STATS_NUMFILES, "files in cache ", NULL, FLAG_NOZERO|FLAG_ALWAYS }, { STATS_TOTALSIZE, "cache size ", display_size , FLAG_NOZERO|FLAG_ALWAYS }, { STATS_MAXFILES, "max files ", NULL, FLAG_NOZERO }, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wsf...@us...> - 2009-08-20 23:56:31
|
Revision: 11661 http://swig.svn.sourceforge.net/swig/?rev=11661&view=rev Author: wsfulton Date: 2009-08-20 23:56:24 +0000 (Thu, 20 Aug 2009) Log Message: ----------- Add files to svn:ignore Property Changed: ---------------- trunk/CCache/ trunk/CCache/web/ Property changes on: trunk/CCache ___________________________________________________________________ Modified: svn:ignore - Makefile autom4te.cache ccache-swig ccache-swig.exe ccache_swig_config.h *gz configure config.h config.h.in config.log config.status tca.log tca.map + Makefile autom4te.cache ccache-swig ccache-swig.1 ccache-swig.exe ccache_swig_config.h *gz configure config.h config.h.in config.log config.status tca.log tca.map Property changes on: trunk/CCache/web ___________________________________________________________________ Added: svn:ignore + ccache-man.html This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |