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

Merge pull request #542 from xulongwu4/master

Browse Source 
Use NULL to indicate uninitialized VLOG_IS_ON site.
This commit is contained in:
Sergiu Deitsch 2020-10-03 01:12:22 +02:00 committed by GitHub
commit cec37e1cf5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/glog/vlog_is_on.h.in
View File

@ -81,12 +81,11 @@
// parsing of --vmodule flag and/or SetVLOGLevel calls. // parsing of --vmodule flag and/or SetVLOGLevel calls.
#define VLOG_IS_ON(verboselevel) \ #define VLOG_IS_ON(verboselevel) \
__extension__ \ __extension__ \
({ static @ac_google_namespace@::int32* vlocal__ = &@ac_google_namespace@::kLogSiteUninitialized; \ ({ static @ac_google_namespace@::int32* vlocal__ = NULL; \
@ac_google_namespace@::int32 verbose_level__ = (verboselevel); \ @ac_google_namespace@::int32 verbose_level__ = (verboselevel); \
(*vlocal__ >= verbose_level__) && \ (vlocal__ == NULL ? @ac_google_namespace@::InitVLOG3__(&vlocal__, &FLAGS_v, \
((vlocal__ != &@ac_google_namespace@::kLogSiteUninitialized) || \ __FILE__, verbose_level__) : *vlocal__ >= verbose_level__); \
(@ac_google_namespace@::InitVLOG3__(&vlocal__, &FLAGS_v, \ })
__FILE__, verbose_level__))); })
#else #else
// GNU extensions not available, so we do not support --vmodule. // GNU extensions not available, so we do not support --vmodule.
// Dynamic value of FLAGS_v always controls the logging level. // Dynamic value of FLAGS_v always controls the logging level.
@ -106,12 +105,6 @@ extern GOOGLE_GLOG_DLL_DECL int SetVLOGLevel(const char* module_pattern,
// Various declarations needed for VLOG_IS_ON above: ========================= // Various declarations needed for VLOG_IS_ON above: =========================
// Special value used to indicate that a VLOG_IS_ON site has not been
// initialized. We make this a large value, so the common-case check
// of "*vlocal__ >= verbose_level__" in VLOG_IS_ON definition
// passes in such cases and InitVLOG3__ is then triggered.
extern @ac_google_namespace@::int32 kLogSiteUninitialized;
// Helper routine which determines the logging info for a particalur VLOG site. // Helper routine which determines the logging info for a particalur VLOG site.
// site_flag is the address of the site-local pointer to the controlling // site_flag is the address of the site-local pointer to the controlling
// verbosity level // verbosity level

2
src/vlog_is_on.cc
View File

@ -105,8 +105,6 @@ GOOGLE_GLOG_DLL_DECL bool SafeFNMatch_(const char* pattern,
using glog_internal_namespace_::SafeFNMatch_; using glog_internal_namespace_::SafeFNMatch_;
int32 kLogSiteUninitialized = 1000;
// List of per-module log levels from FLAGS_vmodule. // List of per-module log levels from FLAGS_vmodule.
// Once created each element is never deleted/modified // Once created each element is never deleted/modified
// except for the vlog_level: other threads will read VModuleInfo blobs // except for the vlog_level: other threads will read VModuleInfo blobs

15
src/windows/glog/vlog_is_on.h
View File

@ -85,12 +85,11 @@
// parsing of --vmodule flag and/or SetVLOGLevel calls. // parsing of --vmodule flag and/or SetVLOGLevel calls.
#define VLOG_IS_ON(verboselevel) \ #define VLOG_IS_ON(verboselevel) \
__extension__ \ __extension__ \
({ static google::int32* vlocal__ = &google::kLogSiteUninitialized; \ ({ static @ac_google_namespace@::int32* vlocal__ = NULL; \
google::int32 verbose_level__ = (verboselevel); \ google::int32 verbose_level__ = (verboselevel); \
(*vlocal__ >= verbose_level__) && \ (vlocal__ == NULL ? @ac_google_namespace@::InitVLOG3__(&vlocal__, &FLAGS_v, \
((vlocal__ != &google::kLogSiteUninitialized) || \ __FILE__, verbose_level__) : *vlocal__ >= verbose_level__); \
(google::InitVLOG3__(&vlocal__, &FLAGS_v, \ })
__FILE__, verbose_level__))); })
#else #else
// GNU extensions not available, so we do not support --vmodule. // GNU extensions not available, so we do not support --vmodule.
// Dynamic value of FLAGS_v always controls the logging level. // Dynamic value of FLAGS_v always controls the logging level.
@ -110,12 +109,6 @@ extern GOOGLE_GLOG_DLL_DECL int SetVLOGLevel(const char* module_pattern,
// Various declarations needed for VLOG_IS_ON above: ========================= // Various declarations needed for VLOG_IS_ON above: =========================
// Special value used to indicate that a VLOG_IS_ON site has not been
// initialized. We make this a large value, so the common-case check
// of "*vlocal__ >= verbose_level__" in VLOG_IS_ON definition
// passes in such cases and InitVLOG3__ is then triggered.
extern google::int32 kLogSiteUninitialized;
// Helper routine which determines the logging info for a particalur VLOG site. // Helper routine which determines the logging info for a particalur VLOG site.
// site_flag is the address of the site-local pointer to the controlling // site_flag is the address of the site-local pointer to the controlling
// verbosity level // verbosity level