always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support vmodule

Browse Source
This commit is contained in:
Laurent Perron
2021-12-19 22:48:51 +01:00
parent 0f5ea29cb1
commit b9dd3e47d4
2 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ortools/base/vlog_is_on.cc
View File

@@ -15,9 +15,9 @@
#include <errno.h>
#include <stdlib.h>
#include <string.h>
#include <cstdio>
#include <cstring>
#include <string>
#include "absl/synchronization/mutex.h"
@@ -27,11 +27,6 @@
#include "ortools/base/logging_utilities.h"
#include "ortools/base/raw_logging.h"
// glog doesn't have annotation
#define ANNOTATE_BENIGN_RACE(address, description)
using std::string;
ABSL_FLAG(int, v, 0,
"Show all VLOG(m) messages for m <= this."
" Overridable by --vmodule.");
@@ -97,7 +92,7 @@ int32_t kLogSiteUninitialized = 1000;
// We can't use an STL struct here as we wouldn't know
// when it's safe to delete/update it: other threads need to use it w/o locks.
struct VModuleInfo {
string module_pattern;
std::string module_pattern;
mutable int32_t vlog_level; // Conceptually this is an AtomicWord, but it's
// too much work to use AtomicWord type here
// w/o much actual benefit.
@@ -123,7 +118,7 @@ static void VLOG2Initializer() {
VModuleInfo* head = NULL;
VModuleInfo* tail = NULL;
while ((sep = strchr(vmodule, '=')) != NULL) {
string pattern(vmodule, sep - vmodule);
std::string pattern(vmodule, sep - vmodule);
int module_level;
if (sscanf(sep, "=%d", &module_level) == 1) {
VModuleInfo* info = new VModuleInfo;
@@ -183,7 +178,7 @@ int SetVLOGLevel(const char* module_pattern, int log_level) {
// NOTE: Individual VLOG statements cache the integer log level pointers.
// NOTE: This function must not allocate memory or require any locks.
bool InitVLOG3__(int32_t** site_flag, int32_t* site_default, const char* fname,
bool InitVLOG3__(int32_t** vmodule_info, bool* initialized, const char* fname,
int32_t verbose_level) {
absl::MutexLock l(&vmodule_lock);
bool read_vmodule_flag = inited_vmodule;
@@ -195,8 +190,8 @@ bool InitVLOG3__(int32_t** site_flag, int32_t* site_default, const char* fname,
// VLOG(..) << "The last error was " << strerror(errno)
int old_errno = errno;
// site_default normally points to absl::GetFlag(FLAGS_v)
int32_t* site_flag_value = site_default;
// Set the initialized flag.
*initialized = true;
// Get basename for file
const char* base = strrchr(fname, '/');
@@ -218,23 +213,18 @@ bool InitVLOG3__(int32_t** site_flag, int32_t* site_default, const char* fname,
info = info->next) {
if (SafeFNMatch_(info->module_pattern.c_str(), info->module_pattern.size(),
base, base_length)) {
site_flag_value = &info->vlog_level;
*vmodule_info = &info->vlog_level;
// value at info->vlog_level is now what controls
// the VLOG at the caller site forever
break;
}
}
// Cache the vlog value pointer if --vmodule flag has been parsed.
ANNOTATE_BENIGN_RACE(site_flag,
"*site_flag may be written by several threads,"
" but the value will be the same");
if (read_vmodule_flag) *site_flag = site_flag_value;
// restore the errno in case something recoverable went wrong during
// the initialization of the VLOG mechanism (see above note "protect the..")
errno = old_errno;
return *site_flag_value >= verbose_level;
return *vmodule_info == nullptr ? absl::GetFlag(FLAGS_v) >= verbose_level
: **vmodule_info >= verbose_level;
}
} // namespace google

31
ortools/base/vlog_is_on.h
View File

@@ -19,21 +19,24 @@
namespace google {
#if defined(__GNUC__DISABLED)
#if defined(__GNUC__)
// We emit an anonymous static int* variable at every VLOG_IS_ON(n) site.
// (Normally) the first time every VLOG_IS_ON(n) site is hit,
// we determine what variable will dynamically control logging at this site:
// it's either absl::GetFlag(FLAGS_v) or an appropriate internal variable
// matching the current source file that represents results of
// parsing of --vmodule flag and/or SetVLOGLevel calls.
#define VLOG_IS_ON(verboselevel) \
__extension__({ \
static int32_t* vlocal__ = &google::kLogSiteUninitialized; \
int32_t verbose_level__ = (verboselevel); \
(*vlocal__ >= verbose_level__) && \
((vlocal__ != &google::kLogSiteUninitialized) || \
(google::InitVLOG3__(&vlocal__, &absl::GetFlag(FLAGS_v), __FILE__, \
verbose_level__))); \
#define VLOG_IS_ON(verboselevel) \
__extension__({ \
static bool vmodule_initialized__ = false; \
static int32_t* vmodule_info__ = nullptr; \
int32_t verbose_level__ = (verboselevel); \
(vmodule_initialized__ \
? (vmodule_info__ == nullptr \
? absl::GetFlag(FLAGS_v) >= verbose_level__ \
: *vmodule_info__ >= verbose_level__) \
: google::InitVLOG3__(&vmodule_info__, &vmodule_initialized__, \
__FILE__, verbose_level__)); \
})
#else
// GNU extensions not available, so we do not support --vmodule.
@@ -61,15 +64,15 @@ extern GOOGLE_GLOG_DLL_DECL int SetVLOGLevel(const char* module_pattern,
extern int32_t kLogSiteUninitialized;
// 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
// verbosity level
// site_default is the default to use for *site_flag
// get_level is a function that returns the log level
// initialized is a boolean value that tells if vmodule was initialized
// for that file.
// fname is the current source file name
// verbose_level is the argument to VLOG_IS_ON
// We will return the return value for VLOG_IS_ON
// and if possible set *site_flag appropriately.
extern GOOGLE_GLOG_DLL_DECL bool InitVLOG3__(int32_t** site_flag,
int32_t* site_default,
extern GOOGLE_GLOG_DLL_DECL bool InitVLOG3__(int32_t** vmodule_info,
bool* initialized,
const char* fname,
int32_t verbose_level);