diff options
| -rw-r--r-- | writer.go | 68 |
1 files changed, 19 insertions, 49 deletions
@@ -18,59 +18,29 @@ func NewWriter(wd *bufio.Writer) *Writer { // WriteMessage writes a variable number of messages to w. func (w *Writer) WriteMessage(messages ...*Message) error { - var err error - if len(messages) == 1 { - i := messages[0] - _, err = w.wd.Write(send(i.ID, i.Channel, i.Data)) - } else { - _, err = w.wd.Write(sendBatch(messages)) - } - if err != nil { - return err - } - - if err := w.wd.Flush(); err != nil { - return err - } - - return nil -} - -func send(id int, ch rune, data []byte) []byte { - header := uint64(id)<<4 | uint64(ch) - length := len(data) + encodingLength(header) - payload := make([]byte, encodingLength(uint64(length))+length) - - n := binary.PutUvarint(payload, uint64(length)) - n += binary.PutUvarint(payload[n:], header) - copy(payload[n:], data) - - return payload -} - -func sendBatch(items []*Message) []byte { - offset := 0 - - var length int - - for _, v := range items { - // 16 is >= the max size of the varints - length += 16 + encodingLength(uint64(len(v.Data))) - } - - payload := make([]byte, length) + var vb [10]byte // max 10 bytes per varint - for _, v := range items { - header := uint64(v.ID<<4) | uint64(v.Channel) - l := uint64(len(v.Data) + encodingLength(header)) + for _, m := range messages { + header := uint64(m.ID<<4) | uint64(m.Channel) + bodyLen := uint64(encodingLength(header) + len(m.Data)) - offset += binary.PutUvarint(payload[offset:], l) - offset += binary.PutUvarint(payload[offset:], header) + // write body length varint + n := binary.PutUvarint(vb[:], bodyLen) + if _, err := w.wd.Write(vb[:n]); err != nil { + return err + } - copy(payload[offset:], v.Data) + // write header varint + n = binary.PutUvarint(vb[:], header) + if _, err := w.wd.Write(vb[:n]); err != nil { + return err + } - offset += len(v.Data) + // write data payload + if _, err := w.wd.Write(m.Data); err != nil { + return err + } } - return payload[0:offset] + return w.wd.Flush() } |
