From 53b393e765a44d71c8c082064889aa1d98b28ebc Mon Sep 17 00:00:00 2001
From: Garet Halliday <me@garet.holiday>
Date: Fri, 28 Apr 2023 18:36:00 -0500
Subject: [PATCH] something is fucked
---
lib/rob/schedulers/v1/sink.go | 6 ++----
lib/util/slices/slices.go | 30 ------------------------------
2 files changed, 2 insertions(+), 34 deletions(-)
delete mode 100644 lib/util/slices/slices.go
diff --git a/lib/rob/schedulers/v1/sink.go b/lib/rob/schedulers/v1/sink.go
index d04577f6..c3ba8355 100644
--- a/lib/rob/schedulers/v1/sink.go
+++ b/lib/rob/schedulers/v1/sink.go
@@ -75,10 +75,8 @@ func (T *Sink) Read() any {
T.mu.Lock()
defer T.mu.Unlock()
- now := time.Now()
-
if T.active != nil {
- T.runtime[T.active.id] += now.Sub(T.start)
+ T.runtime[T.active.id] += time.Since(T.start)
if T.requeue {
T._enqueue(T.active)
@@ -103,7 +101,7 @@ func (T *Sink) Read() any {
break
}
- T.start = now
+ T.start = time.Now()
work, ok, hasMore := T.active.pop()
if !ok {
diff --git a/lib/util/slices/slices.go b/lib/util/slices/slices.go
deleted file mode 100644
index 49678a58..00000000
--- a/lib/util/slices/slices.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package slices
-
-func Prepend[T any](slice []T, elem T) []T {
- slice = append(slice, *new(T))
- copy(slice[1:], slice)
- slice[0] = elem
- return slice
-}
-
-func Remove[T any](slice []T, idx int) []T {
- copy(slice[idx:], slice[idx+1:])
- return slice[:len(slice)-1]
-}
-
-func Pop[T any](slice []T) ([]T, T) {
- if len(slice) == 0 {
- return slice, *new(T)
- }
- elem := slice[len(slice)-1]
- return slice[:len(slice)-1], elem
-}
-
-func Contains[T comparable](slice []T, value T) bool {
- for _, elem := range slice {
- if elem == value {
- return true
- }
- }
- return false
-}
--
GitLab