You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2011/06/05 07:34:03 UTC
svn commit: r1131793 [3/3] - in /incubator/mesos/trunk: ./ src/
src/third_party/glog-0.3.0/ src/third_party/glog-0.3.0/doc/
src/third_party/glog-0.3.0/m4/ src/third_party/glog-0.3.0/packages/
src/third_party/glog-0.3.0/packages/deb/ src/third_party/glo...
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/config.h.in (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/config.h.in)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/config.h.in?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/config.h.in&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/config.h.in&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
--- incubator/mesos/trunk/src/third_party/glog-0.3.0/src/config.h.in (original)
+++ incubator/mesos/trunk/src/third_party/glog-0.3.1/src/config.h.in Sun Jun 5 05:33:57 2011
@@ -87,6 +87,9 @@
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
+/* Define to 1 if you have the <sys/ucontext.h> header file. */
+#undef HAVE_SYS_UCONTEXT_H
+
/* Define to 1 if you have the <sys/utsname.h> header file. */
#undef HAVE_SYS_UTSNAME_H
@@ -142,6 +145,9 @@
/* the namespace where STL code like vector<> is defined */
#undef STL_NAMESPACE
+/* location of source code */
+#undef TEST_SRC_DIR
+
/* Version number of package */
#undef VERSION
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/config_for_unittests.h (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/config_for_unittests.h)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/config_for_unittests.h?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/config_for_unittests.h&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/config_for_unittests.h&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/demangle.cc (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/demangle.cc)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/demangle.cc?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/demangle.cc&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/demangle.cc&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/demangle.h (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/demangle.h)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/demangle.h?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/demangle.h&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/demangle.h&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/demangle_unittest.cc (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/demangle_unittest.cc)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/demangle_unittest.cc?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/demangle_unittest.cc&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/demangle_unittest.cc&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
--- incubator/mesos/trunk/src/third_party/glog-0.3.0/src/demangle_unittest.cc (original)
+++ incubator/mesos/trunk/src/third_party/glog-0.3.1/src/demangle_unittest.cc Sun Jun 5 05:33:57 2011
@@ -41,7 +41,8 @@
#include "googletest.h"
#include "config.h"
-DEFINE_bool(demangle_filter, false, "Run demangle_unittest in filter mode");
+GLOG_DEFINE_bool(demangle_filter, false,
+ "Run demangle_unittest in filter mode");
using namespace std;
using namespace GOOGLE_NAMESPACE;
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/demangle_unittest.sh (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/demangle_unittest.sh)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/demangle_unittest.sh?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/demangle_unittest.sh&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/demangle_unittest.sh&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/demangle_unittest.txt (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/demangle_unittest.txt)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/demangle_unittest.txt?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/demangle_unittest.txt&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/demangle_unittest.txt&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/glog/log_severity.h (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/glog/log_severity.h)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/glog/log_severity.h?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/glog/log_severity.h&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/glog/log_severity.h&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/glog/logging.h.in (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/glog/logging.h.in)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/glog/logging.h.in?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/glog/logging.h.in&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/glog/logging.h.in&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
--- incubator/mesos/trunk/src/third_party/glog-0.3.0/src/glog/logging.h.in (original)
+++ incubator/mesos/trunk/src/third_party/glog-0.3.1/src/glog/logging.h.in Sun Jun 5 05:33:57 2011
@@ -409,7 +409,7 @@ DECLARE_bool(stop_logging_if_full_disk);
#ifdef NDEBUG
#define COMPACT_GOOGLE_LOG_DFATAL COMPACT_GOOGLE_LOG_ERROR
#elif GOOGLE_STRIP_LOG <= 3
-#define COMPACT_GOOGLE_LOG_DFATAL LogMessage( \
+#define COMPACT_GOOGLE_LOG_DFATAL @ac_google_namespace@::LogMessage( \
__FILE__, __LINE__, @ac_google_namespace@::FATAL)
#else
#define COMPACT_GOOGLE_LOG_DFATAL @ac_google_namespace@::NullStreamFatal()
@@ -482,6 +482,9 @@ DECLARE_bool(stop_logging_if_full_disk);
// specified by argv0 in log outputs.
GOOGLE_GLOG_DLL_DECL void InitGoogleLogging(const char* argv0);
+// Shutdown google's logging library.
+GOOGLE_GLOG_DLL_DECL void ShutdownGoogleLogging();
+
// Install a function which will be called after LOG(FATAL).
GOOGLE_GLOG_DLL_DECL void InstallFailureFunction(void (*fail_func)());
@@ -652,7 +655,7 @@ DEFINE_CHECK_OP_IMPL(_GT, > )
// file is included). Save the current meaning now and use it
// in the macro.
typedef std::string _Check_string;
-#define CHECK_OP_LOG(name, op, val1, val2, log) \
+#define CHECK_OP_LOG(name, op, val1, val2, log) \
while (@ac_google_namespace@::_Check_string* _result = \
@ac_google_namespace@::Check##name##Impl( \
@ac_google_namespace@::GetReferenceableValue(val1), \
@@ -663,11 +666,12 @@ typedef std::string _Check_string;
#else
// In optimized mode, use CheckOpString to hint to compiler that
// the while condition is unlikely.
-#define CHECK_OP_LOG(name, op, val1, val2, log) \
- while (@ac_google_namespace@::CheckOpString _result = \
- @ac_google_namespace@::Check##name##Impl(GetReferenceableValue(val1), \
- GetReferenceableValue(val2), \
- #val1 " " #op " " #val2)) \
+#define CHECK_OP_LOG(name, op, val1, val2, log) \
+ while (@ac_google_namespace@::CheckOpString _result = \
+ @ac_google_namespace@::Check##name##Impl( \
+ @ac_google_namespace@::GetReferenceableValue(val1), \
+ @ac_google_namespace@::GetReferenceableValue(val2), \
+ #val1 " " #op " " #val2)) \
log(__FILE__, __LINE__, _result).stream()
#endif // STATIC_ANALYSIS, !NDEBUG
@@ -888,6 +892,7 @@ enum PRIVATE_Counter {COUNTER};
#define DCHECK_LT(val1, val2) CHECK_LT(val1, val2)
#define DCHECK_GE(val1, val2) CHECK_GE(val1, val2)
#define DCHECK_GT(val1, val2) CHECK_GT(val1, val2)
+#define DCHECK_NOTNULL(val) CHECK_NOTNULL(val)
#define DCHECK_STREQ(str1, str2) CHECK_STREQ(str1, str2)
#define DCHECK_STRCASEEQ(str1, str2) CHECK_STRCASEEQ(str1, str2)
#define DCHECK_STRNE(str1, str2) CHECK_STRNE(str1, str2)
@@ -942,6 +947,8 @@ enum PRIVATE_Counter {COUNTER};
while (false) \
CHECK_GT(val1, val2)
+#define DCHECK_NOTNULL(val) (val)
+
#define DCHECK_STREQ(str1, str2) \
while (false) \
CHECK_STREQ(str1, str2)
@@ -1179,7 +1186,7 @@ inline void LogAtLevel(int const severit
// version since there are two advantages: 1. this version outputs the
// file name and the line number where this macro is put like other
// LOG macros, 2. this macro can be used as C++ stream.
-#define LOG_AT_LEVEL(severity) LogMessage(__FILE__, __LINE__, severity).stream()
+#define LOG_AT_LEVEL(severity) @ac_google_namespace@::LogMessage(__FILE__, __LINE__, severity).stream()
// A small helper for CHECK_NOTNULL().
template <typename T>
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/glog/raw_logging.h.in (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/glog/raw_logging.h.in)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/glog/raw_logging.h.in?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/glog/raw_logging.h.in&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/glog/raw_logging.h.in&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/glog/stl_logging.h.in (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/glog/stl_logging.h.in)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/glog/stl_logging.h.in?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/glog/stl_logging.h.in&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/glog/stl_logging.h.in&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/glog/vlog_is_on.h.in (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/glog/vlog_is_on.h.in)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/glog/vlog_is_on.h.in?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/glog/vlog_is_on.h.in&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/glog/vlog_is_on.h.in&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
--- incubator/mesos/trunk/src/third_party/glog-0.3.0/src/glog/vlog_is_on.h.in (original)
+++ incubator/mesos/trunk/src/third_party/glog-0.3.1/src/glog/vlog_is_on.h.in Sun Jun 5 05:33:57 2011
@@ -80,6 +80,7 @@
// matching the current source file that represents results of
// parsing of --vmodule flag and/or SetVLOGLevel calls.
#define VLOG_IS_ON(verboselevel) \
+ __extension__ \
({ static @ac_google_namespace@::int32* vlocal__ = &@ac_google_namespace@::kLogSiteUninitialized; \
@ac_google_namespace@::int32 verbose_level__ = (verboselevel); \
(*vlocal__ >= verbose_level__) && \
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/googletest.h (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/googletest.h)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/googletest.h?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/googletest.h&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/googletest.h&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
--- incubator/mesos/trunk/src/third_party/glog-0.3.0/src/googletest.h (original)
+++ incubator/mesos/trunk/src/third_party/glog-0.3.1/src/googletest.h Sun Jun 5 05:33:57 2011
@@ -85,7 +85,8 @@ static inline string GetTempDir() {
// The test will run in glog/vsproject/<project name>
// (e.g., glog/vsproject/logging_unittest).
static const char TEST_SRC_DIR[] = "../..";
-#else
+#elif !defined(TEST_SRC_DIR)
+# warning TEST_SRC_DIR should be defined in config.h
static const char TEST_SRC_DIR[] = ".";
#endif
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/logging.cc (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/logging.cc)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/logging.cc?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/logging.cc&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/logging.cc&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
--- incubator/mesos/trunk/src/third_party/glog-0.3.0/src/logging.cc (original)
+++ incubator/mesos/trunk/src/third_party/glog-0.3.1/src/logging.cc Sun Jun 5 05:33:57 2011
@@ -89,15 +89,15 @@ static bool BoolFromEnv(const char *varn
return memchr("tTyY1\0", valstr[0], 6) != NULL;
}
-DEFINE_bool(logtostderr, BoolFromEnv("GOOGLE_LOGTOSTDERR", false),
- "log messages go to stderr instead of logfiles");
-DEFINE_bool(alsologtostderr, BoolFromEnv("GOOGLE_ALSOLOGTOSTDERR", false),
- "log messages go to stderr in addition to logfiles");
+GLOG_DEFINE_bool(logtostderr, BoolFromEnv("GOOGLE_LOGTOSTDERR", false),
+ "log messages go to stderr instead of logfiles");
+GLOG_DEFINE_bool(alsologtostderr, BoolFromEnv("GOOGLE_ALSOLOGTOSTDERR", false),
+ "log messages go to stderr in addition to logfiles");
#ifdef OS_LINUX
-DEFINE_bool(drop_log_memory, true, "Drop in-memory buffers of log contents. "
- "Logs can grow very quickly and they are rarely read before they "
- "need to be evicted from memory. Instead, drop them from memory "
- "as soon as they are flushed to disk.");
+GLOG_DEFINE_bool(drop_log_memory, true, "Drop in-memory buffers of log contents. "
+ "Logs can grow very quickly and they are rarely read before they "
+ "need to be evicted from memory. Instead, drop them from memory "
+ "as soon as they are flushed to disk.");
_START_GOOGLE_NAMESPACE_
namespace logging {
static const int64 kPageSize = getpagesize();
@@ -115,25 +115,25 @@ DEFINE_int32(stderrthreshold,
"log messages at or above this level are copied to stderr in "
"addition to logfiles. This flag obsoletes --alsologtostderr.");
-DEFINE_string(alsologtoemail, "",
- "log messages go to these email addresses "
- "in addition to logfiles");
-DEFINE_bool(log_prefix, true,
- "Prepend the log prefix to the start of each log line");
-DEFINE_int32(minloglevel, 0, "Messages logged at a lower level than this don't "
- "actually get logged anywhere");
-DEFINE_int32(logbuflevel, 0,
- "Buffer log messages logged at this level or lower"
- " (-1 means don't buffer; 0 means buffer INFO only;"
- " ...)");
-DEFINE_int32(logbufsecs, 30,
- "Buffer log messages for at most this many seconds");
-DEFINE_int32(logemaillevel, 999,
- "Email log messages logged at this level or higher"
- " (0 means email all; 3 means email FATAL only;"
- " ...)");
-DEFINE_string(logmailer, "/bin/mail",
- "Mailer used to send logging email");
+GLOG_DEFINE_string(alsologtoemail, "",
+ "log messages go to these email addresses "
+ "in addition to logfiles");
+GLOG_DEFINE_bool(log_prefix, true,
+ "Prepend the log prefix to the start of each log line");
+GLOG_DEFINE_int32(minloglevel, 0, "Messages logged at a lower level than this don't "
+ "actually get logged anywhere");
+GLOG_DEFINE_int32(logbuflevel, 0,
+ "Buffer log messages logged at this level or lower"
+ " (-1 means don't buffer; 0 means buffer INFO only;"
+ " ...)");
+GLOG_DEFINE_int32(logbufsecs, 30,
+ "Buffer log messages for at most this many seconds");
+GLOG_DEFINE_int32(logemaillevel, 999,
+ "Email log messages logged at this level or higher"
+ " (0 means email all; 3 means email FATAL only;"
+ " ...)");
+GLOG_DEFINE_string(logmailer, "/bin/mail",
+ "Mailer used to send logging email");
// Compute the default value for --log_dir
static const char* DefaultLogDir() {
@@ -149,21 +149,21 @@ static const char* DefaultLogDir() {
return "";
}
-DEFINE_string(log_dir, DefaultLogDir(),
- "If specified, logfiles are written into this directory instead "
- "of the default logging directory.");
-DEFINE_string(log_link, "", "Put additional links to the log "
- "files in this directory");
-
-DEFINE_int32(max_log_size, 1800,
- "approx. maximum log file size (in MB). A value of 0 will "
- "be silently overridden to 1.");
+GLOG_DEFINE_string(log_dir, DefaultLogDir(),
+ "If specified, logfiles are written into this directory instead "
+ "of the default logging directory.");
+GLOG_DEFINE_string(log_link, "", "Put additional links to the log "
+ "files in this directory");
+
+GLOG_DEFINE_int32(max_log_size, 1800,
+ "approx. maximum log file size (in MB). A value of 0 will "
+ "be silently overridden to 1.");
-DEFINE_bool(stop_logging_if_full_disk, false,
- "Stop attempting to log to disk if the disk is full.");
+GLOG_DEFINE_bool(stop_logging_if_full_disk, false,
+ "Stop attempting to log to disk if the disk is full.");
-DEFINE_string(log_backtrace_at, "",
- "Emit a backtrace when logging at file:linenum.");
+GLOG_DEFINE_string(log_backtrace_at, "",
+ "Emit a backtrace when logging at file:linenum.");
// TODO(hamaji): consider windows
#define PATH_SEPARATOR '/'
@@ -1755,7 +1755,7 @@ int posix_strerror_r(int err, char *buf,
} else {
buf[0] = '\000';
#if defined(OS_MACOSX) || defined(OS_FREEBSD) || defined(OS_OPENBSD)
- if (reinterpret_cast<long int>(rc) < sys_nerr) {
+ if (reinterpret_cast<intptr_t>(rc) < sys_nerr) {
// This means an error on MacOSX or FreeBSD.
return -1;
}
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/logging_striplog_test.sh (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/logging_striplog_test.sh)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/logging_striplog_test.sh?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/logging_striplog_test.sh&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/logging_striplog_test.sh&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/logging_striptest10.cc (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/logging_striptest10.cc)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/logging_striptest10.cc?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/logging_striptest10.cc&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/logging_striptest10.cc&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/logging_striptest2.cc (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/logging_striptest2.cc)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/logging_striptest2.cc?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/logging_striptest2.cc&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/logging_striptest2.cc&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/logging_striptest_main.cc (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/logging_striptest_main.cc)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/logging_striptest_main.cc?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/logging_striptest_main.cc&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/logging_striptest_main.cc&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/logging_unittest.cc (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/logging_unittest.cc)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/logging_unittest.cc?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/logging_unittest.cc&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/logging_unittest.cc&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
--- incubator/mesos/trunk/src/third_party/glog-0.3.0/src/logging_unittest.cc (original)
+++ incubator/mesos/trunk/src/third_party/glog-0.3.1/src/logging_unittest.cc Sun Jun 5 05:33:57 2011
@@ -43,6 +43,7 @@
#include <iomanip>
#include <iostream>
+#include <memory>
#include <queue>
#include <sstream>
#include <string>
@@ -226,6 +227,8 @@ int main(int argc, char **argv) {
TestErrno();
TestTruncate();
+ ShutdownGoogleLogging();
+
fprintf(stdout, "PASS\n");
return 0;
}
@@ -555,6 +558,10 @@ void TestDCHECK() {
DCHECK_LE(1, 2);
DCHECK_GT(2, 1);
DCHECK_LT(1, 2);
+
+ auto_ptr<int64> sptr(new int64);
+ int64* ptr = DCHECK_NOTNULL(sptr.get());
+ CHECK_EQ(ptr, sptr.get());
}
void TestSTREQ() {
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/logging_unittest.err (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/logging_unittest.err)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/logging_unittest.err?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/logging_unittest.err&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/logging_unittest.err&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/mock-log.h (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/mock-log.h)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/mock-log.h?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/mock-log.h&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/mock-log.h&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/mock-log_test.cc (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/mock-log_test.cc)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/mock-log_test.cc?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/mock-log_test.cc&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/mock-log_test.cc&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/raw_logging.cc (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/raw_logging.cc)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/raw_logging.cc?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/raw_logging.cc&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/raw_logging.cc&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/signalhandler.cc (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/signalhandler.cc)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/signalhandler.cc?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/signalhandler.cc&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/signalhandler.cc&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
--- incubator/mesos/trunk/src/third_party/glog-0.3.0/src/signalhandler.cc (original)
+++ incubator/mesos/trunk/src/third_party/glog-0.3.1/src/signalhandler.cc Sun Jun 5 05:33:57 2011
@@ -41,6 +41,9 @@
#ifdef HAVE_UCONTEXT_H
# include <ucontext.h>
#endif
+#ifdef HAVE_SYS_UCONTEXT_H
+# include <sys/ucontext.h>
+#endif
#include <algorithm>
_START_GOOGLE_NAMESPACE_
@@ -66,7 +69,7 @@ const struct {
// Returns the program counter from signal context, NULL if unknown.
void* GetPC(void* ucontext_in_void) {
-#if defined(HAVE_UCONTEXT_H) && defined(PC_FROM_UCONTEXT)
+#if (defined(HAVE_UCONTEXT_H) || defined(HAVE_SYS_UCONTEXT_H)) && defined(PC_FROM_UCONTEXT)
if (ucontext_in_void != NULL) {
ucontext_t *context = reinterpret_cast<ucontext_t *>(ucontext_in_void);
return (void*)context->PC_FROM_UCONTEXT;
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/signalhandler_unittest.cc (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/signalhandler_unittest.cc)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/signalhandler_unittest.cc?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/signalhandler_unittest.cc&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/signalhandler_unittest.cc&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/signalhandler_unittest.sh (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/signalhandler_unittest.sh)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/signalhandler_unittest.sh?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/signalhandler_unittest.sh&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/signalhandler_unittest.sh&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/stacktrace.h (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/stacktrace.h)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/stacktrace.h?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/stacktrace.h&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/stacktrace.h&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/stacktrace_generic-inl.h (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/stacktrace_generic-inl.h)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/stacktrace_generic-inl.h?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/stacktrace_generic-inl.h&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/stacktrace_generic-inl.h&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/stacktrace_libunwind-inl.h (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/stacktrace_libunwind-inl.h)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/stacktrace_libunwind-inl.h?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/stacktrace_libunwind-inl.h&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/stacktrace_libunwind-inl.h&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/stacktrace_powerpc-inl.h (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/stacktrace_powerpc-inl.h)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/stacktrace_powerpc-inl.h?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/stacktrace_powerpc-inl.h&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/stacktrace_powerpc-inl.h&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/stacktrace_unittest.cc (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/stacktrace_unittest.cc)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/stacktrace_unittest.cc?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/stacktrace_unittest.cc&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/stacktrace_unittest.cc&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/stacktrace_x86-inl.h (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/stacktrace_x86-inl.h)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/stacktrace_x86-inl.h?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/stacktrace_x86-inl.h&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/stacktrace_x86-inl.h&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/stacktrace_x86_64-inl.h (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/stacktrace_x86_64-inl.h)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/stacktrace_x86_64-inl.h?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/stacktrace_x86_64-inl.h&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/stacktrace_x86_64-inl.h&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/stl_logging_unittest.cc (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/stl_logging_unittest.cc)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/stl_logging_unittest.cc?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/stl_logging_unittest.cc&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/stl_logging_unittest.cc&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/symbolize.cc (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/symbolize.cc)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/symbolize.cc?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/symbolize.cc&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/symbolize.cc&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
--- incubator/mesos/trunk/src/third_party/glog-0.3.0/src/symbolize.cc (original)
+++ incubator/mesos/trunk/src/third_party/glog-0.3.1/src/symbolize.cc Sun Jun 5 05:33:57 2011
@@ -50,6 +50,8 @@
#if defined(HAVE_SYMBOLIZE)
+#include <limits>
+
#include "symbolize.h"
#include "demangle.h"
@@ -121,7 +123,7 @@ _START_GOOGLE_NAMESPACE_
// success, return the number of bytes read. Otherwise, return -1.
static ssize_t ReadPersistent(const int fd, void *buf, const size_t count) {
SAFE_ASSERT(fd >= 0);
- SAFE_ASSERT(count >= 0 && count <= SSIZE_MAX);
+ SAFE_ASSERT(count >= 0 && count <= std::numeric_limits<ssize_t>::max());
char *buf0 = reinterpret_cast<char *>(buf);
ssize_t num_bytes = 0;
while (num_bytes < count) {
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/symbolize.h (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/symbolize.h)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/symbolize.h?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/symbolize.h&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/symbolize.h&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/symbolize_unittest.cc (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/symbolize_unittest.cc)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/symbolize_unittest.cc?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/symbolize_unittest.cc&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/symbolize_unittest.cc&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/utilities.cc (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/utilities.cc)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/utilities.cc?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/utilities.cc&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/utilities.cc&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
--- incubator/mesos/trunk/src/third_party/glog-0.3.0/src/utilities.cc (original)
+++ incubator/mesos/trunk/src/third_party/glog-0.3.1/src/utilities.cc Sun Jun 5 05:33:57 2011
@@ -44,6 +44,9 @@
#elif defined(HAVE_SYS_SYSCALL_H)
#include <sys/syscall.h> // for syscall()
#endif
+#ifdef HAVE_SYSLOG_H
+# include <syslog.h>
+#endif
#include "base/googleinit.h"
@@ -63,8 +66,8 @@ _END_GOOGLE_NAMESPACE_
#include "symbolize.h"
#include "base/commandlineflags.h"
-DEFINE_bool(symbolize_stacktrace, true,
- "Symbolize the stack trace in the tombstone");
+GLOG_DEFINE_bool(symbolize_stacktrace, true,
+ "Symbolize the stack trace in the tombstone");
_START_GOOGLE_NAMESPACE_
@@ -316,6 +319,14 @@ void InitGoogleLogging(const char* argv0
#endif
}
+void ShutdownGoogleLogging() {
+ CHECK(IsGoogleLoggingInitialized())
+ << "You called ShutdownGoogleLogging() without InitGoogleLogging() first!";
+#ifdef HAVE_SYSLOG_H
+ closelog();
+#endif
+}
+
_END_GOOGLE_NAMESPACE_
// Make an implementation of stacktrace compiled.
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/utilities.h (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/utilities.h)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/utilities.h?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/utilities.h&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/utilities.h&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/utilities_unittest.cc (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/utilities_unittest.cc)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/utilities_unittest.cc?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/utilities_unittest.cc&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/utilities_unittest.cc&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/vlog_is_on.cc (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/vlog_is_on.cc)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/vlog_is_on.cc?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/vlog_is_on.cc&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/vlog_is_on.cc&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
--- incubator/mesos/trunk/src/third_party/glog-0.3.0/src/vlog_is_on.cc (original)
+++ incubator/mesos/trunk/src/third_party/glog-0.3.1/src/vlog_is_on.cc Sun Jun 5 05:33:57 2011
@@ -49,10 +49,10 @@
using std::string;
-DEFINE_int32(v, 0, "Show all VLOG(m) messages for m <= this."
+GLOG_DEFINE_int32(v, 0, "Show all VLOG(m) messages for m <= this."
" Overridable by --vmodule.");
-DEFINE_string(vmodule, "", "per-module verbose level."
+GLOG_DEFINE_string(vmodule, "", "per-module verbose level."
" Argument is a comma-separated list of <module name>=<log level>."
" <module name> is a glob pattern, matched against the filename base"
" (that is, name ignoring .cc/.h./-inl.h)."
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/windows/config.h (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/windows/config.h)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/windows/config.h?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/windows/config.h&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/windows/config.h&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/windows/glog/log_severity.h (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/windows/glog/log_severity.h)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/windows/glog/log_severity.h?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/windows/glog/log_severity.h&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/windows/glog/log_severity.h&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/windows/glog/logging.h (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/windows/glog/logging.h)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/windows/glog/logging.h?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/windows/glog/logging.h&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/windows/glog/logging.h&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
--- incubator/mesos/trunk/src/third_party/glog-0.3.0/src/windows/glog/logging.h (original)
+++ incubator/mesos/trunk/src/third_party/glog-0.3.1/src/windows/glog/logging.h Sun Jun 5 05:33:57 2011
@@ -413,7 +413,7 @@ DECLARE_bool(stop_logging_if_full_disk);
#ifdef NDEBUG
#define COMPACT_GOOGLE_LOG_DFATAL COMPACT_GOOGLE_LOG_ERROR
#elif GOOGLE_STRIP_LOG <= 3
-#define COMPACT_GOOGLE_LOG_DFATAL LogMessage( \
+#define COMPACT_GOOGLE_LOG_DFATAL google::LogMessage( \
__FILE__, __LINE__, google::FATAL)
#else
#define COMPACT_GOOGLE_LOG_DFATAL google::NullStreamFatal()
@@ -486,6 +486,9 @@ namespace google {
// specified by argv0 in log outputs.
GOOGLE_GLOG_DLL_DECL void InitGoogleLogging(const char* argv0);
+// Shutdown google's logging library.
+GOOGLE_GLOG_DLL_DECL void ShutdownGoogleLogging();
+
// Install a function which will be called after LOG(FATAL).
GOOGLE_GLOG_DLL_DECL void InstallFailureFunction(void (*fail_func)());
@@ -656,7 +659,7 @@ DEFINE_CHECK_OP_IMPL(_GT, > )
// file is included). Save the current meaning now and use it
// in the macro.
typedef std::string _Check_string;
-#define CHECK_OP_LOG(name, op, val1, val2, log) \
+#define CHECK_OP_LOG(name, op, val1, val2, log) \
while (google::_Check_string* _result = \
google::Check##name##Impl( \
google::GetReferenceableValue(val1), \
@@ -667,11 +670,12 @@ typedef std::string _Check_string;
#else
// In optimized mode, use CheckOpString to hint to compiler that
// the while condition is unlikely.
-#define CHECK_OP_LOG(name, op, val1, val2, log) \
- while (google::CheckOpString _result = \
- google::Check##name##Impl(GetReferenceableValue(val1), \
- GetReferenceableValue(val2), \
- #val1 " " #op " " #val2)) \
+#define CHECK_OP_LOG(name, op, val1, val2, log) \
+ while (google::CheckOpString _result = \
+ google::Check##name##Impl( \
+ google::GetReferenceableValue(val1), \
+ google::GetReferenceableValue(val2), \
+ #val1 " " #op " " #val2)) \
log(__FILE__, __LINE__, _result).stream()
#endif // STATIC_ANALYSIS, !NDEBUG
@@ -892,6 +896,7 @@ enum PRIVATE_Counter {COUNTER};
#define DCHECK_LT(val1, val2) CHECK_LT(val1, val2)
#define DCHECK_GE(val1, val2) CHECK_GE(val1, val2)
#define DCHECK_GT(val1, val2) CHECK_GT(val1, val2)
+#define DCHECK_NOTNULL(val) CHECK_NOTNULL(val)
#define DCHECK_STREQ(str1, str2) CHECK_STREQ(str1, str2)
#define DCHECK_STRCASEEQ(str1, str2) CHECK_STRCASEEQ(str1, str2)
#define DCHECK_STRNE(str1, str2) CHECK_STRNE(str1, str2)
@@ -946,6 +951,8 @@ enum PRIVATE_Counter {COUNTER};
while (false) \
CHECK_GT(val1, val2)
+#define DCHECK_NOTNULL(val) (val)
+
#define DCHECK_STREQ(str1, str2) \
while (false) \
CHECK_STREQ(str1, str2)
@@ -1183,7 +1190,7 @@ inline void LogAtLevel(int const severit
// version since there are two advantages: 1. this version outputs the
// file name and the line number where this macro is put like other
// LOG macros, 2. this macro can be used as C++ stream.
-#define LOG_AT_LEVEL(severity) LogMessage(__FILE__, __LINE__, severity).stream()
+#define LOG_AT_LEVEL(severity) google::LogMessage(__FILE__, __LINE__, severity).stream()
// A small helper for CHECK_NOTNULL().
template <typename T>
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/windows/glog/raw_logging.h (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/windows/glog/raw_logging.h)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/windows/glog/raw_logging.h?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/windows/glog/raw_logging.h&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/windows/glog/raw_logging.h&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/windows/glog/stl_logging.h (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/windows/glog/stl_logging.h)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/windows/glog/stl_logging.h?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/windows/glog/stl_logging.h&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/windows/glog/stl_logging.h&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/windows/glog/vlog_is_on.h (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/windows/glog/vlog_is_on.h)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/windows/glog/vlog_is_on.h?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/windows/glog/vlog_is_on.h&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/windows/glog/vlog_is_on.h&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
--- incubator/mesos/trunk/src/third_party/glog-0.3.0/src/windows/glog/vlog_is_on.h (original)
+++ incubator/mesos/trunk/src/third_party/glog-0.3.1/src/windows/glog/vlog_is_on.h Sun Jun 5 05:33:57 2011
@@ -84,6 +84,7 @@
// matching the current source file that represents results of
// parsing of --vmodule flag and/or SetVLOGLevel calls.
#define VLOG_IS_ON(verboselevel) \
+ __extension__ \
({ static google::int32* vlocal__ = &google::kLogSiteUninitialized; \
google::int32 verbose_level__ = (verboselevel); \
(*vlocal__ >= verbose_level__) && \
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/windows/port.cc (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/windows/port.cc)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/windows/port.cc?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/windows/port.cc&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/windows/port.cc&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/windows/port.h (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/windows/port.h)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/windows/port.h?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/windows/port.h&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/windows/port.h&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/src/windows/preprocess.sh (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/src/windows/preprocess.sh)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/src/windows/preprocess.sh?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/src/windows/preprocess.sh&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/src/windows/preprocess.sh&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/vsprojects/libglog/libglog.vcproj (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/vsprojects/libglog/libglog.vcproj)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/vsprojects/libglog/libglog.vcproj?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/vsprojects/libglog/libglog.vcproj&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/vsprojects/libglog/libglog.vcproj&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Propchange: incubator/mesos/trunk/src/third_party/glog-0.3.1/vsprojects/libglog/libglog.vcproj
------------------------------------------------------------------------------
svn:executable = *
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/vsprojects/libglog_static/libglog_static.vcproj (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/vsprojects/libglog_static/libglog_static.vcproj)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/vsprojects/libglog_static/libglog_static.vcproj?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/vsprojects/libglog_static/libglog_static.vcproj&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/vsprojects/libglog_static/libglog_static.vcproj&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/vsprojects/logging_unittest/logging_unittest.vcproj (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/vsprojects/logging_unittest/logging_unittest.vcproj)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/vsprojects/logging_unittest/logging_unittest.vcproj?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/vsprojects/logging_unittest/logging_unittest.vcproj&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/vsprojects/logging_unittest/logging_unittest.vcproj&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)
Propchange: incubator/mesos/trunk/src/third_party/glog-0.3.1/vsprojects/logging_unittest/logging_unittest.vcproj
------------------------------------------------------------------------------
svn:executable = *
Copied: incubator/mesos/trunk/src/third_party/glog-0.3.1/vsprojects/logging_unittest_static/logging_unittest_static.vcproj (from r1131792, incubator/mesos/trunk/src/third_party/glog-0.3.0/vsprojects/logging_unittest_static/logging_unittest_static.vcproj)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/glog-0.3.1/vsprojects/logging_unittest_static/logging_unittest_static.vcproj?p2=incubator/mesos/trunk/src/third_party/glog-0.3.1/vsprojects/logging_unittest_static/logging_unittest_static.vcproj&p1=incubator/mesos/trunk/src/third_party/glog-0.3.0/vsprojects/logging_unittest_static/logging_unittest_static.vcproj&r1=1131792&r2=1131793&rev=1131793&view=diff
==============================================================================
(empty)