iscsi: Move acceptor into portal_grp (3f81bcaf) · Commits · Public Repositories / spdk

lib/iscsi/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
		include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

		CFLAGS += -I$(SPDK_ROOT_DIR)/lib
		C_SRCS = acceptor.c conn.c \
		C_SRCS = conn.c \
		init_grp.c iscsi.c md5.c param.c portal_grp.c \
		tgt_node.c iscsi_subsystem.c \
		iscsi_rpc.c task.c

lib/iscsi/acceptor.c

deleted100644 → 0

+0 −91

Original line number	Diff line number	Diff line
		/*-
		* BSD LICENSE
		*
		* Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
		* Copyright (c) Intel Corporation.
		* All rights reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions
		* are met:
		*
		* * Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		* * Redistributions in binary form must reproduce the above copyright
		* notice, this list of conditions and the following disclaimer in
		* the documentation and/or other materials provided with the
		* distribution.
		* * Neither the name of Intel Corporation nor the names of its
		* contributors may be used to endorse or promote products derived
		* from this software without specific prior written permission.
		*
		* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
		* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
		* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
		* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
		* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
		* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
		* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
		* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
		* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
		* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
		* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		*/

		#include "spdk/stdinc.h"

		#include "spdk/env.h"
		#include "spdk/thread.h"
		#include "spdk/log.h"
		#include "spdk/sock.h"
		#include "spdk/string.h"
		#include "iscsi/acceptor.h"
		#include "iscsi/conn.h"
		#include "iscsi/portal_grp.h"

		#define ACCEPT_TIMEOUT_US 1000 /* 1ms */

		static int
		iscsi_portal_accept(void *arg)
		{
		struct spdk_iscsi_portal *portal = arg;
		struct spdk_sock *sock;
		int rc;
		int count = 0;

		if (portal->sock == NULL) {
		return -1;
		}

		while (1) {
		sock = spdk_sock_accept(portal->sock);
		if (sock != NULL) {
		rc = spdk_iscsi_conn_construct(portal, sock);
		if (rc < 0) {
		spdk_sock_close(&sock);
		SPDK_ERRLOG("spdk_iscsi_connection_construct() failed\n");
		break;
		}
		count++;
		} else {
		if (errno != EAGAIN && errno != EWOULDBLOCK) {
		SPDK_ERRLOG("accept error(%d): %s\n", errno, spdk_strerror(errno));
		}
		break;
		}
		}

		return count;
		}

		void
		spdk_iscsi_acceptor_start(struct spdk_iscsi_portal *p)
		{
		p->acceptor_poller = spdk_poller_register(iscsi_portal_accept, p, ACCEPT_TIMEOUT_US);
		}

		void
		spdk_iscsi_acceptor_stop(struct spdk_iscsi_portal *p)
		{
		spdk_poller_unregister(&p->acceptor_poller);
		}

lib/iscsi/acceptor.h

deleted100644 → 0

+0 −43

Original line number	Diff line number	Diff line
		/*-
		* BSD LICENSE
		*
		* Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
		* Copyright (c) Intel Corporation.
		* All rights reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions
		* are met:
		*
		* * Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		* * Redistributions in binary form must reproduce the above copyright
		* notice, this list of conditions and the following disclaimer in
		* the documentation and/or other materials provided with the
		* distribution.
		* * Neither the name of Intel Corporation nor the names of its
		* contributors may be used to endorse or promote products derived
		* from this software without specific prior written permission.
		*
		* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
		* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
		* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
		* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
		* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
		* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
		* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
		* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
		* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
		* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
		* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		*/

		#ifndef SPDK_ACCEPTOR_H_
		#define SPDK_ACCEPTOR_H_

		struct spdk_iscsi_portal;

		void spdk_iscsi_acceptor_start(struct spdk_iscsi_portal *p);
		void spdk_iscsi_acceptor_stop(struct spdk_iscsi_portal *p);

		#endif /* SPDK_ACCEPTOR_H_ */

lib/iscsi/iscsi.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,6 @@
		#include "spdk/scsi.h"
		#include "spdk/bdev.h"
		#include "iscsi/portal_grp.h"
		#include "iscsi/acceptor.h"

		#include "spdk_internal/log.h"

lib/iscsi/portal_grp.c

+48 −3

Original line number	Diff line number	Diff line
		@@ -44,9 +44,54 @@
		#include "iscsi/iscsi.h"
		#include "iscsi/conn.h"
		#include "iscsi/portal_grp.h"
		#include "iscsi/acceptor.h"

		#define PORTNUMSTRLEN 32
		#define ACCEPT_TIMEOUT_US 1000 /* 1ms */

		static int
		iscsi_portal_accept(void *arg)
		{
		struct spdk_iscsi_portal *portal = arg;
		struct spdk_sock *sock;
		int rc;
		int count = 0;

		if (portal->sock == NULL) {
		return -1;
		}

		while (1) {
		sock = spdk_sock_accept(portal->sock);
		if (sock != NULL) {
		rc = spdk_iscsi_conn_construct(portal, sock);
		if (rc < 0) {
		spdk_sock_close(&sock);
		SPDK_ERRLOG("spdk_iscsi_connection_construct() failed\n");
		break;
		}
		count++;
		} else {
		if (errno != EAGAIN && errno != EWOULDBLOCK) {
		SPDK_ERRLOG("accept error(%d): %s\n", errno, spdk_strerror(errno));
		}
		break;
		}
		}

		return count;
		}

		static void
		iscsi_acceptor_start(struct spdk_iscsi_portal *p)
		{
		p->acceptor_poller = spdk_poller_register(iscsi_portal_accept, p, ACCEPT_TIMEOUT_US);
		}

		static void
		iscsi_acceptor_stop(struct spdk_iscsi_portal *p)
		{
		spdk_poller_unregister(&p->acceptor_poller);
		}

		static struct spdk_iscsi_portal *
		iscsi_portal_find_by_addr(const char host, const char port)
		@@ -200,7 +245,7 @@ iscsi_portal_open(struct spdk_iscsi_portal *p)
		* the requests will be queued by the nonzero backlog of the socket
		* or resend by TCP.
		*/
		spdk_iscsi_acceptor_start(p);
		iscsi_acceptor_start(p);

		return 0;
		}
		@@ -211,7 +256,7 @@ iscsi_portal_close(struct spdk_iscsi_portal *p)
		if (p->sock) {
		SPDK_DEBUGLOG(SPDK_LOG_ISCSI, "close portal (%s, %s)\n",
		p->host, p->port);
		spdk_iscsi_acceptor_stop(p);
		iscsi_acceptor_stop(p);
		spdk_sock_close(&p->sock);
		}
		}

Admin message