Skip to content

Agent crash when performing current after reloading identical Device.xml file #489

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

Merged
merged 4 commits into from
Sep 23, 2024
Merged

Agent crash when performing current after reloading identical Device.xml file #489

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
86f098d
Do not migrate old required data items to new device, not necessary
wsobel Sep 22, 2024
39da3d6
upgraded windows workflow to VS 2022 and removed unused variable
wsobel Sep 22, 2024
4a72288
reverted back to 2019
wsobel Sep 23, 2024
1efb81b
Version 2.4.0.2
wsobel Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ on:

jobs:
build_windows:
runs-on: windows-2019
name: "Windows 2019 Arch: ${{ matrix.arch }}, Shared: ${{ matrix.shared }}"
runs-on: windows-2022
name: "Windows 2022 Arch: ${{ matrix.arch }}, Shared: ${{ matrix.shared }}"
strategy:
matrix:
arch: ["x86", "amd64"]
Expand Down
1 change: 1 addition & 0 deletions conan/profiles/vs32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ arch=x86
compiler.runtime=static
compiler.runtime_type=Release
build_type=Release
compiler.version=194

1 change: 1 addition & 0 deletions conan/profiles/vs32debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ arch=x86
compiler.runtime=static
compiler.runtime_type=Debug
build_type=Debug
compiler.version=194
1 change: 1 addition & 0 deletions conan/profiles/vs32shared
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ arch=x86
compiler.runtime=dynamic
compiler.runtime_type=Release
build_type=Release
compiler.version=194

[options]
shared=True
3 changes: 2 additions & 1 deletion conan/profiles/vs64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ compiler.cppstd=17
arch=x86_64
compiler.runtime=static
compiler.runtime_type=Release
build_type=Release
build_type=Release
compiler.version=194
2 changes: 1 addition & 1 deletion conan/profiles/vs64debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ arch=x86_64
compiler.runtime=static
compiler.runtime_type=Debug
build_type=Debug

compiler.version=194
1 change: 1 addition & 0 deletions conan/profiles/vs64shared
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ arch=x86_64
compiler.runtime=dynamic
compiler.runtime_type=Release
build_type=Release
compiler.version=194

[options]
shared=True
Expand Down
25 changes: 1 addition & 24 deletions src/mtconnect/agent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,27 +568,7 @@ namespace mtconnect {
LOG(error) << "Device does not have a name: " << *device->getUuid();
return false;
}

// if different, and revise to new device leaving in place
// the asset changed, removed, and availability data items
ErrorList errors;
if (auto odi = oldDev->getAssetChanged(), ndi = device->getAssetChanged(); odi && !ndi)
device->addDataItem(odi, errors);
if (auto odi = oldDev->getAssetRemoved(), ndi = device->getAssetRemoved(); odi && !ndi)
device->addDataItem(odi, errors);
if (auto odi = oldDev->getAvailability(), ndi = device->getAvailability(); odi && !ndi)
device->addDataItem(odi, errors);
if (auto odi = oldDev->getAssetCount(), ndi = device->getAssetCount(); odi && !ndi)
device->addDataItem(odi, errors);

if (errors.size() > 0)
{
LOG(error) << "Error adding device required data items for " << *device->getUuid() << ':';
for (const auto &e : errors)
LOG(error) << " " << e->what();
return false;
}


verifyDevice(device);
createUniqueIds(device);

Expand Down Expand Up @@ -929,9 +909,6 @@ namespace mtconnect {
{
NAMED_SCOPE("Agent::initializeDataItems");

// Grab data from configuration
string time = getCurrentTime(GMT_UV_SEC);

// Initialize the id mapping for the devices and set all data items to UNAVAILABLE
for (auto item : device->getDeviceDataItems())
{
Expand Down
Loading