luo980/glog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Define ARRAYSIZE in utilities.h and use it.

Browse Source 
git-svn-id: https://google-glog.googlecode.com/svn/trunk@27 eb4d4688-79bd-11dd-afb4-1d65580434c0
This commit is contained in:
2009-01-09 06:07:55 +00:00
parent cc27d6aa59
commit 9de1077eed
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/logging.cc
View File

@ -1393,7 +1393,7 @@ static void GetTempDirectories(vector<string>* list) {
"/tmp", "/tmp",
}; };
for (int i = 0; i < sizeof(candidates) / sizeof(*candidates); i++) { for (int i = 0; i < ARRAYSIZE(candidates); i++) {
const char *d = candidates[i]; const char *d = candidates[i];
if (!d) continue; // Empty env var if (!d) continue; // Empty env var

9
src/signalhandler.cc
View File

@ -17,9 +17,6 @@
_START_GOOGLE_NAMESPACE_ _START_GOOGLE_NAMESPACE_
// There is a better way, but this is good enough in this file.
#define NAIVE_ARRAYSIZE(a) (sizeof(a) / sizeof(*(a)))
namespace { namespace {
// We'll install the failure signal handler for these signals. We could // We'll install the failure signal handler for these signals. We could
@ -139,7 +136,7 @@ void DumpTimeInfo() {
void DumpSignalInfo(int signal_number, siginfo_t *siginfo) { void DumpSignalInfo(int signal_number, siginfo_t *siginfo) {
// Get the signal name. // Get the signal name.
const char* signal_name = NULL; const char* signal_name = NULL;
for (int i = 0; i < NAIVE_ARRAYSIZE(kFailureSignals); ++i) { for (int i = 0; i < ARRAYSIZE(kFailureSignals); ++i) {
if (signal_number == kFailureSignals[i].number) { if (signal_number == kFailureSignals[i].number) {
signal_name = kFailureSignals[i].name; signal_name = kFailureSignals[i].name;
} }
@ -272,7 +269,7 @@ void FailureSignalHandler(int signal_number,
// Get the stack traces. // Get the stack traces.
void *stack[32]; void *stack[32];
// +1 to exclude this function. // +1 to exclude this function.
const int depth = GetStackTrace(stack, NAIVE_ARRAYSIZE(stack), 1); const int depth = GetStackTrace(stack, ARRAYSIZE(stack), 1);
DumpSignalInfo(signal_number, signal_info); DumpSignalInfo(signal_number, signal_info);
// Dump the stack traces. // Dump the stack traces.
for (int i = 0; i < depth; ++i) { for (int i = 0; i < depth; ++i) {
@ -306,7 +303,7 @@ void InstallFailureSignalHandler() {
sig_action.sa_flags |= SA_SIGINFO; sig_action.sa_flags |= SA_SIGINFO;
sig_action.sa_sigaction = &FailureSignalHandler; sig_action.sa_sigaction = &FailureSignalHandler;
for (int i = 0; i < NAIVE_ARRAYSIZE(kFailureSignals); ++i) { for (int i = 0; i < ARRAYSIZE(kFailureSignals); ++i) {
CHECK_ERR(sigaction(kFailureSignals[i].number, &sig_action, NULL)); CHECK_ERR(sigaction(kFailureSignals[i].number, &sig_action, NULL));
} }
} }

2
src/utilities.cc
View File

@ -84,7 +84,7 @@ static void DumpPC(DebugWriter *writerfn, void *arg, void *pc,
static void DumpStackTrace(int skip_count, DebugWriter *writerfn, void *arg) { static void DumpStackTrace(int skip_count, DebugWriter *writerfn, void *arg) {
// Print stack trace // Print stack trace
void* stack[32]; void* stack[32];
int depth = GetStackTrace(stack, sizeof(stack)/sizeof(*stack), skip_count+1); int depth = GetStackTrace(stack, ARRAYSIZE(stack), skip_count+1);
for (int i = 0; i < depth; i++) { for (int i = 0; i < depth; i++) {
#if defined(HAVE_SYMBOLIZE) #if defined(HAVE_SYMBOLIZE)
if (FLAGS_symbolize_stacktrace) { if (FLAGS_symbolize_stacktrace) {

3
src/utilities.h
View File

@ -95,6 +95,9 @@
# define HAVE_SYMBOLIZE # define HAVE_SYMBOLIZE
#endif #endif
// There is a better way, but this is good enough in this file.
#define ARRAYSIZE(a) (sizeof(a) / sizeof(*(a)))
_START_GOOGLE_NAMESPACE_ _START_GOOGLE_NAMESPACE_
namespace glog_internal_namespace_ { namespace glog_internal_namespace_ {