Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix resource path parsing on Windows and fix empty/null messages list #176

Merged
merged 5 commits into from
May 2, 2023
Merged

Fix resource path parsing on Windows and fix empty/null messages list #176

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e8ffaa4
If the path to resources contains spaces, they may have been converte…
Feb 22, 2023
915a96c
Safeguarding against empty/null pMessages_ list.
Feb 22, 2023
2a94a3e
Reverting the previous change to uuid handling.
Feb 22, 2023
9549563
Merge remote-tracking branch 'upstream/master'
Feb 23, 2023
16263e9
revert change to uuid
markaren May 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
61 changes: 32 additions & 29 deletions pythonfmu/pythonfmu-export/src/pythonfmu/PySlaveInstance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,39 +104,41 @@ void PySlaveInstance::clearLogBuffer() const
PyObject* categoryField = Py_BuildValue("s", "category");
PyObject* statusField = Py_BuildValue("s", "status");

auto size = PyList_Size(pMessages_);
for (auto i = 0; i < size; i++) {
PyObject* msg = PyList_GetItem(pMessages_, i);

auto debugAttr = PyObject_GetAttr(msg, debugField);
auto msgAttr = PyObject_GetAttr(msg, msgField);
auto categoryAttr = PyObject_GetAttr(msg, categoryField);
auto statusAttr = PyObject_GetAttr(msg, statusField);

auto statusValue = static_cast<cppfmu::FMIStatus>(PyLong_AsLong(statusAttr));

PyObject* msgValue = PyUnicode_AsEncodedString(msgAttr, "utf-8", nullptr);
char* msgStr = PyBytes_AsString(msgValue);
logStrBuffer.emplace_back(msgValue);

const char* categoryStr = "";
if (categoryAttr != Py_None) {
PyObject* categoryValue = PyUnicode_AsEncodedString(categoryAttr, "utf-8", nullptr);
categoryStr = PyBytes_AsString(categoryValue);
logStrBuffer.emplace_back(categoryValue);
}

if (PyObject_IsTrue(debugAttr)) {
const_cast<cppfmu::Logger&>(logger_).DebugLog(statusValue, categoryStr, msgStr);
} else {
const_cast<cppfmu::Logger&>(logger_).Log(statusValue, categoryStr, msgStr);
}
if ( pMessages_ != NULL && PyList_Check(pMessages_) ) {
auto size = PyList_Size(pMessages_);
for (auto i = 0; i < size; i++) {
PyObject* msg = PyList_GetItem(pMessages_, i);

auto debugAttr = PyObject_GetAttr(msg, debugField);
auto msgAttr = PyObject_GetAttr(msg, msgField);
auto categoryAttr = PyObject_GetAttr(msg, categoryField);
auto statusAttr = PyObject_GetAttr(msg, statusField);

auto statusValue = static_cast<cppfmu::FMIStatus>(PyLong_AsLong(statusAttr));

PyObject* msgValue = PyUnicode_AsEncodedString(msgAttr, "utf-8", nullptr);
char* msgStr = PyBytes_AsString(msgValue);
logStrBuffer.emplace_back(msgValue);

const char* categoryStr = "";
if (categoryAttr != Py_None) {
PyObject* categoryValue = PyUnicode_AsEncodedString(categoryAttr, "utf-8", nullptr);
categoryStr = PyBytes_AsString(categoryValue);
logStrBuffer.emplace_back(categoryValue);
}

if (PyObject_IsTrue(debugAttr)) {
const_cast<cppfmu::Logger&>(logger_).DebugLog(statusValue, categoryStr, msgStr);
} else {
const_cast<cppfmu::Logger&>(logger_).Log(statusValue, categoryStr, msgStr);
}
}
PyList_SetSlice(pMessages_, 0, size, nullptr);
}
Py_DECREF(debugField);
Py_DECREF(msgField);
Py_DECREF(categoryField);
Py_DECREF(statusField);
PyList_SetSlice(pMessages_, 0, size, nullptr);
}

void PySlaveInstance::initialize(PyGILState_STATE gilState)
Expand Down Expand Up @@ -548,7 +550,8 @@ cppfmu::UniquePtr<cppfmu::SlaveInstance> CppfmuInstantiateSlave(
const cppfmu::Logger& logger)
{

auto resources = std::string(fmuResourceLocation);
// Convert URI %20 to space
auto resources = std::regex_replace(std::string(fmuResourceLocation), std::regex("%20"), " ");
auto find = resources.find("file://");

if (find != std::string::npos) {
Expand Down