用户态网络缓冲区 chain-buffer

kvstore.c

@@ -14,11 +14,12 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <pthread.h>
-#include <errno.h>
-#include <unistd.h>
-#include <arpa/inet.h>
-#include <libxml/parser.h>
+#include <pthread.h>
+#include <errno.h>
+#include <unistd.h>
+#include <arpa/inet.h>
+#include <libxml/parser.h>
+#include <limits.h>
 
 #define 	TIME_COLLECT	0
 
@@ -43,23 +44,25 @@ void __completed_cmd(const uint8_t *cmd, size_t len, unsigned long long seq){
 #include <sys/time.h>
 #define TIME_SUB_MS(tv1, tv2)  ((tv1.tv_sec - tv2.tv_sec) * 1000 + (tv1.tv_usec - tv2.tv_usec) / 1000)
 #define TIME_SUB_US(tv1, tv2)  ((tv1.tv_sec - tv2.tv_sec) * 1000000 + (tv1.tv_usec - tv2.tv_usec))
-int kvs_protocol(struct conn* conn){
+int kvs_protocol(struct conn* conn){
 #if TIME_COLLECT == 1
 	struct timeval func_start;
 	gettimeofday(&func_start, NULL);
 	long total_oplog_us = 0; 
 #endif
 
-	if (!conn) return -1;
-	char *request = conn->rbuffer;
-	int request_length = conn->rlength;
-	char *response = conn->wbuffer;
-	int *response_length = &conn->wlength;
-
-	if (!request || request_length <= 0 || !response || !response_length) return -1;
-	
-	int consumed = 0;
-	int out_len = 0;
+	if (!conn) return -1;
+
+	size_t request_size = 0;
+	const uint8_t *request = chain_buffer_linearize(&conn->rbuf, &request_size);
+	if (!request || request_size == 0) return 0;
+	if (request_size > (size_t)INT_MAX) return -1;
+
+	int request_length = (int)request_size;
+	uint8_t response[KVS_MAX_RESPONSE];
+	
+	int consumed = 0;
+	int out_len = 0;
 
  	while(consumed < request_length ){
 		const uint8_t *p = request+consumed;
@@ -68,12 +71,11 @@ int kvs_protocol(struct conn* conn){
 		resp_cmd_t cmd;
 		memset(&cmd, 0, sizeof(cmd));
 
-		int len = resp_parse_one_cmd(p, remain, &cmd);
-		if(len < 0){
-			/* 协议错误：直接返回，已构建的响应仍可写回 */
-			*response_length = out_len;
-			return -1;
-		}
+		int len = resp_parse_one_cmd(p, remain, &cmd);
+		if(len < 0){
+			/* 协议错误：直接返回 */
+			return -1;
+		}
 		else if(len == 0){
 			// 半包
 			break;
@@ -179,17 +181,15 @@ int kvs_protocol(struct conn* conn){
 #endif
 
         /* 构建响应 */
-        int cap = KVS_MAX_RESPONSE - out_len;
-        if (cap <= 0) {
-            *response_length = out_len;
-            return consumed;
-        }
-
-		int resp_len = resp_build_value(&val, response + out_len, (size_t)cap);
-        if (resp_len < 0) {
-            *response_length = out_len;
-            return consumed;
-        }
+        int cap = KVS_MAX_RESPONSE - out_len;
+        if (cap <= 0) {
+            return consumed;
+        }
+
+		int resp_len = resp_build_value(&val, response + out_len, (size_t)cap);
+        if (resp_len < 0) {
+            return consumed;
+        }
 
 		__completed_cmd(request, consumed, 0);
 
@@ -205,9 +205,14 @@ int kvs_protocol(struct conn* conn){
 	fprintf(stderr, "kvs_protocol: total %ld us, oplog %ld us\n", func_us, total_oplog_us);
 #endif 
 
-    *response_length = out_len;
-	return consumed;
-}
+	if (out_len > 0) {
+		if (chain_buffer_append(&conn->wbuf, response, (size_t)out_len) < 0) {
+			return -1;
+		}
+	}
+
+	return consumed;
+}