luke
/
verilator
mirror of https://github.com/verilator/verilator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Internals: Move getenvStr to verilatedos. (#5118) 

* Internals: Move getenvStr to verilatedos. No functional change intended.
* Fix POS34-C. Do not call putenv() with a pointer to an automatic variable as the argument.

Signed-off-by: Arkadiusz Kozdra <akozdra@antmicro.com>
This commit is contained in:
Arkadiusz Kozdra 2024-05-13 16:23:51 +02:00 committed by GitHub
parent 19cccd170e
commit 9a8e68928d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/verilatedos.h
View File

@ -614,8 +614,13 @@ static inline double VL_ROUND(double n) {
//========================================================================= //=========================================================================
// Time and performance // Time and performance
#include <string>
namespace VlOs { namespace VlOs {
/// Get environment variable
extern std::string getenvStr(const std::string& envvar,
const std::string& defaultValue) VL_MT_SAFE;
extern uint64_t memUsageBytes() VL_MT_SAFE; ///< Return memory usage in bytes, or 0 if unknown extern uint64_t memUsageBytes() VL_MT_SAFE; ///< Return memory usage in bytes, or 0 if unknown
// Internal: Record CPU time, starting point on construction, and current delta from that // Internal: Record CPU time, starting point on construction, and current delta from that

26
include/verilatedos_c.h
View File

@ -99,5 +99,31 @@ uint64_t memUsageBytes() VL_MT_SAFE {
#endif #endif
} }
//=========================================================================
// VlOs::getenvStr implementation
std::string getenvStr(const std::string& envvar, const std::string& defaultValue) VL_MT_SAFE {
std::string ret;
#if defined(_MSC_VER)
// Note: MinGW does not offer _dupenv_s
const char* envvalue = nullptr;
_dupenv_s((char**)&envvalue, nullptr, envvar.c_str());
if (envvalue != nullptr) {
const std::string result{envvalue};
free((void*)envvalue);
ret = result;
} else {
ret = defaultValue;
}
#else
if (const char* const envvalue = getenv(envvar.c_str())) {
ret = envvalue;
} else {
ret = defaultValue;
}
#endif
return ret;
}
//========================================================================= //=========================================================================
} //namespace VlOs } //namespace VlOs

23
src/V3Os.cpp
View File

@ -86,26 +86,7 @@ VL_DEFINE_DEBUG_FUNCTIONS;
// Environment // Environment
string V3Os::getenvStr(const string& envvar, const string& defaultValue) { string V3Os::getenvStr(const string& envvar, const string& defaultValue) {
string ret = ""; return VString::escapeStringForPath(VlOs::getenvStr(envvar, defaultValue));
#if defined(_MSC_VER)
// Note: MinGW does not offer _dupenv_s
const char* envvalue = nullptr;
_dupenv_s((char**)&envvalue, nullptr, envvar.c_str());
if (envvalue != nullptr) {
const std::string result{envvalue};
free((void*)envvalue);
ret = result;
} else {
ret = defaultValue;
}
#else
if (const char* const envvalue = getenv(envvar.c_str())) {
ret = envvalue;
} else {
ret = defaultValue;
}
#endif
return VString::escapeStringForPath(ret);
} }
void V3Os::setenvStr(const string& envvar, const string& value, const string& why) { void V3Os::setenvStr(const string& envvar, const string& value, const string& why) {
@ -122,7 +103,7 @@ void V3Os::setenvStr(const string& envvar, const string& value, const string& wh
// setenv() replaced by putenv() in Solaris environment. Prototype is different // setenv() replaced by putenv() in Solaris environment. Prototype is different
// putenv() requires NAME=VALUE format // putenv() requires NAME=VALUE format
const string vareq = envvar + "=" + value; const string vareq = envvar + "=" + value;
putenv(const_cast<char*>(vareq.c_str())); putenv(strdup(vareq.c_str())); // will leak if setting the same variable again
#endif #endif
} }