aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOnur Gündüz <ogunduz@gmail.com>2026-02-10 07:05:18 +0100
committerOnur Gündüz <ogunduz@gmail.com>2026-02-10 07:05:18 +0100
commit07da070ed0c1a940613bf85c102176efe2c647b5 (patch)
tree7904f48de128d1fdb5bafccd989621e4487356ee
parente21f32ae437370e554362921bdfc0f86240e7167 (diff)
downloadmuxer-07da070ed0c1a940613bf85c102176efe2c647b5.tar.gz
muxer-07da070ed0c1a940613bf85c102176efe2c647b5.zip
Update ReadMessage to use pointer parameter
-rw-r--r--example_test.go6
-rw-r--r--reader.go6
-rw-r--r--reader_test.go32
3 files changed, 12 insertions, 32 deletions
diff --git a/example_test.go b/example_test.go
index 669ff52..5b31475 100644
--- a/example_test.go
+++ b/example_test.go
@@ -19,8 +19,9 @@ func ExampleDial() {
}
go func() {
+ msg := &binproto.Message{}
for {
- msg, err := c.ReadMessage()
+ err := c.ReadMessage(msg)
if err != nil {
log.Fatal(err)
return
@@ -56,8 +57,9 @@ func (s *server) handle(conn net.Conn) {
c := binproto.NewConn(conn)
+ msg := &binproto.Message{}
for {
- msg, err := c.ReadMessage()
+ err := c.ReadMessage(msg)
if err != nil {
fmt.Printf("error: %v", err)
return
diff --git a/reader.go b/reader.go
index 6574559..039c3df 100644
--- a/reader.go
+++ b/reader.go
@@ -93,7 +93,7 @@ func (b *Reader) fill() {
}
// ReadMessage reads a single message from r.
-func (b *Reader) ReadMessage() (message *Message, err error) {
+func (b *Reader) ReadMessage(message *Message) (err error) {
for {
if b.err != nil {
message = nil
@@ -104,7 +104,9 @@ func (b *Reader) ReadMessage() (message *Message, err error) {
// Found message?
if b.state == 0 && b.latest != nil {
- message = NewMessage(int(b.header>>4), rune(b.header&0b1111), b.latest)
+ message.ID = int(b.header >> 4)
+ message.Channel = rune(b.header & 0b1111)
+ message.Data = b.latest
b.latest = nil
b.missing = 0
copy(b.buf, b.buf[b.r:b.w])
diff --git a/reader_test.go b/reader_test.go
index 1da6f17..dcc7fa3 100644
--- a/reader_test.go
+++ b/reader_test.go
@@ -1,8 +1,6 @@
package binproto_test
import (
- "bufio"
- "bytes"
"encoding/binary"
"fmt"
"io"
@@ -11,8 +9,8 @@ import (
"testing"
"time"
- "github.com/tetsuo/binproto"
"github.com/stretchr/testify/assert"
+ "github.com/tetsuo/binproto"
)
type testCase struct {
@@ -410,29 +408,6 @@ func TestReadMessage(t *testing.T) {
}
}
-func BenchmarkReadMessage(b *testing.B) {
- b.ReportAllocs()
-
- var buf bytes.Buffer
- br := bufio.NewReader(&buf)
- r := binproto.NewReaderSize(br, 256)
- data := []byte(fill(56))
-
- for i := 0; i < b.N; i++ {
- id := i % maxID
- ch := rune(i % 16)
-
- buf.Write(send(id, ch, data))
- m, err := r.ReadMessage()
- if err != nil {
- b.Fatal(err)
- }
- if m.ID != id || m.Channel != ch || string(m.Data) != string(data) {
- b.Fatal(fmt.Sprintf("expected: %d %d %s, got: %d %d %s", id, ch, string(data), m.ID, m.Channel, string(m.Data)))
- }
- }
-}
-
type testReader struct {
q [][]byte
}
@@ -483,14 +458,15 @@ func runTest(t *testing.T, tt testCase) {
if len(tt.expect) < 1 {
panic("must expect a result")
}
+ m := &binproto.Message{}
for _, v := range tt.expect {
- res, err := r.ReadMessage()
+ err := r.ReadMessage(m)
if expectedErr, ok := v.(error); ok {
assert.EqualError(t, err, expectedErr.Error(), tt.desc)
} else {
assert.Nil(t, err)
if expectedMessage, ok := v.(*binproto.Message); ok {
- assert.EqualValues(t, expectedMessage, res, tt.desc)
+ assert.EqualValues(t, expectedMessage, m, tt.desc)
} else {
t.Fail()
}