gofmt && goimports

talostrading · Jun 29, 2023 · 03911f6 · 03911f6
1 parent 20fd3d4
commit 03911f6
Show file tree

Hide file tree

Showing 28 changed files with 74 additions and 50 deletions.
diff --git a/byte_buffer.go b/byte_buffer.go
@@ -15,12 +15,12 @@ import (
 // - write area: [ri, wi)
 //
 // A usual workflow is as follows:
-// - Bytes are written to the write area. These bytes cannot be read yet.
-// - Bytes from the write area are made available for reading in the read area,
-//   by calling Commit.
-// - Bytes from the read area can be either Saved or Consumed. If Saved, the
-//   bytes are kept in the save area. If Consumed, the bytes' lifetime ends,
-//   they are automatically discarded. Saved bytes must be discarded later.
+//   - Bytes are written to the write area. These bytes cannot be read yet.
+//   - Bytes from the write area are made available for reading in the read area,
+//     by calling Commit.
+//   - Bytes from the read area can be either Saved or Consumed. If Saved, the
+//     bytes are kept in the save area. If Consumed, the bytes' lifetime ends,
+//     they are automatically discarded. Saved bytes must be discarded later.
 //
 // Invariants:
 // - 0 <= si <= ri <= wi <= min(len(data), cap(b.data)) <= cap(b.data)

diff --git a/codec/frame/frame_test.go b/codec/frame/frame_test.go
@@ -2,10 +2,11 @@ package frame
 
 import (
 	"encoding/binary"
-	"github.com/talostrading/sonic/sonicerrors"
 	"math/rand"
 	"testing"
 
+	"github.com/talostrading/sonic/sonicerrors"
+
 	"github.com/talostrading/sonic"
 )
 

diff --git a/codec/frame/stream_test.go b/codec/frame/stream_test.go
@@ -3,12 +3,13 @@ package frame
 import (
 	"encoding/binary"
 	"fmt"
-	"github.com/talostrading/sonic"
 	"log"
 	"net"
 	"sync/atomic"
 	"testing"
 	"time"
+
+	"github.com/talostrading/sonic"
 )
 
 type testServer struct {

diff --git a/codec_test.go b/codec_test.go
@@ -1,10 +1,11 @@
 package sonic
 
 import (
-	"github.com/talostrading/sonic/sonicerrors"
 	"net"
 	"testing"
 	"time"
+
+	"github.com/talostrading/sonic/sonicerrors"
 )
 
 var _ Codec[TestItem, TestItem] = &TestCodec{}

diff --git a/conn2_test.go b/conn2_test.go
@@ -1,9 +1,10 @@
 package sonic
 
 import (
-	"github.com/talostrading/sonic/internal"
 	"net"
 	"testing"
+
+	"github.com/talostrading/sonic/internal"
 )
 
 func TestTCPClientDefaultOpts(t *testing.T) {

diff --git a/examples/binance/main.go b/examples/binance/main.go
@@ -20,7 +20,7 @@ var subscriptionMessage = []byte(
 var b = make([]byte, 512*1024) // contains websocket payloads
 
 func run(stream websocket.Stream) {
-    stream.AsyncHandshake("wss://stream.binance.com:9443/ws", func(err error) {
+	stream.AsyncHandshake("wss://stream.binance.com:9443/ws", func(err error) {
 		onHandshake(err, stream)
 	})
 }

diff --git a/examples/iperf/main.go b/examples/iperf/main.go
@@ -14,9 +14,10 @@ The bandwidth results vary greatly with the values set for -l and *n flag below.
 
 import (
 	"flag"
+	"log"
+
 	"github.com/talostrading/sonic"
 	"github.com/talostrading/sonic/internal"
-	"log"
 )
 
 var (

diff --git a/examples/multicast/main.go b/examples/multicast/main.go
@@ -3,11 +3,12 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/talostrading/sonic"
-	"github.com/talostrading/sonic/util"
 	"log"
 	"net"
 	"time"
+
+	"github.com/talostrading/sonic"
+	"github.com/talostrading/sonic/util"
 )
 
 var (

diff --git a/examples/multicast_peer/rate_reader/main.go b/examples/multicast_peer/rate_reader/main.go
@@ -3,18 +3,20 @@ package main
 import (
 	"encoding/binary"
 	"flag"
+	"log"
+	"net/http"
+	"net/netip"
+	"time"
+
 	"github.com/HdrHistogram/hdrhistogram-go"
 	"github.com/talostrading/sonic"
 	"github.com/talostrading/sonic/multicast"
 	"github.com/talostrading/sonic/sonicerrors"
 	"github.com/talostrading/sonic/util"
-	"log"
-	"net/http"
-	"net/netip"
-	"time"
 
-	"github.com/felixge/fgprof"
 	_ "net/http/pprof"
+
+	"github.com/felixge/fgprof"
 )
 
 var (

diff --git a/examples/multicast_peer/rate_writer/main.go b/examples/multicast_peer/rate_writer/main.go
@@ -3,12 +3,13 @@ package main
 import (
 	"encoding/binary"
 	"flag"
-	"github.com/talostrading/sonic"
-	"github.com/talostrading/sonic/multicast"
-	"github.com/talostrading/sonic/util"
 	"log"
 	"net/netip"
 	"time"
+
+	"github.com/talostrading/sonic"
+	"github.com/talostrading/sonic/multicast"
+	"github.com/talostrading/sonic/util"
 )
 
 var (

diff --git a/examples/multicast_peer/writer/main.go b/examples/multicast_peer/writer/main.go
@@ -2,10 +2,11 @@ package main
 
 import (
 	"flag"
-	"github.com/talostrading/sonic"
-	"github.com/talostrading/sonic/multicast"
 	"log"
 	"net/netip"
+
+	"github.com/talostrading/sonic"
+	"github.com/talostrading/sonic/multicast"
 )
 
 var (

diff --git a/examples/timer/once.go b/examples/timer/once.go
@@ -15,7 +15,7 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
-        defer timer.Close()
+	defer timer.Close()
 
 	fmt.Println("timer armed: ", time.Now())
 	err = timer.ScheduleOnce(time.Second, func() {

diff --git a/examples/udp/conn.go b/examples/udp/conn.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+
 	"github.com/talostrading/sonic"
 )
 

diff --git a/examples/udp/recv.go b/examples/udp/recv.go
@@ -2,8 +2,9 @@ package main
 
 import (
 	"fmt"
-	"github.com/talostrading/sonic"
 	"net"
+
+	"github.com/talostrading/sonic"
 )
 
 func main() {

diff --git a/examples/udp/send.go b/examples/udp/send.go
@@ -2,8 +2,9 @@ package main
 
 import (
 	"fmt"
-	"github.com/talostrading/sonic"
 	"net"
+
+	"github.com/talostrading/sonic"
 )
 
 func main() {

diff --git a/internal/socket_unix.go b/internal/socket_unix.go
@@ -3,13 +3,14 @@ package internal
 import (
 	"errors"
 	"fmt"
-	"github.com/talostrading/sonic/sonicerrors"
-	"github.com/talostrading/sonic/sonicopts"
-	"golang.org/x/sys/unix"
 	"net"
 	"os"
 	"syscall"
 	"time"
+
+	"github.com/talostrading/sonic/sonicerrors"
+	"github.com/talostrading/sonic/sonicopts"
+	"golang.org/x/sys/unix"
 )
 
 var (

diff --git a/internal/timer_linux.go b/internal/timer_linux.go
@@ -45,7 +45,7 @@ func (t *Timer) Set(dur time.Duration, cb func()) error {
 		Value:    timespec,
 	}, nil)
 	if err == nil {
-        // TODO error checking here
+		// TODO error checking here
 		t.pd.Set(ReadEvent, func(error) {
 			_, _ = syscall.Read(t.fd, t.b[:])
 			cb()

diff --git a/internal/util_unix.go b/internal/util_unix.go
@@ -4,11 +4,12 @@ package internal
 
 import (
 	"fmt"
-	"github.com/talostrading/sonic/util"
-	"golang.org/x/sys/unix"
 	"net"
 	"reflect"
 	"syscall"
+
+	"github.com/talostrading/sonic/util"
+	"golang.org/x/sys/unix"
 )
 
 // TODO Handle IPv6

diff --git a/listen_conn_test.go b/listen_conn_test.go
@@ -1,9 +1,10 @@
 package sonic
 
 import (
-	"github.com/talostrading/sonic/internal"
 	"net"
 	"testing"
+
+	"github.com/talostrading/sonic/internal"
 )
 
 func TestTCPConnListenerDefaultOpts(t *testing.T) {

diff --git a/multicast/peer_ipv4_linux_test.go b/multicast/peer_ipv4_linux_test.go
@@ -4,15 +4,16 @@ package multicast
 
 import (
 	"fmt"
-	"github.com/talostrading/sonic"
-	"github.com/talostrading/sonic/net/ipv4"
-	"github.com/talostrading/sonic/sonicerrors"
 	"log"
 	"net/netip"
 	"sync"
 	"sync/atomic"
 	"testing"
 	"time"
+
+	"github.com/talostrading/sonic"
+	"github.com/talostrading/sonic/net/ipv4"
+	"github.com/talostrading/sonic/sonicerrors"
 )
 
 // TODO: really don't know how to make this run on my mac

diff --git a/multicast_udp.go b/multicast_udp.go
@@ -2,13 +2,14 @@ package sonic
 
 import (
 	"fmt"
-	"github.com/talostrading/sonic/internal"
-	"github.com/talostrading/sonic/sonicerrors"
-	"github.com/talostrading/sonic/sonicopts"
 	"io"
 	"net"
 	"sync/atomic"
 	"syscall"
+
+	"github.com/talostrading/sonic/internal"
+	"github.com/talostrading/sonic/sonicerrors"
+	"github.com/talostrading/sonic/sonicopts"
 )
 
 // SizeofIPMreqSource I would love to do unsafe.SizeOf  but for a struct with 3 4-byte arrays, it returns 8 on my Mac.

diff --git a/multicast_udp_test.go b/multicast_udp_test.go
@@ -3,14 +3,15 @@
 package sonic
 
 import (
-	"github.com/talostrading/sonic/internal"
-	"github.com/talostrading/sonic/sonicopts"
 	"net"
 	"os"
 	"sync"
 	"syscall"
 	"testing"
 	"time"
+
+	"github.com/talostrading/sonic/internal"
+	"github.com/talostrading/sonic/sonicopts"
 )
 
 var testInterface *net.Interface

diff --git a/net/ipv4/multicast_linux.go b/net/ipv4/multicast_linux.go
@@ -1,8 +1,9 @@
 package ipv4
 
 import (
-	"github.com/talostrading/sonic"
 	"syscall"
+
+	"github.com/talostrading/sonic"
 )
 
 const IP_MULTICAST_ALL = 49 /* grepped torvalds/linux */

diff --git a/socket.go b/socket.go
@@ -2,12 +2,13 @@ package sonic
 
 import (
 	"fmt"
-	"github.com/talostrading/sonic/sonicerrors"
-	"golang.org/x/sys/unix"
 	"io"
 	"net"
 	"net/netip"
 	"syscall"
+
+	"github.com/talostrading/sonic/sonicerrors"
+	"golang.org/x/sys/unix"
 )
 
 type SocketDomain int

diff --git a/stress_test/codec/nonblocking.go b/stress_test/codec/nonblocking.go
@@ -3,10 +3,11 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/talostrading/sonic"
-	"github.com/talostrading/sonic/codec/frame"
 	"log"
 	"time"
+
+	"github.com/talostrading/sonic"
+	"github.com/talostrading/sonic/codec/frame"
 )
 
 var (

diff --git a/stress_test/codec/server/main.go b/stress_test/codec/server/main.go
@@ -3,9 +3,10 @@ package main
 import (
 	"encoding/binary"
 	"flag"
+	"log"
+
 	"github.com/talostrading/sonic"
 	"github.com/talostrading/sonic/codec/frame"
-	"log"
 )
 
 var (

diff --git a/tests/misc_test.go b/tests/misc_test.go
@@ -1,8 +1,9 @@
 package tests
 
 import (
-	"github.com/talostrading/sonic"
 	"testing"
+
+	"github.com/talostrading/sonic"
 )
 
 var (

diff --git a/timer.go b/timer.go
@@ -98,7 +98,7 @@ func (t *Timer) ScheduleRepeating(repeat time.Duration, cb func()) error {
 			if t.cancelled {
 				t.cancelled = false
 			} else {
-                // TODO this error should not be ignored
+				// TODO this error should not be ignored
 				_ = t.ScheduleOnce(repeat, ccb)
 			}
 		}
-Original file line number
+Diff line change
@@ Expand Up @@
     import (
     	"flag"
+    	"log"
     	"github.com/talostrading/sonic"
     	"github.com/talostrading/sonic/internal"
-    	"log"
     )
     var (
@@ Expand Down @@