Changing some unsafe use.

lb/upstream.go

@@ -65,24 +65,25 @@ func (err SuppressedHttpError) Error() string {
 	return "suppressed http error"
 }
 
-type bufferType [32 * 1024]byte
+const bufferLen = 32 * 1024
+
 type bufferPool struct {
 	sync.Pool
 }
 
 func (b *bufferPool) Get() []byte {
 	ptr := b.Pool.Get()
-	return (*bufferType)(ptr.(unsafe.Pointer))[:]
+	return unsafe.Slice(ptr.(*byte), bufferLen)
 }
 func (b *bufferPool) Put(buf []byte) {
-	b.Pool.Put(unsafe.Pointer(&buf[0]))
+	b.Pool.Put(&buf[0])
 }
 
 var globalBufferPool = &bufferPool{
 	sync.Pool{
 		New: func() any {
-			buffer := new(bufferType)
-			return unsafe.Pointer(&buffer[0])
+			buf := make([]byte, bufferLen)
+			return &buf[0]
 		},
 	},
 }

ray/host.go

@@ -2,8 +2,6 @@ package ray
 
 import (
 	"fmt"
-
-	"get.pme.sh/pmesh/util"
 )
 
 type Host [3]byte
@@ -18,7 +16,7 @@ func ToHostString(s string) string {
 
 func (p Host) String() string {
 	buf := p.Normal()
-	return util.UnsafeString(buf[:])
+	return string(buf[:])
 }
 func (p Host) Normal() Host {
 	for i, c := range p {

ray/id.go

@@ -28,10 +28,10 @@ func (r ID) Timestamp() time.Time {
 	return r.ID.Timestamp()
 }
 func (r ID) String() string {
-	buf, _ := r.MarshalText()
-	return util.UnsafeString(buf)
+	arr := r.ToArray()
+	return string(arr[:])
 }
-func (r ID) MarshalText() (text []byte, err error) {
+func (r ID) ToArray() (text [RayLength]byte) {
 	var buf [RayLength]byte
 
 	var sno [8]byte
@@ -42,7 +42,11 @@ func (r ID) MarshalText() (text []byte, err error) {
 	buf[17] = r.Host[0]
 	buf[18] = r.Host[1]
 	buf[19] = r.Host[2]
-	return buf[:], nil
+	return buf
+}
+func (r ID) MarshalText() (text []byte, err error) {
+	arr := r.ToArray()
+	return arr[:], nil
 }
 func (r *ID) UnmarshalText(text []byte) error {
 	if len(text) != RayLength || text[16] != '-' {
@@ -75,5 +79,5 @@ func (r *Generator) Next() string {
 	var sno [8]byte
 	binary.BigEndian.PutUint64(sno[:], uint64(snowflake.New()))
 	hex.Encode(buf[:16], sno[:])
-	return util.UnsafeString(buf[:])
+	return string(buf[:])
 }

xlog/parser_line.go

@@ -2,8 +2,8 @@ package xlog
 
 import (
 	"time"
-	"unsafe"
 
+	"get.pme.sh/pmesh/util"
 	"github.com/rs/zerolog"
 	"github.com/valyala/fastjson"
 )
@@ -23,7 +23,7 @@ func ParseLine(line []byte) (ll Line, err error) {
 
 func (ll Line) Domain() string {
 	sb := ll.GetStringBytes(zerolog.CallerFieldName)
-	return unsafe.String(&sb[0], len(sb))
+	return util.UnsafeString(sb)
 }
 func (ll Line) Time() time.Time {
 	f := ll.GetInt64(zerolog.TimestampFieldName)
@@ -37,7 +37,7 @@ func (ll Line) Level() Level {
 	if level != nil {
 		if level.Type() == fastjson.TypeString {
 			lstr := level.GetStringBytes()
-			if v, ok := unformatLevel[unsafe.String(&lstr[0], len(lstr))]; ok {
+			if v, ok := unformatLevel[util.UnsafeString(lstr)]; ok {
 				return v
 			}
 		} else if level.Type() == fastjson.TypeNumber {