forked from bartvdbraak/blender
aeb7bc5beb
Before this change messages of ERROR and above were printed. This change makes it so LOG(INFO), LOG(WARNING), LOG(ERROR) and LOG(FATAL) will be printed to the console by default (without --debug-libmv and --debug-cycles). On a user level nothing is changed because neither INFO nor WARNING severity are used in our codebase. For developers this change allows to use LOG(INFO) to print relevant for debugging information. Bering able to see WARNING messages is also nice, since those are not related to debugging, but are about some detected "bad" state. After this change the LOG(INFO) is really treated as a printf. Why not to use printf to begin with? Because it is often more annoying to print non-scalar types. Why not to use cout? Just a convenience, so that all type of logging is handled in the same way. When one is familiar with Glog used in the area, it is easy to use same utilities during development. Also, it is easy to change LOG(INFO) to VLOG(2) when development is done and one wants to keep the log print but make it only appear when using special verbosity flags. The initial reason why default severity was set to maximum possible value is because of misuse of VLOG with verbosity level 0, which is the same as LOG(INFO). This is also why back in the days --debug-libmv was introduced. Now there is some redundancy between --debug-libmv, --debug-cyles and --verbose, but changes in their meaning will cause user level side effects. Differential Revision: https://developer.blender.org/D10513
99 lines
2.3 KiB
C++
99 lines
2.3 KiB
C++
/*
|
|
* Copyright 2011-2014 Blender Foundation
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include "util/util_logging.h"
|
|
|
|
#include "util/util_math.h"
|
|
#include "util/util_string.h"
|
|
|
|
#include <stdio.h>
|
|
#ifdef _MSC_VER
|
|
# define snprintf _snprintf
|
|
#endif
|
|
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
static bool is_verbosity_set()
|
|
{
|
|
#ifdef WITH_CYCLES_LOGGING
|
|
using CYCLES_GFLAGS_NAMESPACE::GetCommandLineOption;
|
|
|
|
std::string verbosity;
|
|
if (!GetCommandLineOption("v", &verbosity)) {
|
|
return false;
|
|
}
|
|
return verbosity != "0";
|
|
#else
|
|
return false;
|
|
#endif
|
|
}
|
|
|
|
void util_logging_init(const char *argv0)
|
|
{
|
|
#ifdef WITH_CYCLES_LOGGING
|
|
using CYCLES_GFLAGS_NAMESPACE::SetCommandLineOption;
|
|
|
|
google::InitGoogleLogging(argv0);
|
|
SetCommandLineOption("logtostderr", "1");
|
|
if (!is_verbosity_set()) {
|
|
SetCommandLineOption("v", "0");
|
|
}
|
|
SetCommandLineOption("stderrthreshold", "0");
|
|
SetCommandLineOption("minloglevel", "0");
|
|
#else
|
|
(void)argv0;
|
|
#endif
|
|
}
|
|
|
|
void util_logging_start()
|
|
{
|
|
#ifdef WITH_CYCLES_LOGGING
|
|
using CYCLES_GFLAGS_NAMESPACE::SetCommandLineOption;
|
|
SetCommandLineOption("logtostderr", "1");
|
|
if (!is_verbosity_set()) {
|
|
SetCommandLineOption("v", "2");
|
|
}
|
|
SetCommandLineOption("stderrthreshold", "0");
|
|
SetCommandLineOption("minloglevel", "0");
|
|
#endif
|
|
}
|
|
|
|
void util_logging_verbosity_set(int verbosity)
|
|
{
|
|
#ifdef WITH_CYCLES_LOGGING
|
|
using CYCLES_GFLAGS_NAMESPACE::SetCommandLineOption;
|
|
char val[10];
|
|
snprintf(val, sizeof(val), "%d", verbosity);
|
|
SetCommandLineOption("v", val);
|
|
#else
|
|
(void)verbosity;
|
|
#endif
|
|
}
|
|
|
|
std::ostream &operator<<(std::ostream &os, const int2 &value)
|
|
{
|
|
os << "(" << value.x << ", " << value.y << ")";
|
|
return os;
|
|
}
|
|
|
|
std::ostream &operator<<(std::ostream &os, const float3 &value)
|
|
{
|
|
os << "(" << value.x << ", " << value.y << ", " << value.z << ")";
|
|
return os;
|
|
}
|
|
|
|
CCL_NAMESPACE_END
|