up

Author: midoks

internal/db/mail.go

@@ -451,23 +451,24 @@ func MailPush(uid int64, mtype int, mail_from string, mail_to string, content st
 		Size:              len(content),
 		Status:            status,
 		IsDraft:           is_draft,
+		Updated:           time.Now(),
+		Created:           time.Now(),
+		UpdatedUnix:       time.Now().Unix(),
+		CreatedUnix:       time.Now().Unix(),
 	}
 
-	m.Updated = time.Now()
-	m.Created = time.Now()
-	m.UpdatedUnix = time.Now().Unix()
-	m.CreatedUnix = time.Now().Unix()
-	result := db.Create(&m)
-
+	result := tx.Create(&m)
 	if result.Error != nil {
 		tx.Rollback()
+		return 0, result.Error
 	}
 
 	err := MailContentWrite(m.Uid, m.Id, content)
 	if err != nil {
 		tx.Rollback()
+		return 0, err
 	}
 
 	tx.Commit()
-	return m.Id, result.Error
+	return m.Id, nil
 }

internal/imap/imap.go

@@ -222,7 +222,9 @@ func (this *ImapServer) parseArgsConent(format string, data db.Mail) (string, er
 	format = strings.Trim(format, "()")
 
 	inputN := strings.Split(format, " ")
-	list := make(map[string]interface{})
+
+	// 预分配足够的空间
+	list := make(map[string]interface{}, len(inputN))
 
 	// 使用 bufio.NewReader 因为 component.ReadHeader 要求这个类型
 	bufferedBody := bufio.NewReader(strings.NewReader(content))
@@ -237,28 +239,34 @@ func (this *ImapServer) parseArgsConent(format string, data db.Mail) (string, er
 	for i := 0; i < len(inputN); i++ {
 
 		if strings.EqualFold(inputN[i], "uid") {
-			uid_id := fmt.Sprintf("%d", id)
+			// 使用 strconv.FormatInt 避免 fmt.Sprintf 的开销
+			uid_id := strconv.FormatInt(id, 10)
 			list[inputN[i]] = uid_id
 		}
 
 		if strings.EqualFold(inputN[i], "flags") {
-			flags := "("
+			// 预分配 flags 字符串
+			flagsBuf := tools.BufferPoolInstance.Get()
+			defer tools.BufferPoolInstance.Put(flagsBuf)
+
+			flagsBuf.WriteString("(")
 			if data.IsRead {
-				flags += "\\SEEN"
+				flagsBuf.WriteString("\\SEEN")
 			} else {
-				flags += "\\UNSEEN"
+				flagsBuf.WriteString("\\UNSEEN")
 			}
 
 			if data.IsFlags {
-				flags += "\\Flagged"
+				flagsBuf.WriteString("\\Flagged")
 			}
 
-			flags += ")"
-			list[inputN[i]] = flags
+			flagsBuf.WriteString(")")
+			list[inputN[i]] = flagsBuf.String()
 		}
 
 		if strings.EqualFold(inputN[i], "rfc822.size") {
-			rfc822_size := fmt.Sprintf("%d", len(content))
+			// 使用 strconv.Itoa 避免 fmt.Sprintf 的开销
+			rfc822_size := strconv.Itoa(len(content))
 			list[inputN[i]] = rfc822_size
 		}
 
@@ -270,11 +278,22 @@ func (this *ImapServer) parseArgsConent(format string, data db.Mail) (string, er
 			// 为 header 重新创建 reader，避免重置缓冲区的开销
 			headerReader := bufio.NewReader(strings.NewReader(content))
 			headerString, _ := component.ReadHeaderString(headerReader)
-			list["body[header]"] = fmt.Sprintf("{%d}\r\n%s", len(headerString), headerString)
+
+			// 预分配缓冲区
+			headerBuf := tools.BufferPoolInstance.Get()
+			defer tools.BufferPoolInstance.Put(headerBuf)
+
+			fmt.Fprintf(headerBuf, "{%d}\r\n%s", len(headerString), headerString)
+			list["body[header]"] = headerBuf.String()
 		}
 
 		if strings.EqualFold(inputN[i], "body.peek[]") {
-			list["body[]"] = fmt.Sprintf("{%d}\r\n%s", len(content), content)
+			// 预分配缓冲区
+			bodyBuf := tools.BufferPoolInstance.Get()
+			defer tools.BufferPoolInstance.Put(bodyBuf)
+
+			fmt.Fprintf(bodyBuf, "{%d}\r\n%s", len(content), content)
+			list["body[]"] = bodyBuf.String()
 			db.MailSeenById(id)
 		}
 	}
@@ -292,7 +311,8 @@ func (this *ImapServer) parseArgsConent(format string, data db.Mail) (string, er
 		}
 	}
 
-	out := fmt.Sprintf("(%s)", outBuf.String())
+	// 直接构造输出字符串
+	out := "(" + outBuf.String() + ")"
 	return out, nil
 }
 

