svn commit: r328728 - stable/11/sbin/nvmecontrol
Alexander Motin
mav at FreeBSD.org
Thu Feb 1 19:46:42 UTC 2018
Author: mav
Date: Thu Feb 1 19:46:41 2018
New Revision: 328728
URL: https://svnweb.freebsd.org/changeset/base/328728
Log:
MFC r320423 (by imp):
Move 128-bit integer routines to util.c so they can be used by more
than just the log page code.
Added:
stable/11/sbin/nvmecontrol/util.c
- copied unchanged from r320423, head/sbin/nvmecontrol/util.c
Modified:
stable/11/sbin/nvmecontrol/Makefile
stable/11/sbin/nvmecontrol/logpage.c
stable/11/sbin/nvmecontrol/nvmecontrol.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sbin/nvmecontrol/Makefile
==============================================================================
--- stable/11/sbin/nvmecontrol/Makefile Thu Feb 1 19:46:08 2018 (r328727)
+++ stable/11/sbin/nvmecontrol/Makefile Thu Feb 1 19:46:41 2018 (r328728)
@@ -3,7 +3,7 @@
PACKAGE=runtime
PROG= nvmecontrol
SRCS= nvmecontrol.c devlist.c firmware.c identify.c logpage.c \
- perftest.c reset.c nvme_util.c power.c wdc.c
+ perftest.c reset.c nvme_util.c power.c util.c wdc.c
MAN= nvmecontrol.8
.PATH: ${SRCTOP}/sys/dev/nvme
Modified: stable/11/sbin/nvmecontrol/logpage.c
==============================================================================
--- stable/11/sbin/nvmecontrol/logpage.c Thu Feb 1 19:46:08 2018 (r328727)
+++ stable/11/sbin/nvmecontrol/logpage.c Thu Feb 1 19:46:41 2018 (r328728)
@@ -80,54 +80,6 @@ print_bin(void *data, uint32_t length)
write(STDOUT_FILENO, data, length);
}
-/*
- * 128-bit integer augments to standard values. On i386 this
- * doesn't exist, so we use 64-bit values. The 128-bit counters
- * are crazy anyway, since for this purpose, you'd need a
- * billion IOPs for billions of seconds to overflow them.
- * So, on 32-bit i386, you'll get truncated values.
- */
-#define UINT128_DIG 39
-#ifdef __i386__
-typedef uint64_t uint128_t;
-#else
-typedef __uint128_t uint128_t;
-#endif
-
-static inline uint128_t
-to128(void *p)
-{
- return *(uint128_t *)p;
-}
-
-static char *
-uint128_to_str(uint128_t u, char *buf, size_t buflen)
-{
- char *end = buf + buflen - 1;
-
- *end-- = '\0';
- if (u == 0)
- *end-- = '0';
- while (u && end >= buf) {
- *end-- = u % 10 + '0';
- u /= 10;
- }
- end++;
- if (u != 0)
- return NULL;
-
- return end;
-}
-
-/* "Missing" from endian.h */
-static __inline uint64_t
-le48dec(const void *pp)
-{
- uint8_t const *p = (uint8_t const *)pp;
-
- return (((uint64_t)le16dec(p + 4) << 32) | le32dec(p));
-}
-
static void *
get_log_buffer(uint32_t size)
{
Modified: stable/11/sbin/nvmecontrol/nvmecontrol.h
==============================================================================
--- stable/11/sbin/nvmecontrol/nvmecontrol.h Thu Feb 1 19:46:08 2018 (r328727)
+++ stable/11/sbin/nvmecontrol/nvmecontrol.h Thu Feb 1 19:46:41 2018 (r328728)
@@ -88,5 +88,27 @@ void read_logpage(int fd, uint8_t log_page, int nsid,
void gen_usage(struct nvme_function *);
void dispatch(int argc, char *argv[], struct nvme_function *f);
+/* Utility Routines */
+/*
+ * 128-bit integer augments to standard values. On i386 this
+ * doesn't exist, so we use 64-bit values. So, on 32-bit i386,
+ * you'll get truncated values until someone implement 128bit
+ * ints in sofware.
+ */
+#define UINT128_DIG 39
+#ifdef __i386__
+typedef uint64_t uint128_t;
+#else
+typedef __uint128_t uint128_t;
#endif
+static __inline uint128_t
+to128(void *p)
+{
+ return *(uint128_t *)p;
+}
+
+uint64_t le48dec(const void *pp);
+char * uint128_to_str(uint128_t u, char *buf, size_t buflen);
+
+#endif
Copied: stable/11/sbin/nvmecontrol/util.c (from r320423, head/sbin/nvmecontrol/util.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/11/sbin/nvmecontrol/util.c Thu Feb 1 19:46:41 2018 (r328728, copy of r320423, head/sbin/nvmecontrol/util.c)
@@ -0,0 +1,59 @@
+/*-
+ * Copyright (c) 2017 Netflix, Inc
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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 <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/endian.h>
+#include "nvmecontrol.h"
+
+char *
+uint128_to_str(uint128_t u, char *buf, size_t buflen)
+{
+ char *end = buf + buflen - 1;
+
+ *end-- = '\0';
+ if (u == 0)
+ *end-- = '0';
+ while (u && end >= buf) {
+ *end-- = u % 10 + '0';
+ u /= 10;
+ }
+ end++;
+ if (u != 0)
+ return NULL;
+
+ return end;
+}
+
+/* "Missing" from endian.h */
+uint64_t
+le48dec(const void *pp)
+{
+ uint8_t const *p = (uint8_t const *)pp;
+
+ return (((uint64_t)le16dec(p + 4) << 32) | le32dec(p));
+}
More information about the svn-src-all
mailing list