util: add a new file operation API (ad8bd8e3) · Commits · Public Repositories / spdk

CHANGELOG.md

+4 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,10 @@

		## v19.07: (Upcoming Release)

		### util

		A new file API `spdk_posix_file_load` was added to load file content into a data buffer.

		### NVMe-oF Target

		Shared receive queue can now be disabled even for NICs that support it using the

include/spdk/file.h

0 → 100644

+61 −0

Original line number	Diff line number	Diff line
		/*-
		* BSD LICENSE
		*
		* 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.
		*/

		/** \file
		* file operation functions
		*/

		#ifndef SPDK_FILE_H
		#define SPDK_FILE_H

		#include "spdk/stdinc.h"

		#ifdef __cplusplus
		extern "C" {
		#endif

		/**
		* Load the input file content into a data buffer.
		*
		* \param file File handle.
		* \param size Size of bytes read from the file.
		*
		* \return data contains the content on success, NULL on failure.
		*/
		void spdk_posix_file_load(FILE file, size_t *size);

		#ifdef __cplusplus
		}
		#endif

		#endif

lib/event/json_config.c

+3 −23

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@
		#include "spdk/stdinc.h"

		#include "spdk/util.h"
		#include "spdk/file.h"
		#include "spdk/log.h"
		#include "spdk/env.h"
		#include "spdk/thread.h"
		@@ -477,39 +478,18 @@ spdk_app_json_config_load_subsystem(void *_ctx)
		spdk_app_json_config_load_subsystem_config_entry(ctx);
		}


		static void *
		read_file(const char filename, size_t size)
		{
		FILE *file = fopen(filename, "r");
		void *data = NULL;
		long int rc = 0;
		void *data;

		if (file == NULL) {
		/* errno is set by fopen */
		return NULL;
		}

		rc = fseek(file, 0, SEEK_END);
		if (rc == 0) {
		rc = ftell(file);
		rewind(file);
		}

		if (rc != -1) {
		*size = rc;
		data = malloc(*size);
		}

		if (data != NULL) {
		rc = fread(data, 1, *size, file);
		if (rc != (long int)*size) {
		free(data);
		data = NULL;
		errno = EIO;
		}
		}

		data = spdk_posix_file_load(file, size);
		fclose(file);
		return data;
		}

lib/util/Makefile

+1 −1

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

		C_SRCS = base64.c bit_array.c cpuset.c crc16.c crc32.c crc32c.c crc32_ieee.c dif.c fd.c strerror_tls.c string.c uuid.c
		C_SRCS = base64.c bit_array.c cpuset.c crc16.c crc32.c crc32c.c crc32_ieee.c dif.c fd.c file.c strerror_tls.c string.c uuid.c
		LIBNAME = util
		LOCAL_SYS_LIBS = -luuid

lib/util/file.c

0 → 100644

+71 −0

Original line number	Diff line number	Diff line
		/*-
		* BSD LICENSE
		*
		* 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/file.h"

		void *
		spdk_posix_file_load(FILE file, size_t size)
		{
		void newbuf, buf = NULL;
		size_t rc, buf_size, cur_size = 0;

		*size = 0;
		buf_size = 128 * 1024;

		while (buf_size <= 1024 * 1024 * 1024) {
		newbuf = realloc(buf, buf_size);
		if (newbuf == NULL) {
		free(buf);
		return NULL;
		}
		buf = newbuf;

		rc = fread(buf + cur_size, 1, buf_size - cur_size, file);
		cur_size += rc;

		if (feof(file)) {
		*size = cur_size;
		return buf;
		}

		if (ferror(file)) {
		free(buf);
		return NULL;
		}

		buf_size *= 2;
		}

		free(buf);
		return NULL;
		}