wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make envvar access in envvar-knob parsing cross-platform (#7999) 

* Make envvar access in envvar-knob parsing cross-platform

Variable `environ' is defined for Linux,
does not exist in Mac, and is deprecated in Windows

* Prevent env knob strings from being copied at each iteration

* Add headers for {Get|Free}EnvironmentStrings()

* Adjust for different memory layout of environ vs GetEnvironmentStrings()

GetEnvironmentStrings returns a single byte string
with adjacent key=value strings delimited with null bytes,
whereas environ is an array of key=value strings.

* Fix missing return value for Windows build

* Have just one return statement
This commit is contained in:
Junhyun Shim 2022-08-29 14:15:03 +02:00 committed by GitHub
parent f47b64c1c1
commit 71486cccb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdbserver/fdbserver.actor.cpp
View File

@ -1114,7 +1114,7 @@ private:
CLIOptions() = default;
void parseEnvInternal() {
for (std::string knob : getEnvironmentKnobOptions()) {
for (const std::string& knob : getEnvironmentKnobOptions()) {
auto pos = knob.find_first_of("=");
if (pos == std::string::npos) {
fprintf(stderr,
@ -2074,7 +2074,7 @@ int main(int argc, char* argv[]) {
}
std::string environmentKnobOptions;
for (std::string knobOption : getEnvironmentKnobOptions()) {
for (const std::string& knobOption : getEnvironmentKnobOptions()) {
environmentKnobOptions += knobOption + " ";
}
if (environmentKnobOptions.length()) {

39
flow/Platform.actor.cpp
View File

@ -33,16 +33,20 @@
#include "flow/StreamCipher.h"
#include "flow/BlobCipher.h"
#include "flow/ScopeExit.h"
#include "flow/Trace.h"
#include "flow/Error.h"
#include "flow/Knobs.h"
#include <algorithm>
#include <iostream>
#include <fstream>
#include <sstream>
#include <cstring>
#include <algorithm>
#include <string>
#include <string_view>
#include <vector>
#include <boost/format.hpp>
#include <boost/filesystem.hpp>
#include <boost/filesystem/operations.hpp>
@ -65,6 +69,7 @@
#include <direct.h>
#include <pdh.h>
#include <pdhmsg.h>
#include <processenv.h>
#pragma comment(lib, "pdh.lib")
// for SHGetFolderPath
@ -148,6 +153,9 @@
#endif
#ifdef __APPLE__
/* Needed for cross-platform 'environ' */
#include <crt_externs.h>
#include <sys/uio.h>
#include <sys/syslimits.h>
#include <mach/mach.h>
@ -1935,14 +1943,35 @@ std::string epochsToGMTString(double epochs) {
}
std::vector<std::string> getEnvironmentKnobOptions() {
char** e = environ;
constexpr const size_t ENVKNOB_PREFIX_LEN = sizeof(ENVIRONMENT_KNOB_OPTION_PREFIX) - 1;
std::vector<std::string> knobOptions;
for (; *e; e++) {
std::string envOption(*e);
#if defined(_WIN32)
auto e = GetEnvironmentStrings();
if (e == nullptr)
return {};
auto cleanup = ScopeExit([e]() { FreeEnvironmentStrings(e); });
while (*e) {
auto candidate = std::string_view(e);
if (boost::starts_with(candidate, ENVIRONMENT_KNOB_OPTION_PREFIX))
knobOptions.emplace_back(candidate.substr(ENVKNOB_PREFIX_LEN));
e += (candidate.size() + 1);
}
#else
char** e = nullptr;
#ifdef __linux__
e = environ;
#elif defined(__APPLE__)
e = *_NSGetEnviron();
#else
#error Port me!
#endif
for (; e && *e; e++) {
std::string_view envOption(*e);
if (boost::starts_with(envOption, ENVIRONMENT_KNOB_OPTION_PREFIX)) {
knobOptions.push_back(envOption.substr(strlen(ENVIRONMENT_KNOB_OPTION_PREFIX)));
knobOptions.emplace_back(envOption.substr(ENVKNOB_PREFIX_LEN));
}
}
#endif
return knobOptions;
}