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 monitor issues #632

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix monitor issues #632

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 12 additions & 7 deletions monitor/subscription.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@ package monitor

import (
"context"
"sync"
"sync/atomic"

"github.com/gopcua/opcua"
"github.com/gopcua/opcua/errors"
"github.com/gopcua/opcua/ua"
"sync"
"sync/atomic"
)

var (
Expand Down Expand Up @@ -311,12 +310,12 @@ func (s *Subscription) AddMonitorItemsWithContext(ctx context.Context, nodes ...
return nil, nil
}

toAdd := make([]*ua.MonitoredItemCreateRequest, 0)
toAdd := make([]*ua.MonitoredItemCreateRequest, len(nodes))

// Add handles and make requests
for i, node := range nodes {
handle := atomic.AddUint32(&s.monitor.nextClientHandle, 1)
s.handles[handle] = nodes[i].NodeID

nodes[i].handle = handle

request := opcua.NewMonitoredItemCreateRequestWithDefaults(node.NodeID, ua.AttributeIDValue, handle)
Expand All @@ -326,7 +325,8 @@ func (s *Subscription) AddMonitorItemsWithContext(ctx context.Context, nodes ...
request.RequestedParameters = node.MonitoringParameters
request.RequestedParameters.ClientHandle = handle
}
toAdd = append(toAdd, request)

toAdd[i] = request
}
resp, err := s.sub.MonitorWithContext(ctx, ua.TimestampsToReturnBoth, toAdd...)
if err != nil {
Expand All @@ -337,13 +337,17 @@ func (s *Subscription) AddMonitorItemsWithContext(ctx context.Context, nodes ...
return nil, resp.ResponseHeader.ServiceResult
}

// https://reference.opcfoundation.org/Core/Part4/v105/docs/5.12.2.2#_Ref104715274
// The request len _must_ match the result len.
if len(resp.Results) != len(toAdd) {
return nil, errors.Errorf("monitor items response length mismatch")
}

var monitoredItems []Item
for i, res := range resp.Results {
if res.StatusCode != ua.StatusOK {
return nil, res.StatusCode
// TODO(kung-foo): decide what to do here...
continue
}
mn := Item{
id: res.MonitoredItemID,
Expand All @@ -352,6 +356,7 @@ func (s *Subscription) AddMonitorItemsWithContext(ctx context.Context, nodes ...
}
s.itemLookup[res.MonitoredItemID] = mn
monitoredItems = append(monitoredItems, mn)
s.handles[nodes[i].handle] = nodes[i].NodeID
}

return monitoredItems, nil
Expand Down