Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion cmd/containerd-shim-runhcs-v1/task_hcs.go
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ func (ht *hcsTask) Pids(ctx context.Context) ([]*runhcsopts.ProcessDetails, erro
pairs[i].MemoryWorkingSetPrivateBytes = p.MemoryWorkingSetPrivateBytes
pairs[i].MemoryWorkingSetSharedBytes = p.MemoryWorkingSetSharedBytes
pairs[i].ProcessID = p.ProcessId
pairs[i].UserTime_100Ns = p.KernelTime100ns
pairs[i].UserTime_100Ns = p.UserTime100ns

if eid, ok := pidMap[int(p.ProcessId)]; ok {
pairs[i].ExecID = eid
Expand Down
49 changes: 49 additions & 0 deletions cmd/containerd-shim-runhcs-v1/task_hcs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import (
"testing"
"time"

"github.com/Microsoft/hcsshim/internal/cow"
"github.com/Microsoft/hcsshim/internal/hcs/schema1"
"github.com/Microsoft/hcsshim/internal/uvm"
"github.com/Microsoft/hcsshim/pkg/annotations"
"github.com/containerd/errdefs"
Expand Down Expand Up @@ -550,3 +552,50 @@ func Test_hcsTask_updateWCOWContainerCPUAffinity_XenonNotImplemented(t *testing.
t.Fatalf("expected ErrNotImplemented for hypervisor-isolated container, got %v", err)
}
}

// mockContainer is a minimal mock for cow.Container
type mockContainer struct {
cow.Container
properties *schema1.ContainerProperties
}

func (m *mockContainer) Properties(ctx context.Context, types ...schema1.PropertyType) (*schema1.ContainerProperties, error) {
return m.properties, nil
}

func Test_hcsTask_Pids_UserTime(t *testing.T) {
ht := &hcsTask{
id: "test-task",
c: &mockContainer{
properties: &schema1.ContainerProperties{
ProcessList: []schema1.ProcessListItem{
{
ProcessId: 123,
ImageName: "test.exe",
KernelTime100ns: 1000,
UserTime100ns: 2000,
},
},
},
},
}

ht.init = newTestShimExec("test-task", "test-task", 123)

pids, err := ht.Pids(context.Background())
if err != nil {
t.Fatalf("Pids() failed: %v", err)
}

if len(pids) != 1 {
t.Fatalf("Expected 1 pid, got %d", len(pids))
}

p := pids[0]
if p.UserTime_100Ns == p.KernelTime_100Ns {
t.Errorf("UserTime_100Ns (%d) incorrectly equals KernelTime_100Ns (%d)", p.UserTime_100Ns, p.KernelTime_100Ns)
}
if p.UserTime_100Ns != 2000 {
t.Errorf("Expected UserTime_100Ns=2000, got %d", p.UserTime_100Ns)
}
}