DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

C++ style enums 5/N: LogLevel (#1387)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/yoga/pull/1387

X-link: https://github.com/facebook/react-native/pull/39447

This converts usages of YGLogLevel to LogLevel

Reviewed By: rozele

Differential Revision: D49270695

fbshipit-source-id: 2ba5b4f2b0af93fef89dbbb2ce54c2f486670aac
This commit is contained in:
Nick Gerleman
2023-09-14 23:06:34 -07:00
committed by Facebook GitHub Bot
parent 6f5eaefc51
commit 70954bbda5
7 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yoga/Yoga.cpp
View File

@@ -805,7 +805,7 @@ void YGNodePrint(const YGNodeConstRef nodeRef, const YGPrintOptions options) {
const auto node = resolveRef(nodeRef); const auto node = resolveRef(nodeRef);
std::string str; std::string str;
yoga::nodeToString(str, node, options, 0); yoga::nodeToString(str, node, options, 0);
yoga::log(node, YGLogLevelDebug, str.c_str()); yoga::log(node, LogLevel::Debug, str.c_str());
} }
#endif #endif

14
yoga/algorithm/CalculateLayout.cpp
View File

@@ -2526,14 +2526,14 @@ bool calculateLayoutInternal(
if (gPrintChanges && gPrintSkips) { if (gPrintChanges && gPrintSkips) {
yoga::log( yoga::log(
node, node,
YGLogLevelVerbose, LogLevel::Verbose,
"%s%d.{[skipped] ", "%s%d.{[skipped] ",
spacerWithLength(depth), spacerWithLength(depth),
depth); depth);
node->print(); node->print();
yoga::log( yoga::log(
node, node,
YGLogLevelVerbose, LogLevel::Verbose,
"wm: %s, hm: %s, aw: %f ah: %f => d: (%f, %f) %s\n", "wm: %s, hm: %s, aw: %f ah: %f => d: (%f, %f) %s\n",
measureModeName(widthMeasureMode, performLayout), measureModeName(widthMeasureMode, performLayout),
measureModeName(heightMeasureMode, performLayout), measureModeName(heightMeasureMode, performLayout),
@@ -2547,7 +2547,7 @@ bool calculateLayoutInternal(
if (gPrintChanges) { if (gPrintChanges) {
yoga::log( yoga::log(
node, node,
YGLogLevelVerbose, LogLevel::Verbose,
"%s%d.{%s", "%s%d.{%s",
spacerWithLength(depth), spacerWithLength(depth),
depth, depth,
@@ -2555,7 +2555,7 @@ bool calculateLayoutInternal(
node->print(); node->print();
yoga::log( yoga::log(
node, node,
YGLogLevelVerbose, LogLevel::Verbose,
"wm: %s, hm: %s, aw: %f ah: %f %s\n", "wm: %s, hm: %s, aw: %f ah: %f %s\n",
measureModeName(widthMeasureMode, performLayout), measureModeName(widthMeasureMode, performLayout),
measureModeName(heightMeasureMode, performLayout), measureModeName(heightMeasureMode, performLayout),
@@ -2582,7 +2582,7 @@ bool calculateLayoutInternal(
if (gPrintChanges) { if (gPrintChanges) {
yoga::log( yoga::log(
node, node,
YGLogLevelVerbose, LogLevel::Verbose,
"%s%d.}%s", "%s%d.}%s",
spacerWithLength(depth), spacerWithLength(depth),
depth, depth,
@@ -2590,7 +2590,7 @@ bool calculateLayoutInternal(
node->print(); node->print();
yoga::log( yoga::log(
node, node,
YGLogLevelVerbose, LogLevel::Verbose,
"wm: %s, hm: %s, d: (%f, %f) %s\n", "wm: %s, hm: %s, d: (%f, %f) %s\n",
measureModeName(widthMeasureMode, performLayout), measureModeName(widthMeasureMode, performLayout),
measureModeName(heightMeasureMode, performLayout), measureModeName(heightMeasureMode, performLayout),
@@ -2609,7 +2609,7 @@ bool calculateLayoutInternal(
if (layout->nextCachedMeasurementsIndex == if (layout->nextCachedMeasurementsIndex ==
LayoutResults::MaxCachedMeasurements) { LayoutResults::MaxCachedMeasurements) {
if (gPrintChanges) { if (gPrintChanges) {
yoga::log(node, YGLogLevelVerbose, "Out of cache entries!\n"); yoga::log(node, LogLevel::Verbose, "Out of cache entries!\n");
} }
layout->nextCachedMeasurementsIndex = 0; layout->nextCachedMeasurementsIndex = 0;
} }

4
yoga/config/Config.cpp
View File

@@ -96,10 +96,10 @@ void Config::setLogger(YGLogger logger) {
void Config::log( void Config::log(
const yoga::Node* node, const yoga::Node* node,
YGLogLevel logLevel, LogLevel logLevel,
const char* format, const char* format,
va_list args) const { va_list args) const {
logger_(this, node, logLevel, format, args); logger_(this, node, unscopedEnum(logLevel), format, args);
} }
void Config::setCloneNodeCallback(YGCloneNodeFunc cloneNode) { void Config::setCloneNodeCallback(YGCloneNodeFunc cloneNode) {

3
yoga/config/Config.h
View File

@@ -12,6 +12,7 @@
#include <yoga/Yoga.h> #include <yoga/Yoga.h>
#include <yoga/enums/Errata.h> #include <yoga/enums/Errata.h>
#include <yoga/enums/ExperimentalFeature.h> #include <yoga/enums/ExperimentalFeature.h>
#include <yoga/enums/LogLevel.h>
// Tag struct used to form the opaque YGConfigRef for the public C API // Tag struct used to form the opaque YGConfigRef for the public C API
struct YGConfig {}; struct YGConfig {};
@@ -67,7 +68,7 @@ class YG_EXPORT Config : public ::YGConfig {
void setLogger(YGLogger logger); void setLogger(YGLogger logger);
void log( void log(
const yoga::Node* node, const yoga::Node* node,
YGLogLevel logLevel, LogLevel logLevel,
const char* format, const char* format,
va_list args) const; va_list args) const;

6
yoga/debug/AssertFatal.cpp
View File

@@ -22,7 +22,7 @@ namespace facebook::yoga {
void assertFatal(const bool condition, const char* message) { void assertFatal(const bool condition, const char* message) {
if (!condition) { if (!condition) {
yoga::log(YGLogLevelFatal, "%s\n", message); yoga::log(LogLevel::Fatal, "%s\n", message);
fatalWithMessage(message); fatalWithMessage(message);
} }
} }
@@ -32,7 +32,7 @@ void assertFatalWithNode(
const bool condition, const bool condition,
const char* message) { const char* message) {
if (!condition) { if (!condition) {
yoga::log(node, YGLogLevelFatal, "%s\n", message); yoga::log(node, LogLevel::Fatal, "%s\n", message);
fatalWithMessage(message); fatalWithMessage(message);
} }
} }
@@ -42,7 +42,7 @@ void assertFatalWithConfig(
const bool condition, const bool condition,
const char* message) { const char* message) {
if (!condition) { if (!condition) {
yoga::log(config, YGLogLevelFatal, "%s\n", message); yoga::log(config, LogLevel::Fatal, "%s\n", message);
fatalWithMessage(message); fatalWithMessage(message);
} }
} }

10
yoga/debug/Log.cpp
View File

@@ -18,18 +18,18 @@ namespace {
void vlog( void vlog(
const yoga::Config* config, const yoga::Config* config,
const yoga::Node* node, const yoga::Node* node,
YGLogLevel level, LogLevel level,
const char* format, const char* format,
va_list args) { va_list args) {
if (config == nullptr) { if (config == nullptr) {
getDefaultLogger()(nullptr, node, level, format, args); getDefaultLogger()(nullptr, node, unscopedEnum(level), format, args);
} else { } else {
config->log(node, level, format, args); config->log(node, level, format, args);
} }
} }
} // namespace } // namespace
void log(YGLogLevel level, const char* format, ...) noexcept { void log(LogLevel level, const char* format, ...) noexcept {
va_list args; va_list args;
va_start(args, format); va_start(args, format);
vlog(nullptr, nullptr, level, format, args); vlog(nullptr, nullptr, level, format, args);
@@ -38,7 +38,7 @@ void log(YGLogLevel level, const char* format, ...) noexcept {
void log( void log(
const yoga::Node* node, const yoga::Node* node,
YGLogLevel level, LogLevel level,
const char* format, const char* format,
...) noexcept { ...) noexcept {
va_list args; va_list args;
@@ -50,7 +50,7 @@ void log(
void log( void log(
const yoga::Config* config, const yoga::Config* config,
YGLogLevel level, LogLevel level,
const char* format, const char* format,
...) noexcept { ...) noexcept {
va_list args; va_list args;

8
yoga/debug/Log.h
View File

@@ -9,23 +9,23 @@
#include <yoga/Yoga.h> #include <yoga/Yoga.h>
#include <yoga/YGEnums.h>
#include <yoga/config/Config.h> #include <yoga/config/Config.h>
#include <yoga/enums/LogLevel.h>
#include <yoga/node/Node.h> #include <yoga/node/Node.h>
namespace facebook::yoga { namespace facebook::yoga {
void log(YGLogLevel level, const char* format, ...) noexcept; void log(LogLevel level, const char* format, ...) noexcept;
void log( void log(
const yoga::Node* node, const yoga::Node* node,
YGLogLevel level, LogLevel level,
const char* message, const char* message,
...) noexcept; ...) noexcept;
void log( void log(
const yoga::Config* config, const yoga::Config* config,
YGLogLevel level, LogLevel level,
const char* format, const char* format,
...) noexcept; ...) noexcept;