ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jsonrpc: convert send queue to singly linked tail queue

Browse Source 
Prepare to use RPC server before env initialization when we can't use
struct spdk_ring yet.

Change-Id: I0d37fcdd7bf162d6a25baa050efa0421fdcf9599
Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-on: https://review.gerrithub.io/407207
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Pawel Wodkowski 2018-04-11 00:13:17 +02:00 committed by Daniel Verkamp
parent ffb4d54a79
commit b066126b0b
2 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/jsonrpc/jsonrpc_internal.h
View File

@ -36,7 +36,6 @@
#include "spdk/stdinc.h" #include "spdk/stdinc.h"
#include "spdk/env.h"
#include "spdk/jsonrpc.h" #include "spdk/jsonrpc.h"
#include "spdk_internal/log.h" #include "spdk_internal/log.h"
@ -64,6 +63,8 @@ struct spdk_jsonrpc_request {
size_t send_offset; size_t send_offset;
uint8_t *send_buf; uint8_t *send_buf;
STAILQ_ENTRY(spdk_jsonrpc_request) link;
}; };
struct spdk_jsonrpc_server_conn { struct spdk_jsonrpc_server_conn {
@ -74,7 +75,10 @@ struct spdk_jsonrpc_server_conn {
size_t recv_len; size_t recv_len;
uint8_t recv_buf[SPDK_JSONRPC_RECV_BUF_SIZE]; uint8_t recv_buf[SPDK_JSONRPC_RECV_BUF_SIZE];
uint32_t outstanding_requests; uint32_t outstanding_requests;
struct spdk_ring *send_queue;
pthread_spinlock_t queue_lock;
STAILQ_HEAD(, spdk_jsonrpc_request) send_queue;
struct spdk_jsonrpc_request *send_request; struct spdk_jsonrpc_request *send_request;
}; };

35
lib/jsonrpc/jsonrpc_server_tcp.c
View File

@ -123,7 +123,8 @@ spdk_jsonrpc_server_conn_remove(struct spdk_jsonrpc_server_conn *conn)
spdk_jsonrpc_server_conn_close(conn); spdk_jsonrpc_server_conn_close(conn);
spdk_ring_free(conn->send_queue); pthread_spin_destroy(&conn->queue_lock);
assert(STAILQ_EMPTY(&conn->send_queue));
/* Swap conn with the last entry in conns */ /* Swap conn with the last entry in conns */
server->conns[conn_idx] = server->conns[server->num_conns - 1]; server->conns[conn_idx] = server->conns[server->num_conns - 1];
@ -146,13 +147,9 @@ spdk_jsonrpc_server_accept(struct spdk_jsonrpc_server *server)
conn->closed = false; conn->closed = false;
conn->recv_len = 0; conn->recv_len = 0;
conn->outstanding_requests = 0; conn->outstanding_requests = 0;
pthread_spin_init(&conn->queue_lock, PTHREAD_PROCESS_PRIVATE);
STAILQ_INIT(&conn->send_queue);
conn->send_request = NULL; conn->send_request = NULL;
conn->send_queue = spdk_ring_create(SPDK_RING_TYPE_SP_SC, 128, SPDK_ENV_SOCKET_ID_ANY);
if (conn->send_queue == NULL) {
SPDK_ERRLOG("send_queue allocation failed\n");
close(conn->sockfd);
return -1;
}
flag = fcntl(conn->sockfd, F_GETFL); flag = fcntl(conn->sockfd, F_GETFL);
if (fcntl(conn->sockfd, F_SETFL, flag | O_NONBLOCK) < 0) { if (fcntl(conn->sockfd, F_SETFL, flag | O_NONBLOCK) < 0) {
@ -261,9 +258,26 @@ spdk_jsonrpc_server_send_response(struct spdk_jsonrpc_server_conn *conn,
struct spdk_jsonrpc_request *request) struct spdk_jsonrpc_request *request)
{ {
/* Queue the response to be sent */ /* Queue the response to be sent */
spdk_ring_enqueue(conn->send_queue, (void **)&request, 1); pthread_spin_lock(&conn->queue_lock);
STAILQ_INSERT_TAIL(&conn->send_queue, request, link);
pthread_spin_unlock(&conn->queue_lock);
} }
static struct spdk_jsonrpc_request *
spdk_jsonrpc_server_dequeue_request(struct spdk_jsonrpc_server_conn *conn)
{
struct spdk_jsonrpc_request *request = NULL;
pthread_spin_lock(&conn->queue_lock);
request = STAILQ_FIRST(&conn->send_queue);
if (request) {
STAILQ_REMOVE_HEAD(&conn->send_queue, link);
}
pthread_spin_unlock(&conn->queue_lock);
return request;
}
static int static int
spdk_jsonrpc_server_conn_send(struct spdk_jsonrpc_server_conn *conn) spdk_jsonrpc_server_conn_send(struct spdk_jsonrpc_server_conn *conn)
{ {
@ -276,7 +290,8 @@ more:
} }
if (conn->send_request == NULL) { if (conn->send_request == NULL) {
if (spdk_ring_dequeue(conn->send_queue, (void **)&conn->send_request, 1) != 1) { conn->send_request = spdk_jsonrpc_server_dequeue_request(conn);
if (conn->send_request == NULL) {
return 0; return 0;
} }
} }
@ -338,7 +353,7 @@ spdk_jsonrpc_server_poll(struct spdk_jsonrpc_server *server)
conn->send_request = NULL; conn->send_request = NULL;
} }
while (spdk_ring_dequeue(conn->send_queue, (void **)&request, 1) == 1) { while ((request = spdk_jsonrpc_server_dequeue_request(conn)) != NULL) {
spdk_jsonrpc_free_request(request); spdk_jsonrpc_free_request(request);
} }