GithubStar/neuron
1
0
Fork 0
mirror of https://github.com/emqx/neuron.git synced 2026-10-18 13:41:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1736 from fengzeroz/main

Browse Source 
Revert "fix(conn): lock conn buf"
This commit is contained in:
fengzeroz
2023-12-11 16:00:20 +08:00
committed by GitHub
parent 3e721c9554 3c6f9ca096
commit 81535fc2ee
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/connection/connection.c
+5 -8
View File
@@ -1274,18 +1274,19 @@ int neu_conn_stream_consume(neu_conn_t *conn, void *context,
ssize_t ret = neu_conn_recv(conn, conn->buf + conn->offset,
conn->buf_size - conn->offset);
if (ret > 0) {
pthread_mutex_lock(&conn->mtx);
zlog_recv_protocol(conn->param.log, conn->buf + conn->offset, ret);
conn->offset += ret;
neu_protocol_unpack_buf_t protocol_buf = { 0 };
neu_protocol_unpack_buf_init(&protocol_buf, conn->buf, conn->offset);
int used = 0;
while (neu_protocol_unpack_buf_unused_size(&protocol_buf) > 0) {
used = fn(context, &protocol_buf);
int used = fn(context, &protocol_buf);
zlog_debug(conn->param.log, "buf used: %d offset: %d", used,
conn->offset);
if (used == 0 || used == -1) {
if (used == 0) {
break;
} else if (used == -1) {
neu_conn_disconnect(conn);
break;
} else {
conn->offset -= used;
@@ -1294,10 +1295,6 @@ int neu_conn_stream_consume(neu_conn_t *conn, void *context,
conn->offset);
}
}
pthread_mutex_unlock(&conn->mtx);
if (used == -1) {
neu_conn_disconnect(conn);
}
}
return ret;