From: Joel Rosdahl <joel@rosdahl.net>
Date: Thu, 3 Nov 2016 21:20:26 +0000 (+0100)
Subject: Merge remote-tracking branch 'afbjorklund/zero_timestamp'
X-Git-Tag: v3.4~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcf3e546a495d4e47695900ec5477c0957eeb42a;p=thirdparty%2Fccache.git

Merge remote-tracking branch 'afbjorklund/zero_timestamp'

* afbjorklund/zero_timestamp:
  Show the time when stats were last zeroed out
---

bcf3e546a495d4e47695900ec5477c0957eeb42a
diff --cc ccache.h
index 8b738aba0,ee1f1f445..cf7d0ff7a
--- a/ccache.h
+++ b/ccache.h
@@@ -52,7 -52,7 +52,8 @@@ enum stats 
  	STATS_CANTUSEPCH = 27,
  	STATS_PREPROCESSING = 28,
  	STATS_NUMCLEANUPS = 29,
 -	STATS_ZEROTIMESTAMP = 30,
 +	STATS_UNSUPPORTED_DIRECTIVE = 30,
++	STATS_ZEROTIMESTAMP = 31,
  
  	STATS_END
  };
diff --cc stats.c
index 5d9fc7378,110020029..61db8f9b6
--- a/stats.c
+++ b/stats.c
@@@ -50,192 -50,41 +50,198 @@@ static struct 
  	void (*fn)(uint64_t);
  	unsigned flags;
  } stats_info[] = {
 -	{ STATS_CACHEHIT_DIR, "cache hit (direct)             ", NULL, FLAG_ALWAYS },
 -	{ STATS_CACHEHIT_CPP, "cache hit (preprocessed)       ", NULL, FLAG_ALWAYS },
 -	{ STATS_TOCACHE,      "cache miss                     ", NULL, FLAG_ALWAYS },
 -	{ STATS_LINK,         "called for link                ", NULL, 0 },
 -	{ STATS_PREPROCESSING, "called for preprocessing       ", NULL, 0 },
 -	{ STATS_MULTIPLE,     "multiple source files          ", NULL, 0 },
 -	{ STATS_STDOUT,       "compiler produced stdout       ", NULL, 0 },
 -	{ STATS_NOOUTPUT,     "compiler produced no output    ", NULL, 0 },
 -	{ STATS_EMPTYOUTPUT,  "compiler produced empty output ", NULL, 0 },
 -	{ STATS_STATUS,       "compile failed                 ", NULL, 0 },
 -	{ STATS_ERROR,        "ccache internal error          ", NULL, 0 },
 -	{ STATS_PREPROCESSOR, "preprocessor error             ", NULL, 0 },
 -	{ STATS_CANTUSEPCH,   "can't use precompiled header   ", NULL, 0 },
 -	{ STATS_COMPILER,     "couldn't find the compiler     ", NULL, 0 },
 -	{ STATS_MISSING,      "cache file missing             ", NULL, 0 },
 -	{ STATS_ARGS,         "bad compiler arguments         ", NULL, 0 },
 -	{ STATS_SOURCELANG,   "unsupported source language    ", NULL, 0 },
 -	{ STATS_COMPCHECK,    "compiler check failed          ", NULL, 0 },
 -	{ STATS_CONFTEST,     "autoconf compile/link          ", NULL, 0 },
 -	{ STATS_UNSUPPORTED,  "unsupported compiler option    ", NULL, 0 },
 -	{ 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_BADEXTRAFILE, "error hashing extra file       ", NULL, 0 },
 -	{ STATS_NUMCLEANUPS,  "cleanups performed             ", NULL, FLAG_ALWAYS },
 -	{ STATS_ZEROTIMESTAMP,"stats zero timestamp           ", NULL, FLAG_NEVER },
 -	{ STATS_NUMFILES,     "files in cache                 ", NULL,
 -		FLAG_NOZERO|FLAG_ALWAYS },
 -	{ STATS_TOTALSIZE,    "cache size                     ",
 -		display_size_times_1024, FLAG_NOZERO|FLAG_ALWAYS },
 -	{ STATS_OBSOLETE_MAXFILES, "OBSOLETE",                   NULL,
 -		FLAG_NOZERO|FLAG_NEVER},
 -	{ STATS_OBSOLETE_MAXSIZE, "OBSOLETE",                    NULL,
 -		FLAG_NOZERO|FLAG_NEVER},
 -	{ STATS_NONE, NULL, NULL, 0 }
 +	{
 +		STATS_CACHEHIT_DIR,
 +		"cache hit (direct)",
 +		NULL,
 +		FLAG_ALWAYS
 +	},
 +	{
 +		STATS_CACHEHIT_CPP,
 +		"cache hit (preprocessed)",
 +		NULL,
 +		FLAG_ALWAYS
 +	},
 +	{
 +		STATS_TOCACHE,
 +		"cache miss",
 +		NULL,
 +		FLAG_ALWAYS
 +	},
 +	{
 +		STATS_LINK,
 +		"called for link",
 +		NULL,
 +		0
 +	},
 +	{
 +		STATS_PREPROCESSING,
 +		"called for preprocessing",
 +		NULL,
 +		0
 +	},
 +	{
 +		STATS_MULTIPLE,
 +		"multiple source files",
 +		NULL,
 +		0
 +	},
 +	{
 +		STATS_STDOUT,
 +		"compiler produced stdout",
 +		NULL,
 +		0
 +	},
 +	{
 +		STATS_NOOUTPUT,
 +		"compiler produced no output",
 +		NULL,
 +		0
 +	},
 +	{
 +		STATS_EMPTYOUTPUT,
 +		"compiler produced empty output",
 +		NULL,
 +		0
 +	},
 +	{
 +		STATS_STATUS,
 +		"compile failed",
 +		NULL,
 +		0
 +	},
 +	{
 +		STATS_ERROR,
 +		"ccache internal error",
 +		NULL,
 +		0
 +	},
 +	{
 +		STATS_PREPROCESSOR,
 +		"preprocessor error",
 +		NULL,
 +		0
 +	},
 +	{
 +		STATS_CANTUSEPCH,
 +		"can't use precompiled header",
 +		NULL,
 +		0
 +	},
 +	{
 +		STATS_COMPILER,
 +		"couldn't find the compiler",
 +		NULL,
 +		0
 +	},
 +	{
 +		STATS_MISSING,
 +		"cache file missing",
 +		NULL,
 +		0
 +	},
 +	{
 +		STATS_ARGS,
 +		"bad compiler arguments",
 +		NULL,
 +		0
 +	},
 +	{
 +		STATS_SOURCELANG,
 +		"unsupported source language",
 +		NULL,
 +		0
 +	},
 +	{
 +		STATS_COMPCHECK,
 +		"compiler check failed",
 +		NULL,
 +		0
 +	},
 +	{
 +		STATS_CONFTEST,
 +		"autoconf compile/link",
 +		NULL,
 +		0
 +	},
 +	{
 +		STATS_UNSUPPORTED_OPTION,
 +		"unsupported compiler option",
 +		NULL,
 +		0
 +	},
 +	{
 +		STATS_UNSUPPORTED_DIRECTIVE,
 +		"unsupported code directive",
 +		NULL,
 +		0
 +	},
 +	{
 +		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_BADEXTRAFILE,
 +		"error hashing extra file",
 +		NULL,
 +		0
 +	},
 +	{
 +		STATS_NUMCLEANUPS,
 +		"cleanups performed",
 +		NULL,
 +		FLAG_ALWAYS
 +	},
 +	{
 +		STATS_NUMFILES,
 +		"files in cache",
 +		NULL,
 +		FLAG_NOZERO|FLAG_ALWAYS
 +	},
 +	{
 +		STATS_TOTALSIZE,
 +		"cache size",
 +		display_size_times_1024,
 +		FLAG_NOZERO|FLAG_ALWAYS
 +	},
 +	{
 +		STATS_OBSOLETE_MAXFILES,
 +		"OBSOLETE",
 +		NULL,
 +		FLAG_NOZERO|FLAG_NEVER
 +	},
 +	{
 +		STATS_OBSOLETE_MAXSIZE,
 +		"OBSOLETE",
 +		NULL,
 +		FLAG_NOZERO|FLAG_NEVER
 +	},
++	{
++		STATS_ZEROTIMESTAMP,
++		"stats zero timestamp",
++		NULL,
++		FLAG_NEVER
++	},
 +	{
 +		STATS_NONE,
 +		NULL,
 +		NULL,
 +		0
 +	}
  };
  
  static void