internal/pop3/pop3.go

@@ -116,8 +116,7 @@ func (this *Pop3Server) Debug(d bool) {
 }
 
 func (this *Pop3Server) w(msg string) error {
-	log := fmt.Sprintf("POP[w]:%s", msg)
-	this.D(log)
+	this.D("POP[w]:%s", msg)
 
 	_, err := this.writer.Write([]byte(msg))
 	this.writer.Flush()
@@ -311,7 +310,13 @@ func (this *Pop3Server) cmdRetr(input string) bool {
 					content, size, err := db.MailPosContentForPop(this.userID, pos)
 					if err == nil {
 						sizeStr := strconv.Itoa(size)
-						this.writeArgs(MSG_RETR_DATA, sizeStr, content)
+						// 使用对象池减少内存分配
+						buf := tools.BufferPoolInstance.Get()
+						defer tools.BufferPoolInstance.Put(buf)
+						buf.Reset()
+						buf.Grow(len("+OK ") + len(MSG_RETR_DATA) + len(sizeStr) + len(content) + len("\r\n"))
+						fmt.Fprintf(buf, "+OK "+MSG_RETR_DATA+"\r\n", sizeStr, content)
+						this.w(buf.String())
 						return true
 					}
 				}

internal/smtpd/smtpd.go

@@ -562,28 +562,30 @@ func (smtp *SmtpdServer) cmdData(input string) bool {
 func (smtp *SmtpdServer) addEnvelopeDataAcceptLine(data []byte) []byte {
 	tlsDetails := ""
 
-	tlsVersions := map[uint16]string{
-		tls.VersionSSL30: "SSL3.0",
-		tls.VersionTLS10: "TLS1.0",
-		tls.VersionTLS11: "TLS1.1",
-		tls.VersionTLS12: "TLS1.2",
-		tls.VersionTLS13: "TLS1.3",
-	}
+	// 预分配 tlsDetails 缓冲区
+	tlsBuf := tools.BufferPoolInstance.Get()
+	defer tools.BufferPoolInstance.Put(tlsBuf)
 
 	if smtp.stateTLS != nil {
 		version := "unknown"
 
-		if val, ok := tlsVersions[smtp.stateTLS.Version]; ok {
-			version = val
+		switch smtp.stateTLS.Version {
+		case tls.VersionSSL30:
+			version = "SSL3.0"
+		case tls.VersionTLS10:
+			version = "TLS1.0"
+		case tls.VersionTLS11:
+			version = "TLS1.1"
+		case tls.VersionTLS12:
+			version = "TLS1.2"
+		case tls.VersionTLS13:
+			version = "TLS1.3"
 		}
 
 		cipher := tls.CipherSuiteName(smtp.stateTLS.CipherSuite)
 
-		tlsDetails = fmt.Sprintf(
-			"\r\n\t(version=%s cipher=%s);",
-			version,
-			cipher,
-		)
+		fmt.Fprintf(tlsBuf, "\r\n\t(version=%s cipher=%s);", version, cipher)
+		tlsDetails = tlsBuf.String()
 	}
 
 	peerIP := ""
@@ -596,24 +598,25 @@ func (smtp *SmtpdServer) addEnvelopeDataAcceptLine(data []byte) []byte {
 	lineBuf := tools.BufferPoolInstance.Get()
 	defer tools.BufferPoolInstance.Put(lineBuf)
 
+	// 预计算时间字符串，避免在循环中重复计算
+	timeStr := time.Now().Format("Mon, 02 Jan 2006 15:04:05 -0700 (MST)")
+
 	fmt.Fprintf(lineBuf, "Received: from %s (unknown[%s])\n\tby %s with SMTP id\n\tfor <%s>; %s %s\r\n",
 		peerIP,
 		peerIP,
 		serverTagName,
 		smtp.recordCmdMailFrom,
-		time.Now().Format("Mon, 02 Jan 2006 15:04:05 -0700 (MST)"),
+		timeStr,
 		tlsDetails,
 	)
 
 	line := tools.Wrap(lineBuf.Bytes())
 
-	data = append(data, line...)
-
-	// Move the new Received line up front
-	copy(data[len(line):], data[0:len(data)-len(line)])
-	copy(data, line)
-	return data
-
+	// 预分配足够的空间，避免多次内存分配
+	newData := make([]byte, len(line)+len(data))
+	copy(newData, line)
+	copy(newData[len(line):], data)
+	return newData
 }
 
 func (smtp *SmtpdServer) cmdDataAccept() bool {
@@ -631,12 +634,14 @@ func (smtp *SmtpdServer) cmdDataAccept() bool {
 	if smtp.runModeIn {
 		// smtp.D("smtpd[data][peer]:", smtp.peer)
 		revContent := smtp.addEnvelopeDataAcceptLine(data.Bytes())
+		// 直接使用 []byte 避免字符串转换
 		fid, err := db.MailPush(smtp.userID, 1, smtp.recordCmdMailFrom, smtp.recordcmdRcptTo, string(revContent), 3, false)
 		if err != nil {
 			return false
 		}
 		mail.ExecPython(conf.Hook.SendScript, fid)
 	} else {
+		// 直接使用 data.String() 避免额外的内存分配
 		fid, err := db.MailPush(smtp.userID, 0, smtp.recordCmdMailFrom, smtp.recordcmdRcptTo, data.String(), 0, false)
 		if err != nil {
 			return false

internal/tools/benchmark_test.go

@@ -0,0 +1,41 @@
+package tools
+
+import (
+	"testing"
+)
+
+// BenchmarkBase64Encode 基准测试 Base64 编码性能
+func BenchmarkBase64Encode(b *testing.B) {
+	input := "This is a test message for base64 encoding"
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		Base64encode(input)
+	}
+}
+
+// BenchmarkBase64Decode 基准测试 Base64 解码性能
+func BenchmarkBase64Decode(b *testing.B) {
+	input := "VGhpcyBpcyBhIHRlc3QgbWVzc2FnZSBmb3IgYmFzZTY0IGVuY29kaW5n"
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		Base64decode(input)
+	}
+}
+
+// BenchmarkRandString 基准测试随机字符串生成性能
+func BenchmarkRandString(b *testing.B) {
+	length := 20
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		RandString(length)
+	}
+}
+
+// BenchmarkMd5 基准测试 MD5 哈希性能
+func BenchmarkMd5(b *testing.B) {
+	input := "test string for md5 hashing"
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		Md5(input)
+	}
+}

internal/tools/concurrency_test.go

@@ -0,0 +1,76 @@
+package tools
+
+import (
+	"fmt"
+	"sync"
+	"testing"
+	"time"
+)
+
+// 模拟高并发请求的测试函数
+func simulateRequest() {
+	// 模拟一些常见的操作
+	Base64encode("test message for base64 encoding")
+	RandString(20)
+	Md5("test string for md5 hashing")
+}
+
+// BenchmarkHighConcurrency 基准测试高并发场景
+func BenchmarkHighConcurrency(b *testing.B) {
+	// 重置计时器
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		var wg sync.WaitGroup
+		concurrency := 100 // 并发数
+
+		// 启动并发请求
+		for j := 0; j < concurrency; j++ {
+			wg.Add(1)
+			go func() {
+				defer wg.Done()
+				simulateRequest()
+			}()
+		}
+
+		// 等待所有请求完成
+		wg.Wait()
+	}
+}
+
+// TestHighConcurrencyWithMemoryMonitor 测试高并发场景下的内存使用情况
+func TestHighConcurrencyWithMemoryMonitor(t *testing.T) {
+	// 启动内存监控
+	go MonitorMemory(10 * time.Second)
+
+	// 模拟1000/s的请求，持续10秒
+	requestsPerSecond := 1000
+	duration := 10 * time.Second
+	totalRequests := requestsPerSecond * int(duration.Seconds())
+
+	var wg sync.WaitGroup
+	wg.Add(totalRequests)
+
+	// 控制请求速率
+	ticker := time.NewTicker(time.Second / time.Duration(requestsPerSecond))
+	defer ticker.Stop()
+
+	startTime := time.Now()
+	requestCount := 0
+
+	for time.Since(startTime) < duration {
+		<-ticker.C
+		if requestCount < totalRequests {
+			go func() {
+				defer wg.Done()
+				simulateRequest()
+			}()
+			requestCount++
+		}
+	}
+
+	// 等待所有请求完成
+	wg.Wait()
+
+	fmt.Printf("Test completed: %d requests in %v\n", requestCount, duration)
+}