Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(66)

Side by Side Diff: util/win/ntstatus_logging.h

Issue 1426493002: win: Fix NTSTATUS_LOG for no-function arg version of COMPACT_GOOGLE_LOG_EX_ (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: . Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | util/win/ntstatus_logging.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Crashpad Authors. All rights reserved. 1 // Copyright 2015 The Crashpad Authors. All rights reserved.
2 // 2 //
3 // Licensed under the Apache License, Version 2.0 (the "License"); 3 // Licensed under the Apache License, Version 2.0 (the "License");
4 // you may not use this file except in compliance with the License. 4 // you may not use this file except in compliance with the License.
5 // You may obtain a copy of the License at 5 // You may obtain a copy of the License at
6 // 6 //
7 // http://www.apache.org/licenses/LICENSE-2.0 7 // http://www.apache.org/licenses/LICENSE-2.0
8 // 8 //
9 // Unless required by applicable law or agreed to in writing, software 9 // Unless required by applicable law or agreed to in writing, software
10 // distributed under the License is distributed on an "AS IS" BASIS, 10 // distributed under the License is distributed on an "AS IS" BASIS,
11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12 // See the License for the specific language governing permissions and 12 // See the License for the specific language governing permissions and
13 // limitations under the License. 13 // limitations under the License.
14 14
15 #ifndef CRASHPAD_UTIL_WIN_NTSTATUS_LOGGING_H_ 15 #ifndef CRASHPAD_UTIL_WIN_NTSTATUS_LOGGING_H_
16 #define CRASHPAD_UTIL_WIN_NTSTATUS_LOGGING_H_ 16 #define CRASHPAD_UTIL_WIN_NTSTATUS_LOGGING_H_
17 17
18 #include <windows.h> 18 #include <windows.h>
19 19
20 #include "base/basictypes.h" 20 #include "base/basictypes.h"
21 #include "base/logging.h" 21 #include "base/logging.h"
22 22
23 namespace logging { 23 namespace logging {
24 24
25 class NtstatusLogMessage : public logging::LogMessage { 25 class NtstatusLogMessage : public logging::LogMessage {
26 public: 26 public:
27 NtstatusLogMessage(const char* function, 27 NtstatusLogMessage(
28 const char* file_path, 28 #if defined(MINI_CHROMIUM_BASE_LOGGING_H_)
29 int line, 29 const char* function,
30 LogSeverity severity, 30 #endif
31 DWORD ntstatus); 31 const char* file_path,
32 int line,
33 LogSeverity severity,
34 DWORD ntstatus);
32 ~NtstatusLogMessage(); 35 ~NtstatusLogMessage();
33 36
34 private: 37 private:
35 DWORD ntstatus_; 38 DWORD ntstatus_;
36 39
37 DISALLOW_COPY_AND_ASSIGN(NtstatusLogMessage); 40 DISALLOW_COPY_AND_ASSIGN(NtstatusLogMessage);
38 }; 41 };
39 42
40 } // namespace logging 43 } // namespace logging
41 44
42 #define NTSTATUS_LOG_STREAM(severity, ntstatus) \ 45 #define NTSTATUS_LOG_STREAM(severity, ntstatus) \
43 COMPACT_GOOGLE_LOG_EX_##severity(NtstatusLogMessage, ntstatus).stream() 46 COMPACT_GOOGLE_LOG_EX_##severity(NtstatusLogMessage, ntstatus).stream()
47
48 #if defined(MINI_CHROMIUM_BASE_LOGGING_H_)
49
44 #define NTSTATUS_VLOG_STREAM(verbose_level, ntstatus) \ 50 #define NTSTATUS_VLOG_STREAM(verbose_level, ntstatus) \
45 logging::NtstatusLogMessage( \ 51 logging::NtstatusLogMessage( \
46 __PRETTY_FUNCTION__, __FILE__, __LINE__, -verbose_level, ntstatus) \ 52 __PRETTY_FUNCTION__, __FILE__, __LINE__, -verbose_level, ntstatus) \
47 .stream() 53 .stream()
48 54
55 #else
56
57 #define NTSTATUS_VLOG_STREAM(verbose_level, ntstatus) \
58 logging::NtstatusLogMessage(__FILE__, __LINE__, -verbose_level, ntstatus) \
59 .stream()
60
61 #endif // MINI_CHROMIUM_BASE_LOGGING_H_
62
49 #define NTSTATUS_LOG(severity, ntstatus) \ 63 #define NTSTATUS_LOG(severity, ntstatus) \
50 LAZY_STREAM(NTSTATUS_LOG_STREAM(severity, ntstatus), LOG_IS_ON(severity)) 64 LAZY_STREAM(NTSTATUS_LOG_STREAM(severity, ntstatus), LOG_IS_ON(severity))
51 #define NTSTATUS_LOG_IF(severity, condition, ntstatus) \ 65 #define NTSTATUS_LOG_IF(severity, condition, ntstatus) \
52 LAZY_STREAM(NTSTATUS_LOG_STREAM(severity, ntstatus), \ 66 LAZY_STREAM(NTSTATUS_LOG_STREAM(severity, ntstatus), \
53 LOG_IS_ON(severity) && (condition)) 67 LOG_IS_ON(severity) && (condition))
54 68
55 #define NTSTATUS_VLOG(verbose_level, ntstatus) \ 69 #define NTSTATUS_VLOG(verbose_level, ntstatus) \
56 LAZY_STREAM(NTSTATUS_VLOG_STREAM(verbose_level, ntstatus), \ 70 LAZY_STREAM(NTSTATUS_VLOG_STREAM(verbose_level, ntstatus), \
57 VLOG_IS_ON(verbose_level)) 71 VLOG_IS_ON(verbose_level))
58 #define NTSTATUS_VLOG_IF(verbose_level, condition, ntstatus) \ 72 #define NTSTATUS_VLOG_IF(verbose_level, condition, ntstatus) \
(...skipping 16 matching lines...) Expand all
75 #define NTSTATUS_DVLOG_IF(verbose_level, condition, ntstatus) \ 89 #define NTSTATUS_DVLOG_IF(verbose_level, condition, ntstatus) \
76 LAZY_STREAM(NTSTATUS_VLOG_STREAM(verbose_level, ntstatus), \ 90 LAZY_STREAM(NTSTATUS_VLOG_STREAM(verbose_level, ntstatus), \
77 DVLOG_IS_ON(verbose_level) && (condition)) 91 DVLOG_IS_ON(verbose_level) && (condition))
78 92
79 #define NTSTATUS_DCHECK(condition, ntstatus) \ 93 #define NTSTATUS_DCHECK(condition, ntstatus) \
80 LAZY_STREAM(NTSTATUS_LOG_STREAM(FATAL, ntstatus), \ 94 LAZY_STREAM(NTSTATUS_LOG_STREAM(FATAL, ntstatus), \
81 DCHECK_IS_ON && !(condition)) \ 95 DCHECK_IS_ON && !(condition)) \
82 << "Check failed: " #condition << ". " 96 << "Check failed: " #condition << ". "
83 97
84 #endif // CRASHPAD_UTIL_WIN_NTSTATUS_LOGGING_H_ 98 #endif // CRASHPAD_UTIL_WIN_NTSTATUS_LOGGING_H_
OLDNEW
« no previous file with comments | « no previous file | util/win/ntstatus_logging.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698